From owner-svn-src-projects@FreeBSD.ORG  Fri Feb 15 01:27:54 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A1DC9FD;
 Fri, 15 Feb 2013 01:27:54 +0000 (UTC)
 (envelope-from lstewart@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 950DA920;
 Fri, 15 Feb 2013 01:27:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1F1RsSh040174;
 Fri, 15 Feb 2013 01:27:54 GMT
 (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1F1Rsdl040173;
 Fri, 15 Feb 2013 01:27:54 GMT
 (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201302150127.r1F1Rsdl040173@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Fri, 15 Feb 2013 01:27:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r246816 -
 projects/diffused_head/sbin/ipfw/diffuse_exporter
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Feb 2013 01:27:54 -0000

Author: lstewart
Date: Fri Feb 15 01:27:54 2013
New Revision: 246816
URL: http://svnweb.freebsd.org/changeset/base/246816

Log:
  Avoid shadowing the global getopt(3) optarg variable.
  
  Reported by:	clang

Modified:
  projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c

Modified: projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c
==============================================================================
--- projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c	Fri Feb 15 01:25:27 2013	(r246815)
+++ projects/diffused_head/sbin/ipfw/diffuse_exporter/diffuse_exporter.c	Fri Feb 15 01:27:54 2013	(r246816)
@@ -229,13 +229,13 @@ parse_anode(char *s, struct action_node 
 }
 
 static void
-parse_anodes(char *optarg)
+parse_anodes(char *oparg)
 {
 	struct action_node *tmp_anode;
 	char *anode_str, *x;
 	char *sep = ",";
 
-	x = strdup(optarg);
+	x = strdup(oparg);
 
 	for (anode_str = strtok(x, sep); anode_str;
 	    anode_str = strtok(NULL, sep)) {
@@ -250,13 +250,13 @@ parse_anodes(char *optarg)
 }
 
 static void
-parse_class(char *optarg, uint32_t *class_ip, uint16_t *class_port)
+parse_class(char *oparg, uint32_t *class_ip, uint16_t *class_port)
 {
 	struct addrinfo *ai, *curai;
 	char *errptr, *p;
 	int ret;
 
-	p = strstr(optarg, ":");
+	p = strstr(oparg, ":");
 
 	if (p != NULL) {
 		*p = '\0';
@@ -266,7 +266,7 @@ parse_class(char *optarg, uint32_t *clas
 			errx(EX_USAGE, "parse error port '%s': %s", p, errptr);
 	}
 
-	ret = getaddrinfo(optarg, NULL, NULL, &ai);
+	ret = getaddrinfo(oparg, NULL, NULL, &ai);
 
 	if (ret != 0)
 		errx(EX_OSERR, "%s", gai_strerror(ret));