From owner-svn-src-stable-7@FreeBSD.ORG  Thu Dec 20 00:28:52 2012
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 960CE7E7;
 Thu, 20 Dec 2012 00:28:52 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 79DC08FC0C;
 Thu, 20 Dec 2012 00:28:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBK0SqBU021272;
 Thu, 20 Dec 2012 00:28:52 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBK0SqZh021262;
 Thu, 20 Dec 2012 00:28:52 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201212200028.qBK0SqZh021262@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Thu, 20 Dec 2012 00:28:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r244458 - stable/7/usr.sbin/pw
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
 <svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-7>, 
 <mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
 <mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Dec 2012 00:28:52 -0000

Author: eadler
Date: Thu Dec 20 00:28:51 2012
New Revision: 244458
URL: http://svnweb.freebsd.org/changeset/base/244458

Log:
  MFC r243894:
  	Remove useless check for NULL prior to free.
  
  Approved by:	cperciva (implicit)

Modified:
  stable/7/usr.sbin/pw/bitmap.c
  stable/7/usr.sbin/pw/pw_group.c
Directory Properties:
  stable/7/usr.sbin/pw/   (props changed)

Modified: stable/7/usr.sbin/pw/bitmap.c
==============================================================================
--- stable/7/usr.sbin/pw/bitmap.c	Thu Dec 20 00:28:51 2012	(r244457)
+++ stable/7/usr.sbin/pw/bitmap.c	Thu Dec 20 00:28:51 2012	(r244458)
@@ -50,8 +50,7 @@ bm_alloc(int size)
 void
 bm_dealloc(struct bitmap * bm)
 {
-	if (bm->map)
-		free(bm->map);
+	free(bm->map);
 }
 
 static void

Modified: stable/7/usr.sbin/pw/pw_group.c
==============================================================================
--- stable/7/usr.sbin/pw/pw_group.c	Thu Dec 20 00:28:51 2012	(r244457)
+++ stable/7/usr.sbin/pw/pw_group.c	Thu Dec 20 00:28:51 2012	(r244458)
@@ -272,8 +272,7 @@ pw_group(struct userconf * cnf, int mode
 
 	pw_log(cnf, mode, W_GROUP, "%s(%ld)", grp->gr_name, (long) grp->gr_gid);
 
-	if (members)
-		free(members);
+	free(members);
 
 	return EXIT_SUCCESS;
 }