svn commit: r245540 - projects/diffused_head/sbin/ipfw/diffuse_collector

[Lawrence Stewart]

Author: lstewart
Date: Thu Jan 17 06:02:31 2013
New Revision: 245540
URL: http://svnweb.freebsd.org/changeset/base/245540

Log:
  Make rule counters unsigned to match the relevant fields in struct rule_entry.
  
  Reported by:	clang

Modified:
  projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c

Modified: projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c
==============================================================================
--- projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c	Thu Jan 17 05:56:28 2013	(r245539)
+++ projects/diffused_head/sbin/ipfw/diffuse_collector/diffuse_collector.c	Thu Jan 17 06:02:31 2013	(r245540)
@@ -1588,7 +1588,7 @@ add_main(int proto, char *port)
 
 /* Returns 0 on failure. */
 static int
-parse_rule_counters(char *buf, int64_t *rule_counters)
+parse_rule_counters(char *buf, uint64_t *rule_counters)
 {
 	const char *sep = ",";
 	char *tok, *endptr;
@@ -1599,7 +1599,7 @@ parse_rule_counters(char *buf, int64_t *
 	for (tok = strtok(buf, sep), count = 0;
 	    tok != NULL && count < NUM_RULE_COUNTERS;
 	    tok = strtok(NULL, sep), count++) {
-		rule_counters[count] = strtoll(tok, &endptr, 10);
+		rule_counters[count] = strtoull(tok, &endptr, 10);
 		if (rule_counters[count] == 0 && errno == EINVAL)
 			break;
 	}
@@ -1706,7 +1706,7 @@ process_fwaction_sockets(fd_set *rset, f
 {
 	struct fw_action *action, *tmp;
 	ssize_t nbytes;
-	int64_t rule_counters[NUM_RULE_COUNTERS];
+	uint64_t rule_counters[NUM_RULE_COUNTERS];
 	int fd;
 	uint16_t t;