sysif: fix inappropriate use of w_ convention.

Some functions in utf8.c have w_ prefixes. They are wide
character wrappers for functions that take multi-byte string
inputs.

The prefix is being inappropriately used in the names of a
few sysif functions that should be named _wrap.

* sysif.c (w_stat, w_lstat, w_fstat): Rename to do_stat,
do_lstat and do_fstat, respectively. These are callbacks
used with stat_impl.
(statp, statl, statf): Rename to stat_wrap, lstat_wrap and
fstat_wrap, following existing convention. Additionally,
stat_wrap becomes static since nothing outside this file
calls it.
(sysif_init): Follow renames of statp, statl and statf.

* sysif.h (statp): Declaration removed.
(statf): Renamed to fstat_wrap.

* parser.c (load_rcfile): Follow statf rename.

3 files changed, 15 insertions, 16 deletions

diff --git a/parser.c b/parser.c
index 0752cf45..7c40b5d7 100644
--- a/parser.c
+++ b/parser.c
@@ -798,7 +798,7 @@ static void load_rcfile(val name)
   open_txr_file(name, &lisp_p, &resolved_name, &stream);
 
   if (stream) {
-    if (!funcall1(path_private_to_me_p, statf(stream))) {
+    if (!funcall1(path_private_to_me_p, fstat_wrap(stream))) {
       format(std_output,
              lit("** possible security problem: ~a is writable to others\n"),
              name, nao);
diff --git a/sysif.c b/sysif.c
index 90f38ee9..9e43bed2 100644
--- a/sysif.c
+++ b/sysif.c
@@ -770,7 +770,7 @@ static val exit_star_wrap(val status)
 #endif
 
 #if HAVE_SYS_STAT
-static int w_stat(val wpath, struct stat *buf)
+static int do_stat(val wpath, struct stat *buf)
 {
   char *path = utf8_dup_to(c_str(wpath));
   int res = stat(path, buf);
@@ -779,7 +779,7 @@ static int w_stat(val wpath, struct stat *buf)
 }
 
 #ifdef S_IFLNK
-static int w_lstat(val wpath, struct stat *buf)
+static int do_lstat(val wpath, struct stat *buf)
 {
   char *path = utf8_dup_to(c_str(wpath));
   int res = lstat(path, buf);
@@ -787,10 +787,10 @@ static int w_lstat(val wpath, struct stat *buf)
   return res;
 }
 #else
-#define w_lstat w_stat
+#define do_lstat do_stat
 #endif
 
-static int w_fstat(val stream, struct stat *buf)
+static int do_fstat(val stream, struct stat *buf)
 {
   val self = lit("fstat");
   int fd = get_fd(stream, self);
@@ -890,19 +890,19 @@ static val stat_impl(val obj, int (*statfn)(val, struct stat *),
 #endif
 }
 
-val statp(val path)
+static val stat_wrap(val path)
 {
-  return stat_impl(path, w_stat, lit("stat"), path);
+  return stat_impl(path, do_stat, lit("stat"), path);
 }
 
-static val statl(val path)
+static val lstat_wrap(val path)
 {
-  return stat_impl(path, w_lstat, lit("lstat"), path);
+  return stat_impl(path, do_lstat, lit("lstat"), path);
 }
 
-val statf(val stream)
+val fstat_wrap(val stream)
 {
-  return stat_impl(stream, w_fstat, lit("fstat"), nil);
+  return stat_impl(stream, do_fstat, lit("fstat"), nil);
 }
 
 #if HAVE_SYS_STAT
@@ -2018,9 +2018,9 @@ void sysif_init(void)
   reg_fun(intern(lit("fcntl"), user_package), func_n3o(fcntl_wrap, 2));
 #endif
 
-  reg_fun(intern(lit("stat"), user_package), func_n1(statp));
-  reg_fun(intern(lit("lstat"), user_package), func_n1(statl));
-  reg_fun(intern(lit("fstat"), user_package), func_n1(statf));
+  reg_fun(intern(lit("stat"), user_package), func_n1(stat_wrap));
+  reg_fun(intern(lit("lstat"), user_package), func_n1(lstat_wrap));
+  reg_fun(intern(lit("fstat"), user_package), func_n1(fstat_wrap));
 
 #if HAVE_SYS_STAT
 #ifndef S_IFSOCK
diff --git a/sysif.h b/sysif.h
index c21ca969..f10d2da3 100644
--- a/sysif.h
+++ b/sysif.h
@@ -49,8 +49,7 @@ val num_time(time_t time);
 struct stat;
 val stat_to_struct(struct stat st, val path);
 #endif
-val statp(val path);
-val statf(val path);
+val fstat_wrap(val path);
 val stdio_ftell(FILE *);
 int stdio_fseek(FILE *, val, int whence);
 #if HAVE_GETEUID