summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2006-06-20 19:32:10 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2006-06-20 19:32:10 +0000
commit73a2437a83202bb2d0b4fa167ac10c83d668e2bf (patch)
treee66cc3a1a82578b3cc25e5789d8981e3a4eca802
parent15a901e26368e772e7d61d05b6f5bba4784bcdd8 (diff)
Notes
-rw-r--r--sys/kern/kern_linker.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c
index 52eac0f7320e..50e22cdb1fee 100644
--- a/sys/kern/kern_linker.c
+++ b/sys/kern/kern_linker.c
@@ -345,7 +345,6 @@ linker_load_file(const char *filename, linker_file_t *result)
lf->refs++;
return (0);
}
- lf = NULL;
foundfile = 0;
error = 0;
@@ -894,7 +893,7 @@ kldfind(struct thread *td, struct kldfind_args *uap)
char *pathname;
const char *filename;
linker_file_t lf;
- int error = 0;
+ int error;
#ifdef MAC
error = mac_check_kld_stat(td->td_ucred);
@@ -916,8 +915,7 @@ kldfind(struct thread *td, struct kldfind_args *uap)
else
error = ENOENT;
out:
- if (pathname)
- free(pathname, M_TEMP);
+ free(pathname, M_TEMP);
mtx_unlock(&Giant);
return (error);
}
@@ -1789,8 +1787,7 @@ linker_load_module(const char *kldname, const char *modname,
*lfpp = lfdep;
} while (0);
out:
- if (pathname)
- free(pathname, M_LINKER);
+ free(pathname, M_LINKER);
return (error);
}