diff options
| -rw-r--r-- | loader/modules.c | 7 | ||||
| -rw-r--r-- | loader/modules.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/loader/modules.c b/loader/modules.c index e8fdf1849..4b39179bf 100644 --- a/loader/modules.c +++ b/loader/modules.c @@ -10,6 +10,7 @@ #include "isys/isys.h" +#include "loader.h" #include "modules.h" struct moduleDependency_s { @@ -162,7 +163,7 @@ int mlLoadDeps(moduleDeps * moduleDepListPtr, const char * path) { } int mlLoadModule(char * modName, moduleList modLoaded, - moduleDeps modDeps, char ** args, int testing) { + moduleDeps modDeps, char ** args, int flags) { moduleDeps dep; char ** nextDep; char fileName[80]; @@ -179,7 +180,7 @@ int mlLoadModule(char * modName, moduleList modLoaded, if (dep && dep->deps) { nextDep = dep->deps; while (*nextDep) { - mlLoadModule(*nextDep, modLoaded, modDeps, NULL, testing); + mlLoadModule(*nextDep, modLoaded, modDeps, NULL, flags); nextDep++; } @@ -187,7 +188,7 @@ int mlLoadModule(char * modName, moduleList modLoaded, sprintf(fileName, "%s.o", modName); - if (testing) + if (FL_TESTING(flags)) rc = 0; else rc = insmod(fileName, args); diff --git a/loader/modules.h b/loader/modules.h index ff458f13f..a4afcd423 100644 --- a/loader/modules.h +++ b/loader/modules.h @@ -20,7 +20,7 @@ void mlFreeList(moduleList list); int mlLoadDeps(moduleDeps * moduleDepList, const char * path); moduleDeps mlNewDeps(void); int mlLoadModule(char * modName, moduleList modLoaded, - moduleDeps modDeps, char ** args, int testing); + moduleDeps modDeps, char ** args, int flags); char ** mlGetDeps(moduleDeps modDeps, const char * modName); int mlModuleInList(const char * modName, moduleList list); int mlWriteConfModules(moduleList list, moduleInfoSet modInfo, int fd); |