naming: get the -func out, at least some of it.

The code base contains a lot of irksome _func which should be
_fun, and also the public functions func-get-form and
func-get-name are irksomely named.  As a first step, we can
fix parameters which carry this suffix.

* glob.c (global_wrap): errfunc argument renamed to errfun.

* glob.h (global_wrap): Likewise.

* hash.h (hash_uni, hash_isec): join_func argument renamed
to joinfun.

* hash.h (hash_uni, hash_isec): Likewise.

* txr.1: fixed gen-func typo. Arguments renamed in
descriptions of hash-uni, hash-isec, iff, iffi, glob,
and ftw.

1 files changed, 2 insertions, 2 deletions

diff --git a/glob.c b/glob.c
index b7e10152..dae05fb7 100644
--- a/glob.c
+++ b/glob.c
@@ -65,7 +65,7 @@ static int errfunc_thunk(const char *errpath, int errcode)
   return result ? 1 : 0;
 }
 
-val glob_wrap(val pattern, val flags, val errfunc)
+val glob_wrap(val pattern, val flags, val errfun)
 {
   cnum c_flags = c_num(default_arg(flags, zero));
   char *pat_u8 = utf8_dup_to(c_str(pattern));
@@ -77,7 +77,7 @@ val glob_wrap(val pattern, val flags, val errfunc)
                            "its error callback function"), nao);
   }
 
-  s_errfunc = default_null_arg(errfunc);
+  s_errfunc = default_null_arg(errfun);
 
   (void) glob(pat_u8, c_flags, s_errfunc ? errfunc_thunk : 0, &gl);