diff options
| author | Xin LI <delphij@FreeBSD.org> | 2019-08-08 07:27:49 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2019-08-08 07:27:49 +0000 |
| commit | 22bbc4b24270ec55c267a5b4ca4530991c3da408 (patch) | |
| tree | b6828d8332d5cc1df67d005e8d3c3cc2d5febc82 | |
| parent | 92e9c0608bf161df04d14160084da2d50bcad30e (diff) | |
| download | src-22bbc4b24270ec55c267a5b4ca4530991c3da408.tar.gz src-22bbc4b24270ec55c267a5b4ca4530991c3da408.zip | |
Convert DDB_CTF to use newer version of ZLIB.
PR: 229763
Submitted by: Yoshihiro Ota <ota j email ne jp>
Differential Revision: https://reviews.freebsd.org/D21176
Notes
Notes:
svn path=/head/; revision=350744
| -rw-r--r-- | sys/kern/kern_ctf.c | 18 | ||||
| -rw-r--r-- | sys/kern/link_elf.c | 4 | ||||
| -rw-r--r-- | sys/kern/link_elf_obj.c | 2 |
3 files changed, 2 insertions, 22 deletions
diff --git a/sys/kern/kern_ctf.c b/sys/kern/kern_ctf.c index 74ec15400cf3..2d0232ca8db6 100644 --- a/sys/kern/kern_ctf.c +++ b/sys/kern/kern_ctf.c @@ -40,21 +40,7 @@ #define CTF_HDR_STRLEN_U32 8 #ifdef DDB_CTF -static void * -z_alloc(void *nil, u_int items, u_int size) -{ - void *ptr; - - ptr = malloc(items * size, M_TEMP, M_NOWAIT); - return ptr; -} - -static void -z_free(void *nil, void *ptr) -{ - free(ptr, M_TEMP); -} - +#include <contrib/zlib/zlib.h> #endif static int @@ -269,8 +255,6 @@ link_elf_ctf_get(linker_file_t lf, linker_ctf_t *lc) /* Initialise the zlib structure. */ bzero(&zs, sizeof(zs)); - zs.zalloc = z_alloc; - zs.zfree = z_free; if (inflateInit(&zs) != Z_OK) { error = EIO; diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 800c0d685bc7..8d07dd5bbb7c 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -67,10 +67,6 @@ __FBSDID("$FreeBSD$"); #include <sys/link_elf.h> -#ifdef DDB_CTF -#include <sys/zlib.h> -#endif - #include "linker_if.h" #define MAXSEGS 4 diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 0346a8b2fdce..55c2f7de387d 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); #include <sys/link_elf.h> #ifdef DDB_CTF -#include <sys/zlib.h> +#include <contrib/zlib/zlib.h> #endif #include "linker_if.h" |