Date: Sat, 18 May 2019 12:37:08 +0000 From: Alexey Dokuchaev <danfe@freebsd.org> To: Allan Jude <allanjude@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r347953 - head/cddl/contrib/opensolaris/cmd/zfs Message-ID: <20190518123708.GA73234@FreeBSD.org> In-Reply-To: <201905181227.x4ICRMsG073717@repo.freebsd.org> References: <201905181227.x4ICRMsG073717@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, May 18, 2019 at 12:27:22PM +0000, Allan Jude wrote: > New Revision: 347953 > URL: https://svnweb.freebsd.org/changeset/base/347953 > > Log: > MFV/ZoL: `zfs userspace` ignored all unresolved UIDs after the first > > zfsonlinux/zfs@88cfff182432e4d1c24c877f33b47ee6cf109eee > > zfs_main: fix `zfs userspace` squashing unresolved entries > > ... > @@ -2368,10 +2369,12 @@ us_compare(const void *larg, const void *rarg, void *u > if (rv64 != lv64) > rc = (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) == ENOENT) || > + (nvlist_lookup_string(rnvl, propname, > + &rvstr) == ENOENT)) { > + goto compare_nums; > + } Another thing not to like about ZoL: their completely bogus code style and formatting practices (look at those "&rvstr) == 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? ./danfe
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190518123708.GA73234>