From owner-svn-src-projects@FreeBSD.ORG Sun Aug 3 09:40:51 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7AB419A0 for ; Sun, 3 Aug 2014 09:40:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5079C2567 for ; Sun, 3 Aug 2014 09:40:51 +0000 (UTC) Received: from melifaro (uid 1268) (envelope-from melifaro@svn.freebsd.org) id 55ed by svn.freebsd.org (DragonFly Mail Agent v0.9+); Sun, 03 Aug 2014 09:40:51 +0000 From: Alexander V. Chernikov Date: Sun, 3 Aug 2014 09:40:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r269465 - projects/ipfw/sys/netpfil/ipfw X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53de03a3.55ed.5bff3734@svn.freebsd.org> X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18 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: Sun, 03 Aug 2014 09:40:51 -0000 Author: melifaro Date: Sun Aug 3 09:40:50 2014 New Revision: 269465 URL: http://svnweb.freebsd.org/changeset/base/269465 Log: Whitespace changes. Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw_table_algo.c Modified: projects/ipfw/sys/netpfil/ipfw/ip_fw_table_algo.c ============================================================================== --- projects/ipfw/sys/netpfil/ipfw/ip_fw_table_algo.c Sun Aug 3 09:04:36 2014 (r269464) +++ projects/ipfw/sys/netpfil/ipfw/ip_fw_table_algo.c Sun Aug 3 09:40:50 2014 (r269465) @@ -1062,7 +1062,7 @@ ta_find_chash_tentry(void *ta_state, str memset(&ent, 0, sizeof(ent)); memset(&tei, 0, sizeof(tei)); - if (tent->subtype == AF_INET) { + if (tent->subtype == AF_INET) { tei.paddr = &tent->k.addr; tei.masklen = cfg->mask4; tei.subtype = AF_INET; @@ -1540,7 +1540,7 @@ compare_ifidx(const void *k, const void return (-1); else if (key > ifidx->kidx) return (1); - + return (0); } @@ -1573,9 +1573,9 @@ badd(const void *key, void *item, void * return (0); if (res > 0) - min = mid + 1; + min = mid + 1; else - max = mid - 1; + max = mid - 1; } /* Item not found. */ @@ -1656,7 +1656,7 @@ ta_init_ifidx(struct ip_fw_chain *ch, vo icfg->ii = ipfw_objhash_create(16); icfg->size = 16; - icfg->main_ptr = malloc(sizeof(struct ifidx) * icfg->size, M_IPFW, + icfg->main_ptr = malloc(sizeof(struct ifidx) * icfg->size, M_IPFW, M_WAITOK | M_ZERO); icfg->ch = ch; @@ -2190,7 +2190,7 @@ compare_numarray(const void *k, const vo return (-1); else if (key > na->number) return (1); - + return (0); } @@ -2283,7 +2283,7 @@ ta_add_numarray(void *ta_state, struct t int res; uint32_t value; - tb = (struct ta_buf_numarray*)ta_buf; + tb = (struct ta_buf_numarray *)ta_buf; cfg = (struct numarray_cfg *)ta_state; ri = numarray_find(ti, &tb->na.number); @@ -2586,9 +2586,8 @@ struct fhash_cfg { struct fhashentry6 fe6; }; -struct ta_buf_fhash -{ - void *ent_ptr; +struct ta_buf_fhash { + void *ent_ptr; struct fhashentry6 fe6; }; @@ -3146,7 +3145,7 @@ ta_modify_fhash(void *ta_state, struct t if (old_size >= mi->size) return (0); - + new_head = (struct fhashbhead *)mi->main_ptr; for (i = 0; i < old_size; i++) { SLIST_FOREACH_SAFE(ent, &old_head[i], next, ent_next) { @@ -3199,6 +3198,7 @@ struct table_algo flow_hash = { .modify = ta_modify_fhash, .flush_mod = ta_flush_mod_fhash, }; + void ipfw_table_algo_init(struct ip_fw_chain *ch) {