PERFORCE change 143435 for review

[Julian Elischer]

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

Change 143435 by julian at julian_trafmon1 on 2008/06/14 05:35:52

	corrections from wild script
	don't change strings and comments
	       don't change locals that shadow globals

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/kern/uipc_debug.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#3 edit
.. //depot/projects/vimage-commit2/src/sys/rpc/rpcb_clnt.c#3 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/kern/uipc_debug.c#3 (text+ko) ====

@@ -39,7 +39,6 @@
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/vimage.h>
 
 #ifdef DDB
 #include <ddb/ddb.h>
@@ -226,11 +225,11 @@
 }
 
 static void
-db_print_domain(struct domain *d, const char *V_domainname, int indent)
+db_print_domain(struct domain *d, const char *domain_name, int indent)
 {
 
 	db_print_indent(indent);
-	db_printf("%s at %p\n", V_domainname, d);
+	db_printf("%s at %p\n", domain_name, d);
 
 	indent += 2;
 

==== //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#3 (text+ko) ====

@@ -264,7 +264,7 @@
 		     * through the hardware by configuring the loopback down.
 		     * However, it causes problems during network configuration
 		     * for boards that can't receive packets they send.
-		     * It is now necessary to clear "V_useloopback" and remove
+		     * It is now necessary to clear "useloopback" and remove
 		     * the route to force traffic out to the hardware.
 		     */
 			rt->rt_expire = 0;

==== //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#3 (text+ko) ====

@@ -13005,7 +13005,7 @@
 			panic("Leaving with tcb mtx owned?");
 		}
 		if (mtx_owned(&stcb->tcb_send_mtx)) {
-			panic("Leaving with V_tcb send mtx owned?");
+			panic("Leaving with tcb send mtx owned?");
 		}
 	}
 #endif

==== //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#3 (text+ko) ====

@@ -1419,7 +1419,7 @@
 		nni6->ni_flags = 0; /* XXX: meaningless TTL */
 		fqdn->ni_fqdn_ttl = 0;	/* ditto. */
 		/*
-		 * XXX do we really have FQDN in variable "V_hostname"?
+		 * XXX do we really have FQDN in variable "hostname"?
 		 */
 		n->m_next = ni6_nametodns(V_hostname, hostnamelen, oldfqdn);
 		if (n->m_next == NULL)

==== //depot/projects/vimage-commit2/src/sys/netipsec/key.c#3 (text+ko) ====

@@ -158,7 +158,7 @@
 static LIST_HEAD(_acqtree, secacq) acqtree;		/* acquiring list */
 static struct mtx acq_lock;
 #define	ACQ_LOCK_INIT() \
-	mtx_init(&acq_lock, "V_acqtree", "fast ipsec acquire list", MTX_DEF)
+	mtx_init(&acq_lock, "acqtree", "fast ipsec acquire list", MTX_DEF)
 #define	ACQ_LOCK_DESTROY()	mtx_destroy(&acq_lock)
 #define	ACQ_LOCK()		mtx_lock(&acq_lock)
 #define	ACQ_UNLOCK()		mtx_unlock(&acq_lock)
@@ -181,11 +181,11 @@
 static const u_int saorder_state_valid_prefer_new[] = {
 	SADB_SASTATE_MATURE, SADB_SASTATE_DYING,
 };
-static u_int V_saorder_state_alive[] = {
+static u_int saorder_state_alive[] = {
 	/* except DEAD */
 	SADB_SASTATE_MATURE, SADB_SASTATE_DYING, SADB_SASTATE_LARVAL
 };
-static u_int V_saorder_state_any[] = {
+static u_int saorder_state_any[] = {
 	SADB_SASTATE_MATURE, SADB_SASTATE_DYING,
 	SADB_SASTATE_LARVAL, SADB_SASTATE_DEAD
 };

==== //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#3 (text+ko) ====

@@ -1571,7 +1571,7 @@
 		} else {
 			strcpy(nd->my_hostnam, p);
 			strcpy(hostname, p);
-			printf("V_hostname %s ", hostname);
+			printf("hostname %s ", hostname);
 			gctx->sethostname = ifctx;
 		}
 	}

==== //depot/projects/vimage-commit2/src/sys/rpc/rpcb_clnt.c#3 (text+ko) ====

@@ -493,7 +493,7 @@
 
 #if 0
 	static struct netconfig *loopnconf;
-	static char *V_hostname;
+	static char *localhostname;
 
 /* VARIABLES PROTECTED BY loopnconf_lock: loopnconf */
 	mutex_lock(&loopnconf_lock);
@@ -528,9 +528,9 @@
 				_close(fd);
 				tmpnconf = nconf;
 				if (!strcmp(nconf->nc_protofmly, NC_INET))
-					V_hostname = IN4_LOCALHOST_STRING;
+					localhostname = IN4_LOCALHOST_STRING;
 				else
-					V_hostname = IN6_LOCALHOST_STRING;
+					localhostname = IN6_LOCALHOST_STRING;
 			}
 		}
 		if (tmpnconf == NULL) {
@@ -543,7 +543,7 @@
 		endnetconfig(nc_handle);
 	}
 	mutex_unlock(&loopnconf_lock);
-	client = getclnthandle(V_hostname, loopnconf, NULL);
+	client = getclnthandle(localhostname, loopnconf, NULL);
 	return (client);
 #else
 	return (NULL);