diff options
author | iedowse <iedowse@FreeBSD.org> | 2001-11-16 21:08:40 +0000 |
---|---|---|
committer | iedowse <iedowse@FreeBSD.org> | 2001-11-16 21:08:40 +0000 |
commit | 4e3498d275605c3150b9dfdcece37f1e362b21a6 (patch) | |
tree | 864fb9aa57f6f8477411de6af92d197206fea56e | |
parent | f66bcabf900b94af01e1318795df4cb9d33f4bbb (diff) | |
download | FreeBSD-src-4e3498d275605c3150b9dfdcece37f1e362b21a6.zip FreeBSD-src-4e3498d275605c3150b9dfdcece37f1e362b21a6.tar.gz |
Fix a number of misspellings of "dependency" and "dependencies" in
comments and function names.
PR: kern/8589
Submitted by: Rajesh Vaidheeswarran <rv@fore.com>
-rw-r--r-- | sys/boot/common/module.c | 6 | ||||
-rw-r--r-- | sys/kern/kern_linker.c | 18 | ||||
-rw-r--r-- | sys/kern/link_aout.c | 2 | ||||
-rw-r--r-- | sys/kern/link_elf.c | 2 | ||||
-rw-r--r-- | sys/kern/link_elf_obj.c | 2 | ||||
-rw-r--r-- | sys/sys/linker.h | 12 |
6 files changed, 21 insertions, 21 deletions
diff --git a/sys/boot/common/module.c b/sys/boot/common/module.c index f8e448e..b294048 100644 --- a/sys/boot/common/module.c +++ b/sys/boot/common/module.c @@ -52,7 +52,7 @@ struct moduledir { static int file_load(char *filename, vm_offset_t dest, struct preloaded_file **result); static int file_loadraw(char *type, char *name); -static int file_load_dependancies(struct preloaded_file *base_mod); +static int file_load_dependencies(struct preloaded_file *base_mod); static char * file_search(const char *name, char **extlist); static struct kernel_module * file_findmodule(struct preloaded_file *fp, char *modname, struct mod_depend *verinfo); static int file_havepath(const char *name); @@ -255,7 +255,7 @@ file_load(char *filename, vm_offset_t dest, struct preloaded_file **result) } static int -file_load_dependancies(struct preloaded_file *base_file) { +file_load_dependencies(struct preloaded_file *base_file) { struct file_metadata *md; struct preloaded_file *fp; struct mod_depend *verinfo; @@ -443,7 +443,7 @@ mod_loadkld(const char *kldname, int argc, char *argv[]) fp->f_args = unargv(argc, argv); loadaddr = fp->f_addr + fp->f_size; file_insert_tail(fp); /* Add to the list of loaded files */ - if (file_load_dependancies(fp) != 0) { + if (file_load_dependencies(fp) != 0) { err = ENOENT; last_file->f_next = NULL; loadaddr = last_file->f_addr + last_file->f_size; diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index fd12eaa..ca032a9 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -498,7 +498,7 @@ out: } int -linker_file_add_dependancy(linker_file_t file, linker_file_t dep) +linker_file_add_dependency(linker_file_t file, linker_file_t dep) { linker_file_t* newdeps; @@ -547,7 +547,7 @@ linker_file_lookup_symbol(linker_file_t file, const char* name, int deps) LINKER_SYMBOL_VALUES(file, sym, &symval); if (symval.value == 0) /* - * For commons, first look them up in the dependancies and + * For commons, first look them up in the dependencies and * only allocate space if not found there. */ common_size = symval.size; @@ -570,7 +570,7 @@ linker_file_lookup_symbol(linker_file_t file, const char* name, int deps) if (common_size > 0) { /* * This is a common symbol which was not found in the - * dependancies. We maintain a simple common symbol table in + * dependencies. We maintain a simple common symbol table in * the file object. */ struct common_symbol* cp; @@ -1227,7 +1227,7 @@ restart: TAILQ_FOREACH(lf, &depended_files, loaded) { if (linker_kernel_file) { linker_kernel_file->refs++; - error = linker_file_add_dependancy(lf, linker_kernel_file); + error = linker_file_add_dependency(lf, linker_kernel_file); if (error) panic("cannot add dependency"); } @@ -1241,7 +1241,7 @@ restart: linker_mdt_depend(lf, mp, &modname, &verinfo); mod = modlist_lookup2(modname, verinfo); mod->container->refs++; - error = linker_file_add_dependancy(lf, mod->container); + error = linker_file_add_dependency(lf, mod->container); if (error) panic("cannot add dependency"); } @@ -1611,7 +1611,7 @@ linker_load_module(const char *kldname, const char *modname, break; } if (parent) { - error = linker_file_add_dependancy(parent, lfdep); + error = linker_file_add_dependency(parent, lfdep); if (error) break; } @@ -1629,7 +1629,7 @@ out: * initiated kldload(2)'s of files. */ int -linker_load_dependancies(linker_file_t lf) +linker_load_dependencies(linker_file_t lf) { linker_file_t lfdep; struct mod_metadata **start, **stop, **mdp, **nmdp; @@ -1644,7 +1644,7 @@ linker_load_dependancies(linker_file_t lf) */ if (linker_kernel_file) { linker_kernel_file->refs++; - error = linker_file_add_dependancy(lf, linker_kernel_file); + error = linker_file_add_dependency(lf, linker_kernel_file); if (error) return error; } @@ -1684,7 +1684,7 @@ linker_load_dependancies(linker_file_t lf) if (mod) { /* woohoo, it's loaded already */ lfdep = mod->container; lfdep->refs++; - error = linker_file_add_dependancy(lf, lfdep); + error = linker_file_add_dependency(lf, lfdep); if (error) break; continue; diff --git a/sys/kern/link_aout.c b/sys/kern/link_aout.c index e410b20..a647d8f 100644 --- a/sys/kern/link_aout.c +++ b/sys/kern/link_aout.c @@ -256,7 +256,7 @@ link_aout_load_file(linker_class_t lc, const char* filename, linker_file_t* resu lf->address = af->address; lf->size = header.a_text + header.a_data + header.a_bss; - error = linker_load_dependancies(lf); + error = linker_load_dependencies(lf); if (error) goto out; error = relocate_file(af); diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 5da9a83..5044ceb 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -738,7 +738,7 @@ link_elf_load_file(linker_class_t cls, const char* filename, linker_file_t* resu error = parse_dynamic(ef); if (error) goto out; - error = linker_load_dependancies(lf); + error = linker_load_dependencies(lf); if (error) goto out; #if 0 /* this will be more trouble than it's worth for now */ diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 5da9a83..5044ceb 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -738,7 +738,7 @@ link_elf_load_file(linker_class_t cls, const char* filename, linker_file_t* resu error = parse_dynamic(ef); if (error) goto out; - error = linker_load_dependancies(lf); + error = linker_load_dependencies(lf); if (error) goto out; #if 0 /* this will be more trouble than it's worth for now */ diff --git a/sys/sys/linker.h b/sys/sys/linker.h index f70f93c..28169d5 100644 --- a/sys/sys/linker.h +++ b/sys/sys/linker.h @@ -74,8 +74,8 @@ struct linker_file { int id; /* unique id */ caddr_t address; /* load address */ size_t size; /* size of file */ - int ndeps; /* number of dependancies */ - linker_file_t* deps; /* list of dependancies */ + int ndeps; /* number of dependencies */ + linker_file_t* deps; /* list of dependencies */ STAILQ_HEAD(, common_symbol) common; /* list of common symbols */ TAILQ_HEAD(, module) modules; /* modules in this file */ TAILQ_ENTRY(linker_file) loaded; /* preload dependency support */ @@ -133,12 +133,12 @@ linker_file_t linker_make_file(const char* _filename, linker_class_t _cls); int linker_file_unload(linker_file_t _file); /* - * Add a dependancy to a file. + * Add a dependency to a file. */ -int linker_file_add_dependancy(linker_file_t _file, linker_file_t _dep); +int linker_file_add_dependency(linker_file_t _file, linker_file_t _dep); /* - * Lookup a symbol in a file. If deps is TRUE, look in dependancies + * Lookup a symbol in a file. If deps is TRUE, look in dependencies * if not found in file. */ caddr_t linker_file_lookup_symbol(linker_file_t _file, const char* _name, @@ -156,7 +156,7 @@ int linker_file_lookup_set(linker_file_t _file, const char *_name, * This routine is responsible for finding dependencies of userland * initiated kldload(2)'s of files. */ -int linker_load_dependancies(linker_file_t _lf); +int linker_load_dependencies(linker_file_t _lf); /* * DDB Helpers, tuned specifically for ddb/db_kld.c |