From owner-svn-src-all@freebsd.org Sat May 18 13:02:10 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E12D5158A5AA for ; Sat, 18 May 2019 13:02:09 +0000 (UTC) (envelope-from tsoome@me.com) Received: from pv50p00im-ztdg10021901.me.com (pv50p00im-ztdg10021901.me.com [17.58.6.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7DBCE81680 for ; Sat, 18 May 2019 13:02:09 +0000 (UTC) (envelope-from tsoome@me.com) Received: from nazgul.lan (148-52-235-80.sta.estpak.ee [80.235.52.148]) by pv50p00im-ztdg10021901.me.com (Postfix) with ESMTPSA id 56FFB881906; Sat, 18 May 2019 12:53:49 +0000 (UTC) From: Toomas Soome Message-Id: <826320C2-9DF0-4C22-8234-E0F66F8AAEB2@me.com> Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.11\)) Subject: Re: svn commit: r347953 - head/cddl/contrib/opensolaris/cmd/zfs Date: Sat, 18 May 2019 15:53:46 +0300 In-Reply-To: <20190518123708.GA73234@FreeBSD.org> Cc: Allan Jude , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org To: Alexey Dokuchaev References: <201905181227.x4ICRMsG073717@repo.freebsd.org> <20190518123708.GA73234@FreeBSD.org> X-Mailer: Apple Mail (2.3445.104.11) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-05-18_10:, , signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 mlxscore=0 mlxlogscore=683 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1812120000 definitions=main-1905180093 X-Rspamd-Queue-Id: 7DBCE81680 X-Spamd-Bar: ------ X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.981,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 May 2019 13:02:10 -0000 > On 18 May 2019, at 15:37, Alexey Dokuchaev wrote: >=20 > On Sat, May 18, 2019 at 12:27:22PM +0000, Allan Jude wrote: >> New Revision: 347953 >> URL: https://svnweb.freebsd.org/changeset/base/347953 >>=20 >> Log: >> MFV/ZoL: `zfs userspace` ignored all unresolved UIDs after the first >>=20 >> zfsonlinux/zfs@88cfff182432e4d1c24c877f33b47ee6cf109eee >>=20 >> zfs_main: fix `zfs userspace` squashing unresolved entries >>=20 >> ... >> @@ -2368,10 +2369,12 @@ us_compare(const void *larg, const void = *rarg, void *u >> if (rv64 !=3D lv64) >> rc =3D (rv64 < lv64) ? 1 : -1; >> } else { >> - (void) nvlist_lookup_string(lnvl, = propname, >> - &lvstr); >> - (void) nvlist_lookup_string(rnvl, = propname, >> - &rvstr); >> + if ((nvlist_lookup_string(lnvl, = propname, >> + &lvstr) =3D=3D ENOENT) = || >> + (nvlist_lookup_string(rnvl, = propname, >> + &rvstr) =3D=3D ENOENT)) = { >> + goto compare_nums; >> + } >=20 > Another thing not to like about ZoL: their completely bogus code style > and formatting practices (look at those "&rvstr) =3D=3D ENOENT"). If = they > are going to listen to us, can we at least try to convince them not to > break existing, much FreeBSD-like formatting? >=20 > ./danfe >=20 Actually it is required to use the proper cstyle=E2=80=A6 = https://github.com/zfsonlinux/zfs/blob/master/.github/CONTRIBUTING.md#styl= e-guides = Therefore bogus style is bug. rgds, toomas