From owner-svn-src-stable@freebsd.org  Sat Oct 21 19:26:48 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 568C0E37C31;
 Sat, 21 Oct 2017 19:26:48 +0000 (UTC)
 (envelope-from oshogbo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (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 23E2667830;
 Sat, 21 Oct 2017 19:26:48 +0000 (UTC)
 (envelope-from oshogbo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9LJQlnd015196;
 Sat, 21 Oct 2017 19:26:47 GMT (envelope-from oshogbo@FreeBSD.org)
Received: (from oshogbo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9LJQls7015195;
 Sat, 21 Oct 2017 19:26:47 GMT (envelope-from oshogbo@FreeBSD.org)
Message-Id: <201710211926.v9LJQls7015195@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to
 oshogbo@FreeBSD.org using -f
From: Mariusz Zaborski <oshogbo@FreeBSD.org>
Date: Sat, 21 Oct 2017 19:26:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r324827 - stable/11/sys/contrib/libnv
X-SVN-Group: stable-11
X-SVN-Commit-Author: oshogbo
X-SVN-Commit-Paths: stable/11/sys/contrib/libnv
X-SVN-Commit-Revision: 324827
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Oct 2017 19:26:48 -0000

Author: oshogbo
Date: Sat Oct 21 19:26:47 2017
New Revision: 324827
URL: https://svnweb.freebsd.org/changeset/base/324827

Log:
  MFC r323859:
  Simplify the code by _not_ expecting success under 'fail'.
  
  Submitted by:	pjd@ and oshogbo@
  MFC after:	1 month
  Sponsored by:	Wheel Systems

Modified:
  stable/11/sys/contrib/libnv/nvpair.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/contrib/libnv/nvpair.c
==============================================================================
--- stable/11/sys/contrib/libnv/nvpair.c	Sat Oct 21 19:14:45 2017	(r324826)
+++ stable/11/sys/contrib/libnv/nvpair.c	Sat Oct 21 19:26:47 2017	(r324827)
@@ -1740,7 +1740,6 @@ nvpair_move_descriptor_array(const char *name, int *va
 	nvpair_t *nvp;
 	size_t i;
 
-	nvp = NULL;
 	if (value == NULL || nitems == 0) {
 		ERRNO_SET(EINVAL);
 		return (NULL);
@@ -1755,19 +1754,20 @@ nvpair_move_descriptor_array(const char *name, int *va
 
 	nvp = nvpair_allocv(name, NV_TYPE_DESCRIPTOR_ARRAY,
 	    (uint64_t)(uintptr_t)value, sizeof(value[0]) * nitems, nitems);
+	if (nvp == NULL)
+		goto fail;
 
+	return (nvp);
 fail:
-	if (nvp == NULL) {
-		ERRNO_SAVE();
-		for (i = 0; i < nitems; i++) {
-			if (fd_is_valid(value[i]))
-				close(value[i]);
-		}
-		nv_free(value);
-		ERRNO_RESTORE();
+	ERRNO_SAVE();
+	for (i = 0; i < nitems; i++) {
+		if (fd_is_valid(value[i]))
+			close(value[i]);
 	}
+	nv_free(value);
+	ERRNO_RESTORE();
 
-	return (nvp);
+	return (NULL);
 }
 #endif