From owner-svn-src-head@FreeBSD.ORG Thu Dec 24 17:35:28 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B23F8106568F; Thu, 24 Dec 2009 17:35:28 +0000 (UTC) (envelope-from luigi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 882578FC12; Thu, 24 Dec 2009 17:35:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBOHZSil036685; Thu, 24 Dec 2009 17:35:28 GMT (envelope-from luigi@svn.freebsd.org) Received: (from luigi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBOHZSfj036683; Thu, 24 Dec 2009 17:35:28 GMT (envelope-from luigi@svn.freebsd.org) Message-Id: <200912241735.nBOHZSfj036683@svn.freebsd.org> From: Luigi Rizzo Date: Thu, 24 Dec 2009 17:35:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r200951 - head/sys/netinet/ipfw X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Dec 2009 17:35:28 -0000 Author: luigi Date: Thu Dec 24 17:35:28 2009 New Revision: 200951 URL: http://svn.freebsd.org/changeset/base/200951 Log: fix poor indentation resulting from a merge Modified: head/sys/netinet/ipfw/ip_fw_sockopt.c Modified: head/sys/netinet/ipfw/ip_fw_sockopt.c ============================================================================== --- head/sys/netinet/ipfw/ip_fw_sockopt.c Thu Dec 24 17:22:15 2009 (r200950) +++ head/sys/netinet/ipfw/ip_fw_sockopt.c Thu Dec 24 17:35:28 2009 (r200951) @@ -311,7 +311,7 @@ del_entry(struct ip_fw_chain *chain, u_i map = get_map(chain, -n, 1 /* locked */); if (n == 0 || map == NULL) { error = EINVAL; - break; + break; } /* copy the initial part of the map */ if (start > 0) @@ -443,13 +443,13 @@ zero_entry(struct ip_fw_chain *chain, u_ for (i = 0; i < chain->n_rules; i++) { rule = chain->map[i]; if (rule->rulenum == rulenum) { - if (cmd == 0 || rule->set == set) - clear_counters(rule, log_only); + if (cmd == 0 || rule->set == set) + clear_counters(rule, log_only); cleared = 1; } if (rule->rulenum > rulenum) break; - } + } if (!cleared) { /* we did not find any matching rules */ IPFW_WUNLOCK(chain); return (EINVAL); @@ -801,16 +801,16 @@ ipfw_getrules(struct ip_fw_chain *chain, } dst = (struct ip_fw *)bp; bcopy(rule, dst, l); - /* - * XXX HACK. Store the disable mask in the "next" - * pointer in a wild attempt to keep the ABI the same. - * Why do we do this on EVERY rule? - */ + /* + * XXX HACK. Store the disable mask in the "next" + * pointer in a wild attempt to keep the ABI the same. + * Why do we do this on EVERY rule? + */ bcopy(&V_set_disable, &dst->next_rule, sizeof(V_set_disable)); if (dst->timestamp) dst->timestamp += boot_seconds; bp += l; - } + } ipfw_get_dynamic(&bp, ep); /* protected by the dynamic lock */ return (bp - (char *)buf); } @@ -865,9 +865,9 @@ ipfw_ctl(struct sockopt *sopt) size = chain->static_len; size += ipfw_dyn_len(); - if (size >= sopt->sopt_valsize) - break; - buf = malloc(size, M_TEMP, M_WAITOK); + if (size >= sopt->sopt_valsize) + break; + buf = malloc(size, M_TEMP, M_WAITOK); if (buf == NULL) break; IPFW_UH_RLOCK(chain); @@ -878,7 +878,7 @@ ipfw_ctl(struct sockopt *sopt) IPFW_UH_RUNLOCK(chain); if (size >= want) error = sooptcopyout(sopt, buf, len); - free(buf, M_TEMP); + free(buf, M_TEMP); if (size >= want) break; }