Date: Sat, 13 Jan 2018 11:24:17 -0800 From: Conrad Meyer <cem@freebsd.org> To: "Pedro F. Giffuni" <pfg@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r327940 - head/sys/contrib/zstd/lib/freebsd Message-ID: <CAG6CVpXN1=yDvbmjV9u-hn1_jNkq937zuDTp=WXy9CM4A9P3aw@mail.gmail.com> In-Reply-To: <201801131902.w0DJ2p5m097642@repo.freebsd.org> References: <201801131902.w0DJ2p5m097642@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is not in contrib code -- https://lists.freebsd.org/pipermail/svn-src-all/2018-January/156505.html . On Sat, Jan 13, 2018 at 11:02 AM, Pedro F. Giffuni <pfg@freebsd.org> wrote: > Author: pfg > Date: Sat Jan 13 19:02:51 2018 > New Revision: 327940 > URL: https://svnweb.freebsd.org/changeset/base/327940 > > Log: > zstd: Use mallocarray(9) for calloc macro. > > This is in contrib code but since we only have mallocarray(9) in current > we will not upstream this. > > This effectively brings back r327934, which was reverted to correct the > log message. > > 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 19:02:08 2018 (r327939) > +++ head/sys/contrib/zstd/lib/freebsd/zstd_kfreebsd.h Sat Jan 13 19:02:51 2018 (r327940) > @@ -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 >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG6CVpXN1=yDvbmjV9u-hn1_jNkq937zuDTp=WXy9CM4A9P3aw>