mirror of
https://github.com/opnsense/src.git
synced 2026-06-14 19:20:18 -04:00
0ed1d6fb00
with an eventual goal to convert all legacl zlib callers to the new zlib version: * Move generic zlib shims that are not specific to zlib 1.0.4 to sys/dev/zlib. * Connect new zlib (1.2.11) to the zlib kernel module, currently built with Z_SOLO. * Prefix the legacy zlib (1.0.4) with 'zlib104_' namespace. * Convert sys/opencrypto/cryptodeflate.c to use new zlib. * Remove bundled zlib 1.2.3 from ZFS and adapt it to new zlib and make it depend on the zlib module. * Fix Z_SOLO build of new zlib. PR: 229763 Submitted by: Yoshihiro Ota <ota j email ne jp> Reviewed by: markm (sys/dev/zlib/zlib_kmod.c) Relnotes: yes Differential Revision: https://reviews.freebsd.org/D19706
32 lines
510 B
C
32 lines
510 B
C
/*
|
|
* This file is in the public domain.
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#include <sys/param.h>
|
|
#include <dev/zlib/zcalloc.h>
|
|
#include <sys/kernel.h>
|
|
#include <sys/malloc.h>
|
|
|
|
MALLOC_DEFINE(M_ZLIB, "zlib", "ZLIB Compressor");
|
|
|
|
void *
|
|
zcalloc_waitok(void *nil, u_int items, u_int size)
|
|
{
|
|
|
|
return mallocarray(items, size, M_ZLIB, M_WAITOK);
|
|
}
|
|
|
|
void *
|
|
zcalloc_nowait(void *nil, u_int items, u_int size)
|
|
{
|
|
|
|
return mallocarray(items, size, M_ZLIB, M_NOWAIT);
|
|
}
|
|
|
|
void
|
|
zcfree(void *nil, void *ptr)
|
|
{
|
|
|
|
free(ptr, M_ZLIB);
|
|
}
|