From owner-svn-src-projects@FreeBSD.ORG  Wed Jan 16 09:07:50 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 130C7C69;
 Wed, 16 Jan 2013 09:07:50 +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 F00486DB;
 Wed, 16 Jan 2013 09:07:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0G97nRQ061093;
 Wed, 16 Jan 2013 09:07:49 GMT
 (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0G97nQ1061092;
 Wed, 16 Jan 2013 09:07:49 GMT
 (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201301160907.r0G97nQ1061092@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Wed, 16 Jan 2013 09:07:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245505 -
 projects/diffused_head/sbin/ipfw/diffuse_collector
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: Wed, 16 Jan 2013 09:07:50 -0000

Author: lstewart
Date: Wed Jan 16 09:07:49 2013
New Revision: 245505
URL: http://svnweb.freebsd.org/changeset/base/245505

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

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

Modified: projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c
==============================================================================
--- projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c	Wed Jan 16 09:06:33 2013	(r245504)
+++ projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c	Wed Jan 16 09:07:49 2013	(r245505)
@@ -1286,12 +1286,12 @@ init_cnode(struct class_node *cnode)
 }
 
 static void
-parse_rule_nos(char *optarg)
+parse_rule_nos(char *oparg)
 {
 	char tmp[128];
 	char *errptr, *p;
 
-	strncpy(tmp, optarg, sizeof(tmp));
+	strncpy(tmp, oparg, sizeof(tmp));
 	p = strstr(tmp, "-");
 
 	if (p != NULL) {