PERFORCE change 66371 for review

[Sam Leffler]

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

Change 66371 by sam at 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,
 };