manual:9047

22 files changed, 45 insertions, 67 deletions

diff --git a/Src/Modules/cap.c b/Src/Modules/cap.c
index bc8fb5b8c..e2f01ddee 100644
--- a/Src/Modules/cap.c
+++ b/Src/Modules/cap.c
@@ -124,21 +124,21 @@ static struct builtin bintab[] = {
 
 /**/
 int
-setup_(Module m)
+setup_cap(Module m)
 {
     return 0;
 }
 
 /**/
 int
-boot_(Module m)
+boot_cap(Module m)
 {
     return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
 }
 
 /**/
 int
-cleanup_(Module m)
+cleanup_cap(Module m)
 {
     deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
     return 0;
@@ -146,7 +146,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_cap(Module m)
 {
     return 0;
 }
diff --git a/Src/Modules/cap.mdd b/Src/Modules/cap.mdd
index 07d46f252..97f377e9d 100644
--- a/Src/Modules/cap.mdd
+++ b/Src/Modules/cap.mdd
@@ -1,5 +1,3 @@
-name=zsh/cap
-
 autobins="cap getcap setcap"
 
 objects="cap.o"
diff --git a/Src/Modules/clone.c b/Src/Modules/clone.c
index 112c5a51a..59f66e1b5 100644
--- a/Src/Modules/clone.c
+++ b/Src/Modules/clone.c
@@ -98,21 +98,21 @@ static struct builtin bintab[] = {
 
 /**/
 int
-setup_(Module m)
+setup_clone(Module m)
 {
     return 0;
 }
 
 /**/
 int
-boot_(Module m)
+boot_clone(Module m)
 {
     return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
 }
 
 /**/
 int
-cleanup_(Module m)
+cleanup_clone(Module m)
 {
     deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
     return 0;
@@ -120,7 +120,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_clone(Module m)
 {
     return 0;
 }
diff --git a/Src/Modules/clone.mdd b/Src/Modules/clone.mdd
index f5c673977..5277d3151 100644
--- a/Src/Modules/clone.mdd
+++ b/Src/Modules/clone.mdd
@@ -1,5 +1,3 @@
-name=zsh/clone
-
 autobins="clone"
 
 objects="clone.o"
diff --git a/Src/Modules/example.c b/Src/Modules/example.c
index bf4ad60fb..43199e350 100644
--- a/Src/Modules/example.c
+++ b/Src/Modules/example.c
@@ -159,7 +159,7 @@ ex_wrapper(List list, FuncWrap w, char *name)
 }
 
 /*
- * boot_ is executed when the module is loaded.
+ * boot_example is executed when the module is loaded.
  */
 
 static struct builtin bintab[] = {
@@ -188,7 +188,7 @@ static struct funcwrap wrapper[] = {
 
 /**/
 int
-setup_(Module m)
+setup_example(Module m)
 {
     printf("The example module has now been set up.\n");
     fflush(stdout);
@@ -197,7 +197,7 @@ setup_(Module m)
 
 /**/
 int
-boot_(Module m)
+boot_example(Module m)
 {
     intparam = 42;
     strparam = ztrdup("example");
@@ -214,7 +214,7 @@ boot_(Module m)
 
 /**/
 int
-cleanup_(Module m)
+cleanup_example(Module m)
 {
     deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
     deleteconddefs(m->nam, cotab, sizeof(cotab)/sizeof(*cotab));
@@ -226,7 +226,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_example(Module m)
 {
     printf("Thank you for using the example module.  Have a nice day.\n");
     fflush(stdout);
diff --git a/Src/Modules/example.mdd b/Src/Modules/example.mdd
index fdaf01888..e32e8182e 100644
--- a/Src/Modules/example.mdd
+++ b/Src/Modules/example.mdd
@@ -1,5 +1,3 @@
-name=zsh/example
-
 autobins="example"
 
 autoinfixconds="ex"
diff --git a/Src/Modules/files.c b/Src/Modules/files.c
index 24cc66a2b..ac3bedd04 100644
--- a/Src/Modules/files.c
+++ b/Src/Modules/files.c
@@ -714,21 +714,21 @@ static struct builtin bintab[] = {
 
 /**/
 int
-setup_(Module m)
+setup_files(Module m)
 {
     return 0;
 }
 
 /**/
 int
-boot_(Module m)
+boot_files(Module m)
 {
     return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
 }
 
 /**/
 int
-cleanup_(Module m)
+cleanup_files(Module m)
 {
     deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
     return 0;
@@ -736,7 +736,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_files(Module m)
 {
     return 0;
 }
diff --git a/Src/Modules/files.mdd b/Src/Modules/files.mdd
index 508f6b9b5..171790b43 100644
--- a/Src/Modules/files.mdd
+++ b/Src/Modules/files.mdd
@@ -1,5 +1,3 @@
-name=zsh/files
-
 autobins="chgrp chown ln mkdir mv rm rmdir sync"
 
 objects="files.o"
diff --git a/Src/Modules/mapfile.c b/Src/Modules/mapfile.c
index 5bbc17eca..11553609c 100644
--- a/Src/Modules/mapfile.c
+++ b/Src/Modules/mapfile.c
@@ -329,14 +329,14 @@ scanpmmapfile(HashTable ht, ScanFunc func, int flags)
 
 /**/
 int
-setup_(Module m)
+setup_mapfile(Module m)
 {
     return 0;
 }
 
 /**/
 int
-boot_(Module m)
+boot_mapfile(Module m)
 {
     /* Create the special associative array. */
 
@@ -348,7 +348,7 @@ boot_(Module m)
 
 /**/
 int
-cleanup_(Module m)
+cleanup_mapfile(Module m)
 {
     Param pm;
 
@@ -364,7 +364,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_mapfile(Module m)
 {
     return 0;
 }
diff --git a/Src/Modules/mapfile.mdd b/Src/Modules/mapfile.mdd
index 6bdd26afc..9adb36162 100644
--- a/Src/Modules/mapfile.mdd
+++ b/Src/Modules/mapfile.mdd
@@ -1,5 +1,3 @@
-name=zsh/mapfile
-
 autoparams="mapfile"
 
 objects="mapfile.o"
diff --git a/Src/Modules/mathfunc.c b/Src/Modules/mathfunc.c
index 392424a48..06184fd96 100644
--- a/Src/Modules/mathfunc.c
+++ b/Src/Modules/mathfunc.c
@@ -450,21 +450,21 @@ math_func(char *name, int argc, mnumber *argv, int id)
 
 /**/
 int
-setup_(Module m)
+setup_mathfunc(Module m)
 {
     return 0;
 }
 
 /**/
 int
-boot_(Module m)
+boot_mathfunc(Module m)
 {
     return !addmathfuncs(m->nam, mftab, sizeof(mftab)/sizeof(*mftab));
 }
 
 /**/
 int
-cleanup_(Module m)
+cleanup_mathfunc(Module m)
 {
     deletemathfuncs(m->nam, mftab, sizeof(mftab)/sizeof(*mftab));
     return 0;
@@ -472,7 +472,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_mathfunc(Module m)
 {
     return 0;
 }
diff --git a/Src/Modules/mathfunc.mdd b/Src/Modules/mathfunc.mdd
index a06d20c6d..33a861f77 100644
--- a/Src/Modules/mathfunc.mdd
+++ b/Src/Modules/mathfunc.mdd
@@ -1,5 +1,3 @@
-name=zsh/mathfunc
-
 autobins="mathfunc"
 
 objects="mathfunc.o"
diff --git a/Src/Modules/parameter.c b/Src/Modules/parameter.c
index cd5b580ce..0169b4654 100644
--- a/Src/Modules/parameter.c
+++ b/Src/Modules/parameter.c
@@ -1940,7 +1940,7 @@ static struct funcwrap wrapper[] = {
 
 /**/
 int
-setup_(Module m)
+setup_parameter(Module m)
 {
     incleanup = 0;
 
@@ -1949,7 +1949,7 @@ setup_(Module m)
 
 /**/
 int
-boot_(Module m)
+boot_parameter(Module m)
 {
     /* Create the special associative arrays.
      * As an example for autoloaded parameters, this is probably a bad
@@ -1987,7 +1987,7 @@ boot_(Module m)
 
 /**/
 int
-cleanup_(Module m)
+cleanup_parameter(Module m)
 {
     Param pm;
     struct pardef *def;
@@ -2009,7 +2009,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_parameter(Module m)
 {
     return 0;
 }
diff --git a/Src/Modules/parameter.mdd b/Src/Modules/parameter.mdd
index 122f72bd2..1ee48f859 100644
--- a/Src/Modules/parameter.mdd
+++ b/Src/Modules/parameter.mdd
@@ -1,5 +1,3 @@
-name=zsh/parameter
-
 autoparams="parameters commands functions dis_functions funcstack builtins dis_builtins reswords dis_reswords options modules dirstack history historywords jobtexts jobdirs jobstates nameddirs userdirs aliases dis_aliases galiases dis_galiases"
 
 objects="parameter.o"
diff --git a/Src/Modules/stat.c b/Src/Modules/stat.c
index 7e7463bb7..3a98db0e3 100644
--- a/Src/Modules/stat.c
+++ b/Src/Modules/stat.c
@@ -590,21 +590,21 @@ static struct builtin bintab[] = {
 
 /**/
 int
-setup_(Module m)
+setup_stat(Module m)
 {
     return 0;
 }
 
 /**/
 int
-boot_(Module m)
+boot_stat(Module m)
 {
     return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
 }
 
 /**/
 int
-cleanup_(Module m)
+cleanup_stat(Module m)
 {
     deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
     return 0;
@@ -612,7 +612,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_stat(Module m)
 {
     return 0;
 }
diff --git a/Src/Modules/stat.mdd b/Src/Modules/stat.mdd
index 81f73f482..b775fda09 100644
--- a/Src/Modules/stat.mdd
+++ b/Src/Modules/stat.mdd
@@ -1,5 +1,3 @@
-name=zsh/stat
-
 autobins="stat"
 
 objects="stat.o"
diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c
index debb1a6bb..cf024643d 100644
--- a/Src/Modules/zftp.c
+++ b/Src/Modules/zftp.c
@@ -3201,14 +3201,14 @@ bin_zftp(char *name, char **args, char *ops, int func)
 
 /**/
 int
-setup_(Module m)
+setup_zftp(Module m)
 {
     return 0;
 }
 
 /**/
 int
-boot_(Module m)
+boot_zftp(Module m)
 {
     int ret;
     if ((ret = addbuiltins(m->nam, bintab,
@@ -3232,7 +3232,7 @@ boot_(Module m)
 
 /**/
 int
-cleanup_(Module m)
+cleanup_zftp(Module m)
 {
     /*
      * There are various parameters hanging around, but they're
@@ -3260,7 +3260,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_zftp(Module m)
 {
     return 0;
 }
diff --git a/Src/Modules/zftp.mdd b/Src/Modules/zftp.mdd
index 98f29b13f..83051ae54 100644
--- a/Src/Modules/zftp.mdd
+++ b/Src/Modules/zftp.mdd
@@ -1,5 +1,3 @@
-name=zsh/zftp
-
 autobins="zftp"
 
 objects="zftp.o"
diff --git a/Src/Modules/zprof.c b/Src/Modules/zprof.c
index 276ada4d6..2dacd45a2 100644
--- a/Src/Modules/zprof.c
+++ b/Src/Modules/zprof.c
@@ -291,14 +291,14 @@ static struct funcwrap wrapper[] = {
 
 /**/
 int
-setup_(Module m)
+setup_zprof(Module m)
 {
     return 0;
 }
 
 /**/
 int
-boot_(Module m)
+boot_zprof(Module m)
 {
     calls = NULL;
     ncalls = 0;
@@ -311,7 +311,7 @@ boot_(Module m)
 
 /**/
 int
-cleanup_(Module m)
+cleanup_zprof(Module m)
 {
     freepfuncs(calls);
     freeparcs(arcs);
@@ -322,7 +322,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_zprof(Module m)
 {
     return 0;
 }
diff --git a/Src/Modules/zprof.mdd b/Src/Modules/zprof.mdd
index fad9a1dbf..de473cbba 100644
--- a/Src/Modules/zprof.mdd
+++ b/Src/Modules/zprof.mdd
@@ -1,5 +1,3 @@
-name=zsh/zprof
-
 autobins="zprof"
 
 objects="zprof.o"
diff --git a/Src/Modules/zutil.c b/Src/Modules/zutil.c
index 065b027ce..590678f98 100644
--- a/Src/Modules/zutil.c
+++ b/Src/Modules/zutil.c
@@ -729,7 +729,7 @@ static struct builtin bintab[] = {
 
 /**/
 int
-setup_(Module m)
+setup_zutil(Module m)
 {
     zstyles = NULL;
 
@@ -738,14 +738,14 @@ setup_(Module m)
 
 /**/
 int
-boot_(Module m)
+boot_zutil(Module m)
 {
     return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
 }
 
 /**/
 int
-cleanup_(Module m)
+cleanup_zutil(Module m)
 {
     deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
     return 0;
@@ -753,7 +753,7 @@ cleanup_(Module m)
 
 /**/
 int
-finish_(Module m)
+finish_zutil(Module m)
 {
     freestypat(zstyles);
 
diff --git a/Src/Modules/zutil.mdd b/Src/Modules/zutil.mdd
index 30cd1576a..edc1f0d32 100644
--- a/Src/Modules/zutil.mdd
+++ b/Src/Modules/zutil.mdd
@@ -1,5 +1,3 @@
-name=zsh/zutil
-
 objects="zutil.o"
 
 autobins="zformat zstyle"