From owner-svn-src-all@FreeBSD.ORG  Sun Apr  4 14:23:28 2010
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 D3612106566B;
	Sun,  4 Apr 2010 14:23:28 +0000 (UTC) (envelope-from ume@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C22238FC22;
	Sun,  4 Apr 2010 14:23:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o34ENSgx035632;
	Sun, 4 Apr 2010 14:23:28 GMT (envelope-from ume@svn.freebsd.org)
Received: (from ume@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o34ENSju035630;
	Sun, 4 Apr 2010 14:23:28 GMT (envelope-from ume@svn.freebsd.org)
Message-Id: <201004041423.o34ENSju035630@svn.freebsd.org>
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Sun, 4 Apr 2010 14:23:28 +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: r206159 - head/usr.sbin/services_mkdb
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: Sun, 04 Apr 2010 14:23:28 -0000

Author: ume
Date: Sun Apr  4 14:23:28 2010
New Revision: 206159
URL: http://svn.freebsd.org/changeset/base/206159

Log:
  Fix compilation error on 9-CURRENT.
  
  Reported by:	nyan
  MFC after:	2 weeks

Modified:
  head/usr.sbin/services_mkdb/services_mkdb.c

Modified: head/usr.sbin/services_mkdb/services_mkdb.c
==============================================================================
--- head/usr.sbin/services_mkdb/services_mkdb.c	Sun Apr  4 13:17:05 2010	(r206158)
+++ head/usr.sbin/services_mkdb/services_mkdb.c	Sun Apr  4 14:23:28 2010	(r206159)
@@ -282,11 +282,11 @@ parseservices(const char *fname, StringL
 
 		/* build list of aliases */
 		if (sl_find(s, name) == NULL) {
-			char *p;
+			char *p2;
 
-			if ((p = strdup(name)) == NULL)
+			if ((p2 = strdup(name)) == NULL)
 				err(1, "Cannot copy string");
-			(void)sl_add(s, p);
+			(void)sl_add(s, p2);
 		}
 
 		if (aliases) {
@@ -294,11 +294,11 @@ parseservices(const char *fname, StringL
 				if (alias[0] == '\0')
 					continue;
 				if (sl_find(s, alias) == NULL) {
-					char *p;
+					char *p2;
 
-					if ((p = strdup(alias)) == NULL)
+					if ((p2 = strdup(alias)) == NULL)
 						err(1, "Cannot copy string");
-					(void)sl_add(s, p);
+					(void)sl_add(s, p2);
 				}
 			}
 		}