shadow cleanup

ok mcbride@ frantzen@

2 files changed, 35 insertions, 35 deletions

diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 8ebd2d068c3..8cc00f31135 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.240 2002/12/07 20:09:57 henning Exp $	*/
+/*	$OpenBSD: parse.y,v 1.241 2002/12/07 20:25:40 henning Exp $	*/
 
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -2422,10 +2422,10 @@ struct keywords {
 
 #define FREE_LIST(T,r) \
 	do { \
-		T *p, *n = r; \
-		while (n != NULL) { \
-			p = n; \
-			n = n->next; \
+		T *p, *node = r; \
+		while (node != NULL) { \
+			p = node; \
+			node = node->next; \
 			free(p); \
 		} \
 	} while (0)
@@ -2468,7 +2468,7 @@ expand_label_if(const char *name, char *label, const char *ifname)
 
 void
 expand_label_addr(const char *name, char *label, sa_family_t af,
-    struct node_host *host)
+    struct node_host *h)
 {
 	char tmp[PF_RULE_LABEL_SIZE];
 	char *p;
@@ -2478,25 +2478,25 @@ expand_label_addr(const char *name, char *label, sa_family_t af,
 
 		strlcat(tmp, label, p-label+1);
 
-		if (host->not)
+		if (h->not)
 			strlcat(tmp, "! ", PF_RULE_LABEL_SIZE);
-		if (host->addr.addr_dyn != NULL) {
+		if (h->addr.addr_dyn != NULL) {
 			strlcat(tmp, "(", PF_RULE_LABEL_SIZE);
-			strlcat(tmp, host->addr.addr.pfa.ifname,
+			strlcat(tmp, h->addr.addr.pfa.ifname,
 			    PF_RULE_LABEL_SIZE);
 			strlcat(tmp, ")", PF_RULE_LABEL_SIZE);
-		} else if (!af || (PF_AZERO(&host->addr.addr, af) &&
-		    PF_AZERO(&host->addr.mask, af)))
+		} else if (!af || (PF_AZERO(&h->addr.addr, af) &&
+		    PF_AZERO(&h->addr.mask, af)))
 			strlcat(tmp, "any", PF_RULE_LABEL_SIZE);
 		else {
 			char a[48];
 			int bits;
 
-			if (inet_ntop(af, &host->addr.addr, a,
+			if (inet_ntop(af, &h->addr.addr, a,
 			    sizeof(a)) == NULL)
 				strlcat(a, "?", sizeof(a));
 			strlcat(tmp, a, PF_RULE_LABEL_SIZE);
-			bits = unmask(&host->addr.mask, af);
+			bits = unmask(&h->addr.mask, af);
 			a[0] = 0;
 			if ((af == AF_INET && bits < 32) ||
 			    (af == AF_INET6 && bits < 128))
@@ -2605,7 +2605,7 @@ expand_altq(struct pf_altq *a, struct node_if *interfaces,
 	struct	pf_altq pa, pb;
 	char	qname[PF_QNAME_SIZE];
 	struct	node_queue *n;
-	int	errors = 0;
+	int	errs = 0;
 
 	LOOP_THROUGH(struct node_if, interface, interfaces,
 		memcpy(&pa, a, sizeof(struct pf_altq));
@@ -2613,14 +2613,14 @@ expand_altq(struct pf_altq *a, struct node_if *interfaces,
 
 		if (interface->not) {
 			yyerror("altq on ! <interface> is not supported");
-			errors++;
+			errs++;
 		} else {
 			if (eval_pfaltq(pf, &pa, bwspec.bw_absolute,
 			    bwspec.bw_percent))
-				errors++;
+				errs++;
 			else
 				if (pfctl_add_altq(pf, &pa))
-					errors++;
+					errs++;
 
 			if (pf->opts & PF_OPT_VERBOSE) {
 				print_altq(&pf->paltq->altq, 0);
@@ -2646,10 +2646,10 @@ expand_altq(struct pf_altq *a, struct node_if *interfaces,
 			pb.scheduler = pa.scheduler;
 			pb.pq_u.cbq_opts.flags = pa.pq_u.cbq_opts.flags;
 			if (eval_pfqueue(pf, &pb, pa.ifbandwidth, 0))
-				errors++;
+				errs++;
 			else
 				if (pfctl_add_altq(pf, &pb))
-					errors++;
+					errs++;
 
 			LOOP_THROUGH(struct node_queue, queue, nqueues,
 				n = calloc(1, sizeof(struct node_queue));
@@ -2672,7 +2672,7 @@ expand_altq(struct pf_altq *a, struct node_if *interfaces,
 	FREE_LIST(struct node_if, interfaces);
 	FREE_LIST(struct node_queue, nqueues);
 
-	return(errors);
+	return(errs);
 }
 
 int
@@ -3177,7 +3177,7 @@ char	pushback_buffer[MAXPUSHBACK];
 int	pushback_index = 0;
 
 int
-lgetc(FILE *fin)
+lgetc(FILE *f)
 {
 	int c, next;
 
@@ -3195,12 +3195,12 @@ lgetc(FILE *fin)
 	if (pushback_index)
 		return (pushback_buffer[--pushback_index]);
 
-	while ((c = getc(fin)) == '\\') {
-		next = getc(fin);
+	while ((c = getc(f)) == '\\') {
+		next = getc(f);
 		if (next != '\n') {
 			if (isspace(next))
 				yyerror("whitespace after \\");
-			ungetc(next, fin);
+			ungetc(next, f);
 			break;
 		}
 		yylval.lineno = lineno;
@@ -3209,9 +3209,9 @@ lgetc(FILE *fin)
 	if (c == '\t' || c == ' ') {
 		/* Compress blanks to a single space. */
 		do {
-			c = getc(fin);
+			c = getc(f);
 		} while (c == '\t' || c == ' ');
-		ungetc(c, fin);
+		ungetc(c, f);
 		c = ' ';
 	}
 
diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index 94d4da587e2..58b4a7d486a 100644
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_parser.c,v 1.118 2002/12/06 11:03:36 henning Exp $ */
+/*	$OpenBSD: pfctl_parser.c,v 1.119 2002/12/07 20:25:40 henning Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -817,23 +817,23 @@ print_rule(struct pf_rule *r, int verbose)
 		printf(" ");
 	}
 	if (r->type) {
-		const struct icmptypeent *p;
+		const struct icmptypeent *it;
 
-		p = geticmptypebynumber(r->type-1, r->af);
+		it = geticmptypebynumber(r->type-1, r->af);
 		if (r->af != AF_INET6)
 			printf("icmp-type");
 		else
 			printf("ipv6-icmp-type");
-		if (p != NULL)
-			printf(" %s ", p->name);
+		if (it != NULL)
+			printf(" %s ", it->name);
 		else
 			printf(" %u ", r->type-1);
 		if (r->code) {
-			const struct icmpcodeent *p;
+			const struct icmpcodeent *ic;
 
-			p = geticmpcodebynumber(r->type-1, r->code-1, r->af);
-			if (p != NULL)
-				printf("code %s ", p->name);
+			ic = geticmpcodebynumber(r->type-1, r->code-1, r->af);
+			if (ic != NULL)
+				printf("code %s ", ic->name);
 			else
 				printf("code %u ", r->code-1);
 		}