svn commit: r188830 - stable/7/sys/netinet

[Luigi Rizzo]

Author: luigi
Date: Thu Feb 19 21:29:30 2009
New Revision: 188830
URL: http://svn.freebsd.org/changeset/base/188830

Log:
  correct the spelling of a log message (missing "All ");
  
  on passing, rename a variable within a macro to reduce the chance
  of shadowing other variables with the same name

Modified:
  stable/7/sys/netinet/ip_fw2.c

Modified: stable/7/sys/netinet/ip_fw2.c
==============================================================================
--- stable/7/sys/netinet/ip_fw2.c	Thu Feb 19 20:45:37 2009	(r188829)
+++ stable/7/sys/netinet/ip_fw2.c	Thu Feb 19 21:29:30 2009	(r188830)
@@ -2219,15 +2219,15 @@ ipfw_chk(struct ip_fw_args *args)
  * pointer might become stale after other pullups (but we never use it
  * this way).
  */
-#define PULLUP_TO(len, p, T)						\
+#define PULLUP_TO(_len, p, T)						\
 do {									\
-	int x = (len) + sizeof(T);					\
+	int x = (_len) + sizeof(T);					\
 	if ((m)->m_len < x) {						\
 		args->m = m = m_pullup(m, x);				\
 		if (m == NULL)						\
 			goto pullup_failed;				\
 	}								\
-	p = (mtod(m, char *) + (len));					\
+	p = (mtod(m, char *) + (_len));					\
 } while (0)
 
 	/*
@@ -3717,7 +3717,7 @@ zero_entry(struct ip_fw_chain *chain, u_
 				continue;
 			clear_counters(rule, log_only);
 		}
-		msg = log_only ? "logging counts reset" :
+		msg = log_only ? "All logging counts reset" :
 		    "Accounting cleared";
 	} else {
 		int cleared = 0;