[fwbuilder-commits] r3162 - in branches/v4_1: . src/iptlib

[<va...@in...>]

Author: vadim
Date: 2010-07-27 14:23:05 -0700 (Tue, 27 Jul 2010)
New Revision: 3162

Modified:
   branches/v4_1/build_num
   branches/v4_1/src/iptlib/NATCompiler_ipt.cpp
Log:
fixed #1634 - compiler warning

Modified: branches/v4_1/build_num
===================================================================
--- branches/v4_1/build_num	2010-07-27 19:24:29 UTC (rev 3161)
+++ branches/v4_1/build_num	2010-07-27 21:23:05 UTC (rev 3162)
@@ -1 +1 @@
-#define BUILD_NUM 3157
+#define BUILD_NUM 3161

Modified: branches/v4_1/src/iptlib/NATCompiler_ipt.cpp
===================================================================
--- branches/v4_1/src/iptlib/NATCompiler_ipt.cpp	2010-07-27 19:24:29 UTC (rev 3161)
+++ branches/v4_1/src/iptlib/NATCompiler_ipt.cpp	2010-07-27 21:23:05 UTC (rev 3162)
@@ -2283,21 +2283,20 @@
              * Include interfaces that have no addresses in the list
              * for backwards compatibility.
              */
-            FWObjectTypedChildIterator ipv4_addresses = iface->findByType(IPv4::TYPENAME);
-            FWObjectTypedChildIterator ipv6_addresses = iface->findByType(IPv6::TYPENAME);
+            FWObjectTypedChildIterator ipv4_addresses =
+                iface->findByType(IPv4::TYPENAME);
+            FWObjectTypedChildIterator ipv6_addresses =
+                iface->findByType(IPv6::TYPENAME);
 
             if ((ipt_comp->ipv6 && ipv6_addresses != ipv6_addresses.end()) ||
                 (!ipt_comp->ipv6 && ipv4_addresses != ipv4_addresses.end()) ||
-                ipv4_addresses == ipv4_addresses.end() && ipv6_addresses == ipv6_addresses.end())
+                (ipv4_addresses == ipv4_addresses.end() && ipv6_addresses == ipv6_addresses.end()))
             {
                 /* 
                  * if interface name ends with '*', this is wildcard
                  * interface. Just replace '*' with '+'. If interace
                  * name does not end with '*', replace numeric
-                 * interface index with '+'. Either way, cptr points
-                 * at the first caracter after the 'family' name of
-                 * the interface (is there a better term?) which will
-                 * be either a digit or '*'.
+                 * interface index with '+'. 
                  */
 
                 QString iname = QString(iface->getName().c_str());