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/hash.h b/hash.h
index 869e6fbd..84045156 100644
--- a/hash.h
+++ b/hash.h
@@ -68,10 +68,10 @@ val hash_keys(val hash);
 val hash_values(val hash);
 val hash_pairs(val hash);
 val hash_alist(val hash);
-val hash_uni(val hash1, val hash2, val join_func);
+val hash_uni(val hash1, val hash2, val joinfun);
 val hash_diff(val hash1, val hash2);
 val hash_symdiff(val hash1, val hash2);
-val hash_isec(val hash1, val hash2, val join_func);
+val hash_isec(val hash1, val hash2, val joinfun);
 val hash_subset(val hash1, val hash2);
 val hash_proper_subset(val hash1, val hash2);
 val hash_update(val hash, val fun);