diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-03-10 19:20:01 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-03-10 19:20:01 +0000 |
| commit | 832af2d5edc09843fa6b30f6554758a56c97e0cf (patch) | |
| tree | 96d2a3cd3c6492164d56d7c4d341f4e57076215b /sys/kern/kern_linker.c | |
| parent | a4e726f7c6df6fba82a2afeed948bdd86b5c3298 (diff) | |
Notes
Diffstat (limited to 'sys/kern/kern_linker.c')
| -rw-r--r-- | sys/kern/kern_linker.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index 338c3f35a60f..df99911710d9 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -1111,7 +1111,7 @@ linker_preload(void *arg) char *modtype; linker_file_t lf; linker_class_t lc; - int error; + int error, err; linker_file_list_t loaded_files; linker_file_list_t depended_files; struct mod_metadata *mp, *nmp; @@ -1189,8 +1189,8 @@ restart: NULL); nmodname = linker_reloc_ptr(lf, nmp->md_cval); - error = strcmp(modname, nmodname); - if (error == 0) + err = strcmp(modname, nmodname); + if (err == 0) break; } if (nmdp < stop) /* it's a self reference */ @@ -1675,7 +1675,7 @@ linker_load_dependencies(linker_file_t lf) struct mod_depend *verinfo; modlist_t mod; const char *modname, *nmodname; - int ver, error = 0, count; + int ver, error = 0, err, count; /* * All files are dependant on /kernel. @@ -1714,8 +1714,8 @@ linker_load_dependencies(linker_file_t lf) if (nmp->md_type != MDT_VERSION) continue; nmodname = linker_reloc_ptr(lf, nmp->md_cval); - error = strcmp(modname, nmodname); - if (error == 0) + err = strcmp(modname, nmodname); + if (err == 0) break; } if (nmdp < stop)/* early exit, it's a self reference */ |