diff options
author | Michal Marek <mmarek@suse.cz> | 2009-06-18 16:38:55 +0200 |
---|---|---|
committer | Jon Masters <jcm@jonmasters.org> | 2009-06-23 03:57:11 -0400 |
commit | 0ed506fa85309f5520e42833480d5b74516df054 (patch) | |
tree | dcd7f3d1e9bdb8e9dec2fd161b0c2c7388f328d5 | |
parent | f4aab0ffafdd2cb09d3510cc594c8ae73dda4ece (diff) | |
download | module-init-tools-0ed506fa85309f5520e42833480d5b74516df054.tar.gz |
elfops: kill first argument of load_dep_syms()
The pathname is already in the elf_file struct.
Signed-off-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Jon Masters <jcm@jonmasters.org>
-rw-r--r-- | depmod.c | 2 | ||||
-rw-r--r-- | elfops.h | 4 | ||||
-rw-r--r-- | elfops_core.c | 5 |
3 files changed, 5 insertions, 6 deletions
@@ -656,7 +656,7 @@ static void calculate_deps(struct module *module) module->deps = NULL; file = module->file; - symnames = file->ops->load_dep_syms(module->pathname, file, &symtypes); + symnames = file->ops->load_dep_syms(file, &symtypes); if (!symnames || !symtypes) return; @@ -65,8 +65,8 @@ struct module_ops struct string_table *(*load_strings)(struct elf_file *module, const char *secname, struct string_table *tbl, errfn_t error); struct string_table *(*load_symbols)(struct elf_file *module); - struct string_table *(*load_dep_syms)(const char *pathname, - struct elf_file *module, struct string_table **types); + struct string_table *(*load_dep_syms)(struct elf_file *module, + struct string_table **types); void (*fetch_tables)(struct elf_file *module, struct module_tables *tables); char *(*get_aliases)(struct elf_file *module, unsigned long *size); diff --git a/elfops_core.c b/elfops_core.c index ced374e..5df9f25 100644 --- a/elfops_core.c +++ b/elfops_core.c @@ -122,8 +122,7 @@ static char *PERBIT(get_modinfo)(struct elf_file *module, unsigned long *size) #define STT_REGISTER 13 /* Global register reserved to app. */ #endif -static struct string_table *PERBIT(load_dep_syms)(const char *pathname, - struct elf_file *module, +static struct string_table *PERBIT(load_dep_syms)(struct elf_file *module, struct string_table **types) { unsigned int i; @@ -143,7 +142,7 @@ static struct string_table *PERBIT(load_dep_syms)(const char *pathname, if (!strings || !syms) { warn("Couldn't find symtab and strtab in module %s\n", - pathname); + module->pathname); return NULL; } |