From f8b0dee88051065d4667fe41dd1bc81905c2b07c Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Wed, 24 Nov 1999 16:20:58 +0000
Subject: zsh-workers/8770

---
 Src/Modules/cap.c       |  4 ----
 Src/Modules/clone.c     |  4 ----
 Src/Modules/example.c   |  4 ----
 Src/Modules/files.c     |  4 ----
 Src/Modules/mapfile.c   |  4 ----
 Src/Modules/mathfunc.c  |  4 ----
 Src/Modules/parameter.c | 22 ++--------------------
 Src/Modules/stat.c      |  4 ----
 Src/Modules/zftp.c      |  4 ----
 9 files changed, 2 insertions(+), 52 deletions(-)

(limited to 'Src/Modules')

diff --git a/Src/Modules/cap.c b/Src/Modules/cap.c
index b43ed5c4d..e2f01ddee 100644
--- a/Src/Modules/cap.c
+++ b/Src/Modules/cap.c
@@ -136,8 +136,6 @@ boot_cap(Module m)
     return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
 }
 
-#ifdef MODULE
-
 /**/
 int
 cleanup_cap(Module m)
@@ -152,5 +150,3 @@ finish_cap(Module m)
 {
     return 0;
 }
-
-#endif
diff --git a/Src/Modules/clone.c b/Src/Modules/clone.c
index d9dd6c316..59f66e1b5 100644
--- a/Src/Modules/clone.c
+++ b/Src/Modules/clone.c
@@ -110,8 +110,6 @@ boot_clone(Module m)
     return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
 }
 
-#ifdef MODULE
-
 /**/
 int
 cleanup_clone(Module m)
@@ -126,5 +124,3 @@ finish_clone(Module m)
 {
     return 0;
 }
-
-#endif
diff --git a/Src/Modules/example.c b/Src/Modules/example.c
index fbe392e94..43199e350 100644
--- a/Src/Modules/example.c
+++ b/Src/Modules/example.c
@@ -212,8 +212,6 @@ boot_example(Module m)
 	     !addwrapper(m, wrapper));
 }
 
-#ifdef MODULE
-
 /**/
 int
 cleanup_example(Module m)
@@ -234,5 +232,3 @@ finish_example(Module m)
     fflush(stdout);
     return 0;
 }
-
-#endif
diff --git a/Src/Modules/files.c b/Src/Modules/files.c
index c1948e1fd..dc91227f8 100644
--- a/Src/Modules/files.c
+++ b/Src/Modules/files.c
@@ -523,8 +523,6 @@ boot_files(Module m)
     return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
 }
 
-#ifdef MODULE
-
 /**/
 int
 cleanup_files(Module m)
@@ -539,5 +537,3 @@ finish_files(Module m)
 {
     return 0;
 }
-
-#endif
diff --git a/Src/Modules/mapfile.c b/Src/Modules/mapfile.c
index 431c488e6..11553609c 100644
--- a/Src/Modules/mapfile.c
+++ b/Src/Modules/mapfile.c
@@ -346,8 +346,6 @@ boot_mapfile(Module m)
     return 0;
 }
 
-#ifdef MODULE
-
 /**/
 int
 cleanup_mapfile(Module m)
@@ -370,5 +368,3 @@ finish_mapfile(Module m)
 {
     return 0;
 }
-
-#endif
diff --git a/Src/Modules/mathfunc.c b/Src/Modules/mathfunc.c
index 67d5fd7d1..06184fd96 100644
--- a/Src/Modules/mathfunc.c
+++ b/Src/Modules/mathfunc.c
@@ -462,8 +462,6 @@ boot_mathfunc(Module m)
     return !addmathfuncs(m->nam, mftab, sizeof(mftab)/sizeof(*mftab));
 }
 
-#ifdef MODULE
-
 /**/
 int
 cleanup_mathfunc(Module m)
@@ -478,5 +476,3 @@ finish_mathfunc(Module m)
 {
     return 0;
 }
-
-#endif
diff --git a/Src/Modules/parameter.c b/Src/Modules/parameter.c
index 1482bedf2..ab8276979 100644
--- a/Src/Modules/parameter.c
+++ b/Src/Modules/parameter.c
@@ -901,18 +901,12 @@ getpmmodule(HashTable ht, char *name)
 	pm->old = NULL;
 	pm->level = 0;
 
-	for (node = firstnode(bltinmodules); node; incnode(node))
-	    if (!strcmp(name, (char *) getdata(node))) {
-		type = "builtin";
-		break;
-	    }
-#ifdef DYNAMIC
 	if (!type) {
 	    Module m;
 
 	    for (node = firstnode(modules); node; incnode(node)) {
 		m = (Module) getdata(node);
-		if (m->handle && !(m->flags & MOD_UNLOAD) &&
+		if (m->u.handle && !(m->flags & MOD_UNLOAD) &&
 		    !strcmp(name, m->nam)) {
 		    type = "loaded";
 		    break;
@@ -937,7 +931,6 @@ getpmmodule(HashTable ht, char *name)
 	    if (modpmfound)
 		type = "autoloaded";
 	}
-#endif
 	if (type)
 	    pm->u.str = dupstring(type);
 	else {
@@ -972,16 +965,10 @@ scanpmmodules(HashTable ht, ScanFunc func, int flags)
     pm.level = 0;
 
     pm.u.str = dupstring("builtin");
-    for (node = firstnode(bltinmodules); node; incnode(node)) {
-	pm.nam = (char *) getdata(node);
-	addlinknode(done, pm.nam);
-	func((HashNode) &pm, flags);
-    }
-#ifdef DYNAMIC
     pm.u.str = dupstring("loaded");
     for (node = firstnode(modules); node; incnode(node)) {
 	m = (Module) getdata(node);
-	if (m->handle && !(m->flags & MOD_UNLOAD)) {
+	if (m->u.handle && !(m->flags & MOD_UNLOAD)) {
 	    pm.nam = m->nam;
 	    addlinknode(done, pm.nam);
 	    func((HashNode) &pm, flags);
@@ -1012,7 +999,6 @@ scanpmmodules(HashTable ht, ScanFunc func, int flags)
 		func((HashNode) &pm, flags);
 	    }
 	}
-#endif
 }
 
 /* Functions for the dirstack special parameter. */
@@ -1919,8 +1905,6 @@ boot_parameter(Module m)
     return 0;
 }
 
-#ifdef MODULE
-
 /**/
 int
 cleanup_parameter(Module m)
@@ -1949,5 +1933,3 @@ finish_parameter(Module m)
 {
     return 0;
 }
-
-#endif
diff --git a/Src/Modules/stat.c b/Src/Modules/stat.c
index 5b482cf6c..3a98db0e3 100644
--- a/Src/Modules/stat.c
+++ b/Src/Modules/stat.c
@@ -602,8 +602,6 @@ boot_stat(Module m)
     return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
 }
 
-#ifdef MODULE
-
 /**/
 int
 cleanup_stat(Module m)
@@ -618,5 +616,3 @@ finish_stat(Module m)
 {
     return 0;
 }
-
-#endif
diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c
index 0cc3d2b45..b334c878a 100644
--- a/Src/Modules/zftp.c
+++ b/Src/Modules/zftp.c
@@ -3213,8 +3213,6 @@ boot_zftp(Module m)
     return !ret;
 }
 
-#ifdef MODULE
-
 /**/
 int
 cleanup_zftp(Module m)
@@ -3249,5 +3247,3 @@ finish_zftp(Module m)
 {
     return 0;
 }
-
-#endif
-- 
cgit 1.4.1