From owner-svn-src-head@freebsd.org Sat Jan 13 18:46:34 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1829AE78F34 for ; Sat, 13 Jan 2018 18:46:34 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from sonic302-36.consmr.mail.gq1.yahoo.com (sonic302-36.consmr.mail.gq1.yahoo.com [98.137.68.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DCEEE71BBB for ; Sat, 13 Jan 2018 18:46:33 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1515869187; bh=X+5YNohHpG+cHuOpbSes1C+aWwfxX6x/qAkNzatHLRE=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From:Subject; b=l5dqU6wX6GtHsM8/XrzwH8iHlzA+RZ2HTcD1E+wDgOtPFBGLco89TC55eU86wzb0mTiZopm5EzZh2Dwe2SFU4CbFIEQV5EVOJvz/qQs8qvpp4obhCf4FMiK1KQKLRi5SXsK414clcrNpmhnqEmaBNLOmmZPkcjxtJ/xfw7d29ldWy7k+gPBioWAHSmfdicvszaTRfAh6l/f3RbEdkr/5jdWXpgjQmnd+breAumW0Lew6V7w0OO4bi1do/1pvKtew3ad7+CMUis5+blw4nPT6/cLME3Y+nb6EcwsoFiFMV0ejQ6gCAGneObhDOxPf0jP24SuMsijt+q4Oroxd/O7o/A== X-YMail-OSG: PTnuY3MVM1kY_EegpgCFueHxSmwY5nvuMF170QF7v6OLtmljzSIxFrF9sfBHWs9 pUxF23jEe9dUrKaryPX2k_lQE0BQLNPkrnZWNtM972b8_7obdqtWT1EcqiZVrcXATQYfatF5i37d xP8TllUbsAT4YURv1L8JcTKW0WUAo62FACxSXNC7O02I1v2xbH5Ow1bpzUX9qp2RUPdIiTcAOdjW qBYUJL6DngqH3_RHL74HroNAuEX8h7JmP3UihcFFlCriOxWzF5vEgFbYCvjfMunWzIQrd_mdnBwT u6u2nzFMT19lvGOQyR29UoQZWnltIDWqsFZB1ZCxFhx6J9NsaVkKYZlakyL5HYyr5IA.BEIzvP5S 5sQRvS1PGlfDHHEXf16EIXWL9XIRrStw_MWUtN.uql07XcC1oimIZL7P6Jp2s7ntzsCUszANhDkd eVX0o3qBJzlzOkEA7J_nFZ2dlNb96GxPSxKTaLvgnmz97F3YHicbsgdFKz20n9C7JYiNWGAIX Received: from sonic.gate.mail.ne1.yahoo.com by sonic302.consmr.mail.gq1.yahoo.com with HTTP; Sat, 13 Jan 2018 18:46:27 +0000 Received: from smtp107.rhel.mail.gq1.yahoo.com (EHLO [192.168.0.8]) ([10.211.35.149]) by smtp404.mail.gq1.yahoo.com (JAMES SMTP Server ) with ESMTPA ID 098556ea92db86deb3372d59b6ccc9e6; Sat, 13 Jan 2018 18:46:25 +0000 (UTC) Subject: Re: svn commit: r327934 - head/sys/contrib/zstd/lib/freebsd To: Dimitry Andric Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201801131809.w0DI9AZw072646@repo.freebsd.org> <65C751BF-FC03-4541-8D2A-A02C3A1B2A13@FreeBSD.org> From: Pedro Giffuni Message-ID: Date: Sat, 13 Jan 2018 13:46:25 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: <65C751BF-FC03-4541-8D2A-A02C3A1B2A13@FreeBSD.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Jan 2018 18:46:34 -0000 On 01/13/18 13:44, Dimitry Andric wrote: > On 13 Jan 2018, at 19:09, Pedro F. Giffuni 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.