From owner-svn-src-all@FreeBSD.ORG  Mon Sep 24 05:24:11 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2D21D1065670;
	Mon, 24 Sep 2012 05:24:11 +0000 (UTC)
	(envelope-from kevlo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 194A48FC0C;
	Mon, 24 Sep 2012 05:24:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8O5OAj0050949;
	Mon, 24 Sep 2012 05:24:10 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8O5OApw050947;
	Mon, 24 Sep 2012 05:24:10 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201209240524.q8O5OApw050947@svn.freebsd.org>
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Mon, 24 Sep 2012 05:24:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240881 - head/lib/libstand
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Sep 2012 05:24:11 -0000

Author: kevlo
Date: Mon Sep 24 05:24:10 2012
New Revision: 240881
URL: http://svn.freebsd.org/changeset/base/240881

Log:
  Revert r240850 and remove redundant NULL check before free(3).
  free(3) handles NULL parameter fine.
  
  Reviewed by:	kib, Garrett Cooper

Modified:
  head/lib/libstand/nfs.c

Modified: head/lib/libstand/nfs.c
==============================================================================
--- head/lib/libstand/nfs.c	Mon Sep 24 03:14:17 2012	(r240880)
+++ head/lib/libstand/nfs.c	Mon Sep 24 05:24:10 2012	(r240881)
@@ -606,10 +606,8 @@ nfs_open(const char *upath, struct open_
 	error = 0;
 
 out:
-	if (newfd)
-		free(newfd);
-	if (path)
-		free(path);
+	free(newfd);
+	free(path);
 #else
         currfd->iodesc = desc;
 
@@ -1256,10 +1254,8 @@ nfs_open(const char *upath, struct open_
 	error = 0;
 
 out:
-	if (newfd)
-		free(newfd);
-	if (path)
-		free(path);
+	free(newfd);
+	free(path);
 #else
 	currfd->iodesc = desc;