diff options
| author | Olivier Blin <oblin@mandriva.com> | 2007-08-21 16:53:31 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2007-08-21 16:53:31 +0000 |
| commit | 5730fc5d4a8f6ba45ef3f631723c75116933f6a5 (patch) | |
| tree | 46b3dcfa46050009e079d7baf03a35ca6fe2ee80 /mdk-stage1 | |
| parent | 0471cac15682c28185430409b9b6f918eec1f43e (diff) | |
| download | drakx-5730fc5d4a8f6ba45ef3f631723c75116933f6a5.tar drakx-5730fc5d4a8f6ba45ef3f631723c75116933f6a5.tar.gz drakx-5730fc5d4a8f6ba45ef3f631723c75116933f6a5.tar.bz2 drakx-5730fc5d4a8f6ba45ef3f631723c75116933f6a5.tar.xz drakx-5730fc5d4a8f6ba45ef3f631723c75116933f6a5.zip | |
rename name as modname in module_deps_elem struct
Diffstat (limited to 'mdk-stage1')
| -rw-r--r-- | mdk-stage1/modules.c | 8 | ||||
| -rw-r--r-- | mdk-stage1/modules.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c index 48fc20afd..ad2ae6954 100644 --- a/mdk-stage1/modules.c +++ b/mdk-stage1/modules.c @@ -141,7 +141,7 @@ static int load_modules_dependencies(void) } /* sort of a good line */ - modules_deps[line].name = strdup(start); + modules_deps[line].modname = strdup(start); start = ptr; i = 0; @@ -163,7 +163,7 @@ static int load_modules_dependencies(void) line++; start = end + 1; } - modules_deps[line].name = NULL; + modules_deps[line].modname = NULL; return 0; } @@ -226,9 +226,9 @@ static enum insmod_return insmod_with_deps(const char * mod_name, char * options struct module_deps_elem * dep; dep = modules_deps; - while (dep && dep->name && strcmp(dep->name, mod_name)) dep++; + while (dep && dep->modname && strcmp(dep->modname, mod_name)) dep++; - if (dep && dep->name && dep->deps) { + if (dep && dep->modname && dep->deps) { char ** one_dep; one_dep = dep->deps; while (*one_dep) { diff --git a/mdk-stage1/modules.h b/mdk-stage1/modules.h index 1d48f71e3..3cd11e49e 100644 --- a/mdk-stage1/modules.h +++ b/mdk-stage1/modules.h @@ -27,7 +27,7 @@ enum return_type ask_insmod(enum driver_type); int module_already_present(const char * name); struct module_deps_elem { - char * name; + char * modname; char ** deps; }; |