Date: Sat, 13 Jan 2018 13:46:25 -0500 From: Pedro Giffuni <pfg@FreeBSD.org> To: Dimitry Andric <dim@FreeBSD.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r327934 - head/sys/contrib/zstd/lib/freebsd Message-ID: <e3a5c2a1-d61f-05f6-e223-0959d3e9e6ae@FreeBSD.org> In-Reply-To: <65C751BF-FC03-4541-8D2A-A02C3A1B2A13@FreeBSD.org> References: <201801131809.w0DI9AZw072646@repo.freebsd.org> <65C751BF-FC03-4541-8D2A-A02C3A1B2A13@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 01/13/18 13:44, Dimitry Andric wrote: > On 13 Jan 2018, at 19:09, Pedro F. Giffuni <pfg@FreeBSD.org> wrote: >> Author: pfg >> Date: Sat Jan 13 18:09:09 2018 >> New Revision: 327934 >> URL: https://svnweb.freebsd.org/changeset/base/327934 >> >> Log: >> zstd: Use memalloc(9) for calloc macro. >> >> This is in contrib code but since we only have memalloc(9) in current we >> will not upstream this. >> >> Modified: >> head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h >> >> Modified: head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h >> ============================================================================== >> --- head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h Sat Jan 13 17:56:46 2018 (r327933) >> +++ head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h Sat Jan 13 18:09:09 2018 (r327934) >> @@ -46,7 +46,7 @@ MALLOC_DECLARE(M_ZSTD); >> #define malloc(x) (malloc)((x), M_ZSTD, M_WAITOK) >> #define free(x) (free)((x), M_ZSTD) >> /* in zstd's use of calloc, a is always 1 */ >> -#define calloc(a,b) (malloc)((a)*(b), M_ZSTD, M_WAITOK | M_ZERO) >> +#define calloc(a,b) (mallocarray)((a), (b), M_ZSTD, M_WAITOK | M_ZERO) >> #endif >> >> #ifdef __cplusplus > s/memalloc/mallocarray/g, in the commit message? Oops ..yeah.. mind glitch. Should I revert/fix it? Pedro.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?e3a5c2a1-d61f-05f6-e223-0959d3e9e6ae>