From owner-p4-projects@FreeBSD.ORG  Fri Dec  3 23:23:34 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1EA8C16A4D0; Fri,  3 Dec 2004 23:23:34 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id ED10B16A4CE
	for <perforce@freebsd.org>; Fri,  3 Dec 2004 23:23:33 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BC2FD43D45
	for <perforce@freebsd.org>; Fri,  3 Dec 2004 23:23:33 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB3NNXRD004666
	for <perforce@freebsd.org>; Fri, 3 Dec 2004 23:23:33 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB3NNXgJ004663
	for perforce@freebsd.org; Fri, 3 Dec 2004 23:23:33 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 3 Dec 2004 23:23:33 GMT
Message-Id: <200412032323.iB3NNXgJ004663@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 66371 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
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, 03 Dec 2004 23:23:34 -0000

http://perforce.freebsd.org/chv.cgi?CH=66371

Change 66371 by sam@sam_ebb on 2004/12/03 23:22:44

	give fake address family name a unique token so it's not
	matched against a command line parameter

Affected files ...

.. //depot/projects/wifi/sbin/ifconfig/ifclone.c#4 edit
.. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#24 edit
.. //depot/projects/wifi/sbin/ifconfig/ifmac.c#4 edit
.. //depot/projects/wifi/sbin/ifconfig/ifmedia.c#4 edit
.. //depot/projects/wifi/sbin/ifconfig/ifvlan.c#4 edit

Differences ...

==== //depot/projects/wifi/sbin/ifconfig/ifclone.c#4 (text+ko) ====

@@ -55,7 +55,7 @@
 
 	s = socket(AF_INET, SOCK_DGRAM, 0);
 	if (s == -1)
-		err(1, "socket");
+		err(1, "socket(AF_INET,SOCK_DGRAM)");
 
 	memset(&ifcr, 0, sizeof(ifcr));
 
@@ -95,7 +95,7 @@
 
 	s = socket(AF_INET, SOCK_DGRAM, 0);
 	if (s == -1)
-		err(1, "socket");
+		err(1, "socket(AF_INET,SOCK_DGRAM)");
 
 	memset(&ifr, 0, sizeof(ifr));
 	(void) strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));

==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#24 (text+ko) ====

@@ -1688,7 +1688,7 @@
 	DEF_CMD_ARG("dtimperiod",	set80211dtimperiod),
 };
 static struct afswtch af_ieee80211 = {
-	.af_name	= "ieee80211",
+	.af_name	= "af_ieee80211",
 	.af_af		= AF_UNSPEC,
 	.af_status	= ieee80211_status,
 };

==== //depot/projects/wifi/sbin/ifconfig/ifmac.c#4 (text+ko) ====

@@ -103,7 +103,7 @@
 	DEF_CMD_ARG("maclabel",	setifmaclabel),
 };
 static struct afswtch af_mac = {
-	.af_name	= "maclabel",
+	.af_name	= "af_maclabel",
 	.af_af		= AF_UNSPEC,
 	.af_status	= maclabel_status,
 };

==== //depot/projects/wifi/sbin/ifconfig/ifmedia.c#4 (text+ko) ====

@@ -785,7 +785,7 @@
 	DEF_CMD_ARG("-mediaopt",unsetmediaopt),
 };
 static struct afswtch af_media = {
-	.af_name	= "media",
+	.af_name	= "af_media",
 	.af_af		= AF_UNSPEC,
 	.af_status	= media_status,
 };

==== //depot/projects/wifi/sbin/ifconfig/ifvlan.c#4 (text+ko) ====

@@ -155,7 +155,7 @@
 	DEF_CMD("-vlanhwtag",	-IFCAP_VLAN_HWTAGGING,	setifcap),
 };
 static struct afswtch af_vlan = {
-	.af_name	= "vlan",
+	.af_name	= "af_vlan",
 	.af_af		= AF_UNSPEC,
 	.af_status	= vlan_status,
 };