From owner-svn-src-projects@FreeBSD.ORG Thu Jan 17 06:02:32 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 86C73A75; Thu, 17 Jan 2013 06:02:32 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 751A7707; Thu, 17 Jan 2013 06:02:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0H62Wua022592; Thu, 17 Jan 2013 06:02:32 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0H62WVe022591; Thu, 17 Jan 2013 06:02:32 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201301170602.r0H62WVe022591@svn.freebsd.org> From: Lawrence Stewart Date: Thu, 17 Jan 2013 06:02:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245540 - projects/diffused_head/sbin/ipfw/diffuse_collector X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2013 06:02:32 -0000 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;