From owner-p4-projects@FreeBSD.ORG  Fri Oct  7 22:16:26 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D98291065672; Fri,  7 Oct 2011 22:16:25 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9C74A106566B
	for <perforce@freebsd.org>; Fri,  7 Oct 2011 22:16:25 +0000 (UTC)
	(envelope-from pjd@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 8AE988FC08
	for <perforce@freebsd.org>; Fri,  7 Oct 2011 22:16:25 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p97MGPdo000118
	for <perforce@freebsd.org>; Fri, 7 Oct 2011 22:16:25 GMT
	(envelope-from pjd@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p97MGPN6000115
	for perforce@freebsd.org; Fri, 7 Oct 2011 22:16:25 GMT
	(envelope-from pjd@freebsd.org)
Date: Fri, 7 Oct 2011 22:16:25 GMT
Message-Id: <201110072216.p97MGPN6000115@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	pjd@freebsd.org using -f
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 199874 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Oct 2011 22:16:26 -0000

http://p4web.freebsd.org/@@199874?ac=10

Change 199874 by pjd@pjd_anger on 2011/10/07 22:15:34

	Simplify code by using strdup().

Affected files ...

.. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#48 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#48 (text+ko) ====

@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#47 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#48 $
  */
 
 #include <sys/types.h>
@@ -155,18 +155,15 @@
 {
 	char *ptr;
 	char *oldname;
-	size_t len;
 
 	/* If lastfile is NULL try to get it from the 'current' link.  */
 	if (lastfile == NULL)
 		lastfile = get_curfile();
 
 	if (lastfile != NULL) {
-		len = strlen(lastfile) + 1;
-		oldname = (char *)malloc(len);
+		oldname = strdup(lastfile);
 		if (oldname == NULL)
 			return (-1);
-		strlcpy(oldname, lastfile, len);
 
 		/* Rename the last file -- append timestamp. */
 		if ((ptr = strstr(lastfile, NOT_TERMINATED)) != NULL) {