diff options
| -rw-r--r-- | utils/moddeps.c | 2 | ||||
| -rw-r--r-- | utils/modlist.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/utils/moddeps.c b/utils/moddeps.c index 967b2f974..2230e9817 100644 --- a/utils/moddeps.c +++ b/utils/moddeps.c @@ -38,7 +38,7 @@ int main(int argc, char ** argv) { } ml = mlNewDeps(); - if (mlLoadDeps(ml, modDepsFile)) { + if (mlLoadDeps(&ml, modDepsFile)) { fprintf(stderr, "Failed to read %s\n", modDepsFile); exit(1); } diff --git a/utils/modlist.c b/utils/modlist.c index 60d4cdb4b..754a75933 100644 --- a/utils/modlist.c +++ b/utils/modlist.c @@ -15,6 +15,7 @@ int main(int argc, char ** argv) { int rc, i; int showModInfo = 0; int ignoreMissing = 0; + moduleInfoSet mis; struct moduleInfo * mi; struct poptOption optionTable[] = { { "ignore-missing", 'I', POPT_ARG_NONE, &ignoreMissing, 0, @@ -36,7 +37,8 @@ int main(int argc, char ** argv) { exit(1); } - if (isysReadModuleInfo(modInfoFile)) { + mis = isysNewModuleInfoSet(); + if (isysReadModuleInfo(modInfoFile, mis)) { fprintf(stderr, "Failed to read %s\n", modInfoFile); exit(1); } @@ -44,7 +46,7 @@ int main(int argc, char ** argv) { if (showModInfo) { printf("Version 0\n"); while ((mod = poptGetArg(optCon))) { - mi = isysFindModuleInfo(mod); + mi = isysFindModuleInfo(mis, mod); if (mi) { printf("%s\n", mi->moduleName); switch (mi->major) { @@ -95,7 +97,7 @@ int main(int argc, char ** argv) { exit(1); } - list = isysGetModuleList(major); + list = isysGetModuleList(mis, major); for (m = list; m && m->moduleName; m++) printf("%s\n", m->moduleName); free(list); |