Date: Mon, 29 May 2006 13:49:35 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 98070 for review Message-ID: <200605291349.k4TDnZhD048816@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=98070 Change 98070 by jhb@jhb_mutex on 2006/05/29 13:48:39 Diff reductions with CVS and trim a useless else that only serves to obfuscate the code. Affected files ... .. //depot/projects/smpng/sys/kern/kern_linker.c#64 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_linker.c#64 (text+ko) ==== @@ -306,8 +306,8 @@ KLD_DPF(FILE, ("linker_file_register_modules: registering modules" " in %s\n", lf->filename)); - if (linker_file_lookup_set(lf, "modmetadata_set", &start, &stop, - NULL) != 0) { + if (linker_file_lookup_set(lf, "modmetadata_set", &start, + &stop, NULL) != 0) { /* * This fallback should be unnecessary, but if we get booted * from boot2 instead of loader and we are missing our @@ -581,8 +581,8 @@ KLD_DPF(FILE, ("linker_file_unload: module %p" " vetoes unload\n", mod)); return (error); - } else - MOD_XLOCK; + } + MOD_XLOCK; module_release(mod); } MOD_XUNLOCK; @@ -648,10 +648,10 @@ } /* - * Locate a linker set and its contents. This is a helper function to - * avoid linker_if.h exposure elsewhere. Note: firstp and lastp are - * really void **. This function is used in this file so we can avoid - * having lots of (void **) casts. + * Locate a linker set and its contents. This is a helper function to avoid + * linker_if.h exposure elsewhere. Note: firstp and lastp are really void **. + * This function is used in this file so we can avoid having lots of (void **) + * casts. */ int linker_file_lookup_set(linker_file_t file, const char *name, @@ -766,7 +766,7 @@ * * Note that we do not obey list locking protocols here. We really don't need * DDB to hang because somebody's got the lock held. We'll take the chance - * that the files list is inconsistent instead. + * that the files list is inconsistant instead. */ int @@ -1899,7 +1899,7 @@ int ver, error = 0, count; /* - * All files are dependent on /kernel. + * All files are dependant on /kernel. */ KLD_LOCK_ASSERT(); if (linker_kernel_file) { @@ -1952,8 +1952,7 @@ break; continue; } - error = linker_load_module(NULL, modname, lf, verinfo, - NULL); + error = linker_load_module(NULL, modname, lf, verinfo, NULL); if (error) { printf("KLD %s: depends on %s - not available\n", lf->filename, modname);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605291349.k4TDnZhD048816>