leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modpost: move *.mod.c generation to write_mod_c_files()

Browse Source 
A later commit will add more code to this list_for_each_entry loop.

Before that, move the loop body into a separate helper function.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
Tested-by: Nathan Chancellor <nathan@kernel.org>
This commit is contained in:
Masahiro Yamada 2022-05-05 16:22:33 +09:00
parent 7fedac9698
commit a44abaca0e
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
scripts/mod/modpost.c
View File

@ -2390,6 +2390,34 @@ static void write_if_changed(struct buffer *b, const char *fname)
write_buf(b, fname); write_buf(b, fname);
} }
/* do sanity checks, and generate *.mod.c file */
static void write_mod_c_file(struct module *mod)
{
struct buffer buf = { };
char fname[PATH_MAX];
int ret;
check_modname_len(mod);
check_exports(mod);
add_header(&buf, mod);
add_versions(&buf, mod);
add_depends(&buf, mod);
add_moddevtable(&buf, mod);
add_srcversion(&buf, mod);
ret = snprintf(fname, sizeof(fname), "%s.mod.c", mod->name);
if (ret >= sizeof(fname)) {
error("%s: too long path was truncated\n", fname);
goto free;
}
write_if_changed(&buf, fname);
free:
free(buf.p);
}
/* parse Module.symvers file. line format: /* parse Module.symvers file. line format:
* 0x12345678<tab>symbol<tab>module<tab>export<tab>namespace * 0x12345678<tab>symbol<tab>module<tab>export<tab>namespace
**/ **/
@ -2494,7 +2522,6 @@ struct dump_list {
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
struct module *mod; struct module *mod;
struct buffer buf = { };
char *missing_namespace_deps = NULL; char *missing_namespace_deps = NULL;
char *dump_write = NULL, *files_source = NULL; char *dump_write = NULL, *files_source = NULL;
int opt; int opt;
@ -2557,30 +2584,11 @@ int main(int argc, char **argv)
read_symbols_from_files(files_source); read_symbols_from_files(files_source);
list_for_each_entry(mod, &modules, list) { list_for_each_entry(mod, &modules, list) {
char fname[PATH_MAX]; if (mod->from_dump)
int ret;
if (mod->is_vmlinux || mod->from_dump)
continue; continue;
buf.pos = 0; if (!mod->is_vmlinux)
write_mod_c_file(mod);
check_modname_len(mod);
check_exports(mod);
add_header(&buf, mod);
add_versions(&buf, mod);
add_depends(&buf, mod);
add_moddevtable(&buf, mod);
add_srcversion(&buf, mod);
ret = snprintf(fname, sizeof(fname), "%s.mod.c", mod->name);
if (ret >= sizeof(fname)) {
error("%s: too long path was truncated\n", fname);
continue;
}
write_if_changed(&buf, fname);
} }
if (missing_namespace_deps) if (missing_namespace_deps)
@ -2606,7 +2614,5 @@ int main(int argc, char **argv)
warn("suppressed %u unresolved symbol warnings because there were too many)\n", warn("suppressed %u unresolved symbol warnings because there were too many)\n",
nr_unresolved - MAX_UNRESOLVED_REPORTS); nr_unresolved - MAX_UNRESOLVED_REPORTS);
free(buf.p);
return error_occurred ? 1 : 0; return error_occurred ? 1 : 0;
} }