diff options
| author | sjg <sjg@FreeBSD.org> | 2013-09-05 20:18:59 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-09-05 20:18:59 +0000 |
| commit | 62bb1062226d3ce6a2350808256a25508978352d (patch) | |
| tree | 22b131dceb13c3df96da594fbaadb693504797c7 /usr.sbin/kldxref | |
| parent | 72ab90509b3a51ab361bf710338f2ef44a4e360d (diff) | |
| parent | 04932445481c2cb89ff69a83b961bdef3d64757e (diff) | |
| download | FreeBSD-src-62bb1062226d3ce6a2350808256a25508978352d.zip FreeBSD-src-62bb1062226d3ce6a2350808256a25508978352d.tar.gz | |
Merge from head
Diffstat (limited to 'usr.sbin/kldxref')
| -rw-r--r-- | usr.sbin/kldxref/ef.c | 1 | ||||
| -rw-r--r-- | usr.sbin/kldxref/ef_amd64.c | 1 | ||||
| -rw-r--r-- | usr.sbin/kldxref/ef_i386.c | 1 | ||||
| -rw-r--r-- | usr.sbin/kldxref/ef_obj.c | 4 | ||||
| -rw-r--r-- | usr.sbin/kldxref/kldxref.c | 1 |
5 files changed, 1 insertions, 7 deletions
diff --git a/usr.sbin/kldxref/ef.c b/usr.sbin/kldxref/ef.c index b1b00cc..b683898 100644 --- a/usr.sbin/kldxref/ef.c +++ b/usr.sbin/kldxref/ef.c @@ -42,7 +42,6 @@ #include <fcntl.h> #include <machine/elf.h> #define FREEBSD_ELF -#include <link.h> #include <err.h> diff --git a/usr.sbin/kldxref/ef_amd64.c b/usr.sbin/kldxref/ef_amd64.c index 5a1d192..b90882d 100644 --- a/usr.sbin/kldxref/ef_amd64.c +++ b/usr.sbin/kldxref/ef_amd64.c @@ -32,7 +32,6 @@ #include <err.h> #include <errno.h> -#include <string.h> #include "ef.h" diff --git a/usr.sbin/kldxref/ef_i386.c b/usr.sbin/kldxref/ef_i386.c index 9b10c7d..b953f4a 100644 --- a/usr.sbin/kldxref/ef_i386.c +++ b/usr.sbin/kldxref/ef_i386.c @@ -32,7 +32,6 @@ #include <err.h> #include <errno.h> -#include <string.h> #include "ef.h" diff --git a/usr.sbin/kldxref/ef_obj.c b/usr.sbin/kldxref/ef_obj.c index 5a4ae22..e6099f2 100644 --- a/usr.sbin/kldxref/ef_obj.c +++ b/usr.sbin/kldxref/ef_obj.c @@ -44,7 +44,6 @@ #include <fcntl.h> #include <machine/elf.h> #define FREEBSD_ELF -#include <link.h> #include <err.h> @@ -344,7 +343,7 @@ ef_obj_open(const char *filename, struct elf_file *efile, int verbose) if ((fd = open(filename, O_RDONLY)) == -1) return errno; - ef = malloc(sizeof(*ef)); + ef = calloc(1, sizeof(*ef)); if (ef == NULL) { close(fd); return (ENOMEM); @@ -353,7 +352,6 @@ ef_obj_open(const char *filename, struct elf_file *efile, int verbose) efile->ef_ef = ef; efile->ef_ops = &ef_obj_file_ops; - bzero(ef, sizeof(*ef)); ef->ef_verbose = verbose; ef->ef_fd = fd; ef->ef_name = strdup(filename); diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c index b4de191..16b9058 100644 --- a/usr.sbin/kldxref/kldxref.c +++ b/usr.sbin/kldxref/kldxref.c @@ -42,7 +42,6 @@ #include <sys/stat.h> #include <sys/module.h> #define FREEBSD_ELF -#include <link.h> #include <err.h> #include <fts.h> #include <string.h> |
