From owner-p4-projects@FreeBSD.ORG Sat Jun 14 05:36:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CD8A1065671; Sat, 14 Jun 2008 05:36:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E8A9C106564A for ; Sat, 14 Jun 2008 05:36:40 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D8E218FC1A for ; Sat, 14 Jun 2008 05:36:40 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5E5aes9023076 for ; Sat, 14 Jun 2008 05:36:40 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5E5aeVK023074 for perforce@freebsd.org; Sat, 14 Jun 2008 05:36:40 GMT (envelope-from julian@freebsd.org) Date: Sat, 14 Jun 2008 05:36:40 GMT Message-Id: <200806140536.m5E5aeVK023074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 143435 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Jun 2008 05:36:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=143435 Change 143435 by julian@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 #include #include -#include #ifdef DDB #include @@ -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);