d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a number of misspellings of "dependency" and "dependencies" in

Browse Source 
comments and function names.

PR:		kern/8589
Submitted by:	Rajesh Vaidheeswarran <rv@fore.com>
This commit is contained in:
Ian Dowse 2001-11-16 21:08:40 +00:00
parent c55c345375
commit 7b9716bad2
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/boot/common/module.c
View File

@ -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;

18
sys/kern/kern_linker.c
View File

@ -498,7 +498,7 @@ linker_file_unload(linker_file_t file)
}
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 @@ linker_preload(void* arg)
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 @@ linker_preload(void* arg)
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 @@ linker_load_module(const char *kldname, const char *modname,
* 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;

2
sys/kern/link_aout.c
View File

@ -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);

2
sys/kern/link_elf.c
View File

@ -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 */

2
sys/kern/link_elf_obj.c
View File

@ -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 */

12
sys/sys/linker.h
View File

@ -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