]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
extensions: remove no longer necessary default: cases
authorJan Engelhardt <jengelh@medozas.de>
Sat, 8 Jan 2011 02:02:37 +0000 (03:02 +0100)
committerJan Engelhardt <jengelh@medozas.de>
Sat, 8 Jan 2011 02:02:37 +0000 (03:02 +0100)
Match and target parse functions now only get option characters they
have defined themselves.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
79 files changed:
extensions/libip6t_HL.c
extensions/libip6t_LOG.c
extensions/libip6t_REJECT.c
extensions/libip6t_ah.c
extensions/libip6t_dst.c
extensions/libip6t_frag.c
extensions/libip6t_hbh.c
extensions/libip6t_hl.c
extensions/libip6t_icmp6.c
extensions/libip6t_ipv6header.c
extensions/libip6t_mh.c
extensions/libip6t_rt.c
extensions/libipt_CLUSTERIP.c
extensions/libipt_DNAT.c
extensions/libipt_ECN.c
extensions/libipt_LOG.c
extensions/libipt_MASQUERADE.c
extensions/libipt_NETMAP.c
extensions/libipt_REDIRECT.c
extensions/libipt_REJECT.c
extensions/libipt_SAME.c
extensions/libipt_SNAT.c
extensions/libipt_TTL.c
extensions/libipt_ULOG.c
extensions/libipt_addrtype.c
extensions/libipt_ah.c
extensions/libipt_ecn.c
extensions/libipt_icmp.c
extensions/libipt_realm.c
extensions/libipt_ttl.c
extensions/libxt_CHECKSUM.c
extensions/libxt_CLASSIFY.c
extensions/libxt_CONNMARK.c
extensions/libxt_CONNSECMARK.c
extensions/libxt_CT.c
extensions/libxt_DSCP.c
extensions/libxt_IDLETIMER.c
extensions/libxt_MARK.c
extensions/libxt_NFLOG.c
extensions/libxt_NFQUEUE.c
extensions/libxt_RATEEST.c
extensions/libxt_SECMARK.c
extensions/libxt_SET.c
extensions/libxt_TCPMSS.c
extensions/libxt_TOS.c
extensions/libxt_cluster.c
extensions/libxt_comment.c
extensions/libxt_connbytes.c
extensions/libxt_connlimit.c
extensions/libxt_connmark.c
extensions/libxt_conntrack.c
extensions/libxt_cpu.c
extensions/libxt_dccp.c
extensions/libxt_dscp.c
extensions/libxt_esp.c
extensions/libxt_hashlimit.c
extensions/libxt_helper.c
extensions/libxt_iprange.c
extensions/libxt_ipvs.c
extensions/libxt_length.c
extensions/libxt_limit.c
extensions/libxt_mac.c
extensions/libxt_mark.c
extensions/libxt_multiport.c
extensions/libxt_osf.c
extensions/libxt_physdev.c
extensions/libxt_pkttype.c
extensions/libxt_policy.c
extensions/libxt_quota.c
extensions/libxt_rateest.c
extensions/libxt_recent.c
extensions/libxt_sctp.c
extensions/libxt_set.c
extensions/libxt_state.c
extensions/libxt_statistic.c
extensions/libxt_string.c
extensions/libxt_tcp.c
extensions/libxt_tcpmss.c
extensions/libxt_udp.c

index eeab0c93075e7a931e98381a5b30366943c22074..743045456674a1e2688999c03cf1fee1747a2924 100644 (file)
@@ -71,10 +71,6 @@ static int HL_parse(int c, char **argv, int invert, unsigned int *flags,
 
                        info->mode = IP6T_HL_INC;
                        break;
-
-               default:
-                       return 0;
-
        }
        
        info->hop_limit = value;
index bb85acb39d915e15a689a218cef947ce0edf53c7..a33d5705bc39d4331d5e1647f8038c3e3f0c6ea3 100644 (file)
@@ -191,9 +191,6 @@ static int LOG_parse(int c, char **argv, int invert, unsigned int *flags,
                loginfo->logflags |= IP6T_LOG_MACDECODE;
                *flags |= IP6T_LOG_OPT_MACDECODE;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index 94d269426939f1193c054e317653281bc47b80de..9a4334f5bb54b8cfb4a30806915b8ad21104a7f8 100644 (file)
@@ -94,9 +94,6 @@ static int REJECT_parse(int c, char **argv, int invert, unsigned int *flags,
                                return 1;
                        }
                xtables_error(PARAMETER_PROBLEM, "unknown reject type \"%s\"", optarg);
-       default:
-               /* Fall through */
-               break;
        }
        return 0;
 }
index fc1742992ad3c35decc7d1d7081e684577a94172..839f14d6fde36ef7010f9678ce2e77b2974962c6 100644 (file)
@@ -110,8 +110,6 @@ static int ah_parse(int c, char **argv, int invert, unsigned int *flags,
                ahinfo->hdrres = 1;
                *flags |= IP6T_AH_RES;
                break;
-       default:
-               return 0;
        }
 
        return 1;
index f4036f0ad7b927d2f4359d8e4db17b431f5d0751..e4cf431e4623780f45f6efa72b8559dd26230293 100644 (file)
@@ -156,8 +156,6 @@ static int dst_parse(int c, char **argv, int invert, unsigned int *flags,
                optinfo->flags |= IP6T_OPTS_NSTRICT;
                *flags |= IP6T_OPTS_NSTRICT;
                break;
-       default:
-               return 0;
        }
 
        return 1;
index fcaa72b8fe52ce24ef7159dfa8a7ed0acb34931f..c342dd86c8c94d4ac104243737ecea9027252e0f 100644 (file)
@@ -141,8 +141,6 @@ static int frag_parse(int c, char **argv, int invert, unsigned int *flags,
                fraginfo->flags |= IP6T_FRAG_NMF;
                *flags |= IP6T_FRAG_NMF;
                break;
-       default:
-               return 0;
        }
 
        return 1;
index b706f5155baca72df80b79aab5301915a44b3b32..f9d59df94729340d1fc4109496fea5d5fc8eb9cb 100644 (file)
@@ -149,8 +149,6 @@ static int hbh_parse(int c, char **argv, int invert, unsigned int *flags,
                optinfo->flags |= IP6T_OPTS_NSTRICT;
                *flags |= IP6T_OPTS_NSTRICT;
                break;
-       default:
-               return 0;
        }
 
        return 1;
index ce4392ee57a89a2f91858d5b14ce36b976531f7a..daefea115b40bd718d0ad55e4e6af60cf073e114 100644 (file)
@@ -71,8 +71,6 @@ static int hl_parse(int c, char **argv, int invert, unsigned int *flags,
                        *flags = 1;
 
                        break;
-               default:
-                       return 0;
        }
 
        return 1;
index 2adba821898ca3f64ca48605e339c6ca64c3a680..8c39488e93787001a819fa805fa3290fa02540fb 100644 (file)
@@ -166,9 +166,6 @@ static int icmp6_parse(int c, char **argv, int invert, unsigned int *flags,
                        icmpv6info->invflags |= IP6T_ICMP_INV;
                *flags = 1;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index d4d64e0998d847d1bcf18828fe3c6f161dbb3f5d..7d2a97f896b42b68f2dbda4b92444921865cf3d5 100644 (file)
@@ -204,8 +204,6 @@ ipv6header_parse(int c, char **argv, int invert, unsigned int *flags,
                        info->modeflag |= 0xFF;
                        *flags |= IPV6_HDR_SOFT;
                        break;
-               default:
-                       return 0;
        }
 
        return 1;
index 16cc9ac9c8a3cfbca973c8572b7e7e79b726bfc8..f41c4f43e436d62e83fa058289e7d32ffbb08c88 100644 (file)
@@ -140,9 +140,6 @@ static int mh_parse(int c, char **argv, int invert, unsigned int *flags,
                        mhinfo->invflags |= IP6T_MH_INV_TYPE;
                *flags |= MH_TYPES;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index ec0290ca529e9041375dd46fe5fae73771f977b0..4e27f8ae741370a9e4973a18beba894a889552db 100644 (file)
@@ -223,8 +223,6 @@ static int rt_parse(int c, char **argv, int invert, unsigned int *flags,
                rtinfo->flags |= IP6T_RT_FST_NSTRICT;
                *flags |= IP6T_RT_FST_NSTRICT;
                break;
-       default:
-               return 0;
        }
 
        return 1;
index d622e63bb442195707259b380a502c87f4395f02..b89baa8da8746b26d7b4101bf403e2f0528828f7 100644 (file)
@@ -146,8 +146,6 @@ static int CLUSTERIP_parse(int c, char **argv, int invert, unsigned int *flags,
                cipinfo->hash_initval = num;
                *flags |= PARAM_HASHINIT;
                break;
-       default:
-               return 0;
        }
 
        return 1;
index 7afe241aa4a219dff14945dcf0214537b38aaeaa..32b94b2669e7e8d25fb1af7d626274f43b1bc95a 100644 (file)
@@ -184,10 +184,8 @@ static int DNAT_parse(int c, char **argv, int invert, unsigned int *flags,
        case '3':
                info->mr.range[0].flags |= IP_NAT_RANGE_PERSISTENT;
                return 1;
-
-       default:
-               return 0;
        }
+       return 0;
 }
 
 static void DNAT_check(unsigned int flags)
index 75ea01142e6c9c105ea8dc47a6159f657244ccce..cad20a86582ee984a0dff11627f26a6d6d6b054f 100644 (file)
@@ -90,8 +90,6 @@ static int ECN_parse(int c, char **argv, int invert, unsigned int *flags,
                einfo->ip_ect = result;
                *flags |= IPT_ECN_OP_SET_IP;
                break;
-       default:
-               return 0;
        }
 
        return 1;
index 097aec86faff80d36aa2ae3efbd80ef544b03434..e6ccb3bfbf28c65a46ee33a4d6cb081c15f37da7 100644 (file)
@@ -191,8 +191,6 @@ static int LOG_parse(int c, char **argv, int invert, unsigned int *flags,
                loginfo->logflags |= IPT_LOG_MACDECODE;
                *flags |= IPT_LOG_OPT_MACDECODE;
                break;
-       default:
-               return 0;
        }
 
        return 1;
index b6bbd605d96d3a6229bc607acd886bad9f242567..3b059ace546cab5f3732f1087a6f72df40a3a6df 100644 (file)
@@ -102,10 +102,8 @@ static int MASQUERADE_parse(int c, char **argv, int invert, unsigned int *flags,
        case '2':
                mr->range[0].flags |=  IP_NAT_RANGE_PROTO_RANDOM;
                return 1;
-
-       default:
-               return 0;
        }
+       return 0;
 }
 
 static void
index 23731af763fa8810d51a92a690046e5342188429..c7d0307b026a395ff83b0303e684d4ec9b0a3dc3 100644 (file)
@@ -124,10 +124,8 @@ static int NETMAP_parse(int c, char **argv, int invert, unsigned int *flags,
                parse_to(optarg, &mr->range[0]);
                *flags = 1;
                return 1;
-
-       default:
-               return 0;
        }
+       return 0;
 }
 
 static void NETMAP_check(unsigned int flags)
index 940603a9a613a6f4f3d4b1b94166d105aa41796b..4760e655a2d8aaf7b1663ac3bc5698ce3e8be8ae 100644 (file)
@@ -113,10 +113,8 @@ static int REDIRECT_parse(int c, char **argv, int invert, unsigned int *flags,
                } else
                        *flags |= IPT_REDIRECT_OPT_RANDOM;
                return 1;
-
-       default:
-               return 0;
        }
+       return 0;
 }
 
 static void REDIRECT_print(const void *ip, const struct xt_entry_target *target,
index 8c08dd0c7ca4305baf3384fe757d994fc772ea71..4bd5f4a0098483d0932324493e37d25ce07e5ff9 100644 (file)
@@ -115,8 +115,6 @@ static int REJECT_parse(int c, char **argv, int invert, unsigned int *flags,
                        fprintf(stderr, "--reject-with echo-reply no longer"
                                " supported\n");
                xtables_error(PARAMETER_PROBLEM, "unknown reject type \"%s\"", optarg);
-       default:
-               /* Fall through */
                break;
        }
        return 0;
index 5fb1b5b282785e224df908a16e3e2acb5d5e2197..9531a3bceabf9e7e4f7f843e45a9b927c3eb2f2b 100644 (file)
@@ -120,9 +120,6 @@ static int SAME_parse(int c, char **argv, int invert, unsigned int *flags,
                for (count=0; count < mr->rangesize; count++)
                        mr->range[count].flags |= IP_NAT_RANGE_PROTO_RANDOM;
                break;
-
-       default:
-               return 0;
        }
        
        return 1;
index 1075c793cdb73da4287a97e9b1eb490c8cbcf275..2700bcc8600ea265531e54a1908257a6e1b3b8ac 100644 (file)
@@ -184,10 +184,8 @@ static int SNAT_parse(int c, char **argv, int invert, unsigned int *flags,
        case '3':
                info->mr.range[0].flags |= IP_NAT_RANGE_PERSISTENT;
                return 1;
-
-       default:
-               return 0;
        }
+       return 0;
 }
 
 static void SNAT_check(unsigned int flags)
index 2e0c2338a44fa39cfe72a9f997b1a4be2a065f80..c8e552427ab89629f402024ab7154262b17b2333 100644 (file)
@@ -71,10 +71,6 @@ static int TTL_parse(int c, char **argv, int invert, unsigned int *flags,
 
                        info->mode = IPT_TTL_INC;
                        break;
-
-               default:
-                       return 0;
-
        }
        
        info->ttl = value;
index 46928c34b18e1806bffe51e614cb4553f4ad7b69..0185f98cf634103cfb3784fae6e6e2779fbb92e7 100644 (file)
@@ -138,8 +138,6 @@ static int ULOG_parse(int c, char **argv, int invert, unsigned int *flags,
                loginfo->qthreshold = atoi(optarg);
                *flags |= IPT_LOG_OPT_QTHRESHOLD;
                break;
-       default:
-               return 0;
        }
        return 1;
 }
index 8a642117ca6abe0d62e7fca0ff8264c964bac995..fa6cc1e4fb883e42e85dc63a42dbd08954928f1d 100644 (file)
@@ -122,8 +122,6 @@ addrtype_parse_v0(int c, char **argv, int invert, unsigned int *flags,
                        info->invert_dest = 1;
                *flags |= IPT_ADDRTYPE_OPT_DSTTYPE;
                break;
-       default:
-               return 0;
        }
        
        return 1;
@@ -171,8 +169,6 @@ addrtype_parse_v1(int c, char **argv, int invert, unsigned int *flags,
                info->flags |= IPT_ADDRTYPE_LIMIT_IFACE_OUT;
                *flags |= IPT_ADDRTYPE_OPT_LIMIT_IFACE_OUT;
                break;
-       default:
-               return 0;
        }
        
        return 1;
index 3369c66cb1617878bf234a21a6ffaf87492089cc..93590620eb24008e61acaa3408c9b7bfacf69602 100644 (file)
@@ -89,8 +89,6 @@ static int ah_parse(int c, char **argv, int invert, unsigned int *flags,
                        ahinfo->invflags |= IPT_AH_INV_SPI;
                *flags |= AH_SPI;
                break;
-       default:
-               return 0;
        }
 
        return 1;
index 3f1fc3bd6b304ad7cdd6b4efa518b94fd3bc647a..27e46b3d58f4c81185238e6992f185b46bb8c759 100644 (file)
@@ -76,8 +76,6 @@ static int ecn_parse(int c, char **argv, int invert, unsigned int *flags,
                                   "ECN match: Value out of range");
                einfo->ip_ect = result;
                break;
-       default:
-               return 0;
        }
 
        return 1;
index 2204027084aa43ebcccfae52de6f8a70d11b5551..a233520e4b0368c42e2e66a4ace488cec59a22ed 100644 (file)
@@ -191,9 +191,6 @@ static int icmp_parse(int c, char **argv, int invert, unsigned int *flags,
                        icmpinfo->invflags |= IPT_ICMP_INV;
                *flags = 1;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index 1d4854643a8c407a03d6f8406c2e4f3e3f22af78..a5ec6d8ceae97ae3793ee761e68ef026fb5276f4 100644 (file)
@@ -180,9 +180,6 @@ static int realm_parse(int c, char **argv, int invert, unsigned int *flags,
                        realminfo->invert = 1;
                *flags = 1;
                break;
-
-       default:
-               return 0;
        }
        return 1;
 }
index 34d0f23599c44ea62c6f7ad886a938638d5faebd..05de9f79b6e653e1fbb36bfa04216360157302e1 100644 (file)
@@ -68,9 +68,6 @@ static int ttl_parse(int c, char **argv, int invert, unsigned int *flags,
                        info->mode = IPT_TTL_GT;
                        info->ttl = value;
                        break;
-               default:
-                       return 0;
-
        }
 
        if (*flags) 
index 101a54caef1336554878af4d152099558ba80879..a4a60b330229817e2e218170ad07510a72fa00e7 100644 (file)
@@ -42,8 +42,6 @@ static int CHECKSUM_parse(int c, char **argv, int invert, unsigned int *flags,
                einfo->operation = XT_CHECKSUM_OP_FILL;
                *flags |= XT_CHECKSUM_OP_FILL;
                break;
-       default:
-               return 0;
        }
 
        return 1;
index ab5127c33e2fa0182455c217bc92c97d0ed7c1a3..2920ee8d150fd57502510d9d2a0a81877b98ddcb 100644 (file)
@@ -53,9 +53,6 @@ CLASSIFY_parse(int c, char **argv, int invert, unsigned int *flags,
                                   "CLASSIFY: Can't specify --set-class twice");
                *flags = 1;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index 0d43a0d260c17c8c649550881eaefb34d55eb05e..4657411b3eae0a8d2ab2b3f165bd1661498f90fc 100644 (file)
@@ -147,8 +147,6 @@ CONNMARK_parse(int c, char **argv, int invert, unsigned int *flags,
                if (*end != '\0' || end == optarg)
                        xtables_error(PARAMETER_PROBLEM, "Bad MASK value \"%s\"", optarg);
                break;
-       default:
-               return 0;
        }
 
        return 1;
index 8df23639bb1da5fe8558528b092ba1b0fba9b89d..75d0e3b1fda50bdd90098af273794a8736566a8e 100644 (file)
@@ -52,9 +52,6 @@ CONNSECMARK_parse(int c, char **argv, int invert, unsigned int *flags,
                info->mode = CONNSECMARK_RESTORE;
                *flags |= CONNSECMARK_RESTORE;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index 8952b757ba924b574cc6bc7796c0a778376f73a1..682dd83158d1ff24065efae1d37a757c6c2ca775 100644 (file)
@@ -127,8 +127,6 @@ static int ct_parse(int c, char **argv, int invert, unsigned int *flags,
                        xtables_error(PARAMETER_PROBLEM, "Bad zone value \"%s\"", optarg);
                info->zone = zone;
                break;
-       default:
-               return 0;
        }
 
        *flags |= c;
index a6280bf5837daccf01697b97c8448bb4b9851aed..468516c199abb00a9887322ecc37ed8b2fa714c9 100644 (file)
@@ -92,9 +92,6 @@ static int DSCP_parse(int c, char **argv, int invert, unsigned int *flags,
                parse_class(optarg, dinfo);
                *flags = 1;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index 1562e02a1532f1b538293bbf7a9f49c84110984c..05db0e916deff588cf960f5e936cc7cca8e9fad7 100644 (file)
@@ -78,9 +78,6 @@ static int idletimer_tg_parse(int c, char **argv, int invert,
                strcpy(info->label, optarg);
                *flags |= IDLETIMER_TG_OPT_LABEL;
                break;
-
-       default:
-               return false;
        }
 
        return true;
index e33e0c38fdf87e84442247314654d3740ab6bded..cbb18bad401a46f852aab9a50377292f561f8eaa 100644 (file)
@@ -93,8 +93,6 @@ MARK_parse_v0(int c, char **argv, int invert, unsigned int *flags,
        case '3':
                xtables_error(PARAMETER_PROBLEM,
                           "MARK target: kernel too old for --or-mark");
-       default:
-               return 0;
        }
 
        return 1;
@@ -126,8 +124,6 @@ MARK_parse_v1(int c, char **argv, int invert, unsigned int *flags,
        case '3':
                markinfo->mode = XT_MARK_OR;
                break;
-       default:
-               return 0;
        }
 
        if (!xtables_strtoui(optarg, NULL, &mark, 0, UINT32_MAX))
@@ -193,9 +189,6 @@ static int mark_tg_parse(int c, char **argv, int invert, unsigned int *flags,
                info->mark = value;
                info->mask = 0;
                break;
-
-       default:
-               return false;
        }
 
        *flags |= F_MARK;
index 2cf279ad9f4f0010c32f39514aa713b0e985d9a6..2da5d6419561eb80d34c096548dae8390ebabf83 100644 (file)
@@ -103,8 +103,6 @@ static int NFLOG_parse(int c, char **argv, int invert, unsigned int *flags,
                                   "Invalid --nflog-threshold, must be >= 1");
                info->threshold = n;
                break;
-       default:
-               return 0;
        }
        *flags |= c;
        return 1;
index e412153a96a89f3befde7dcbe367566bfe54ffc8..995134e4cec8cf5a7a44823893e6125b1aa3d4fe 100644 (file)
@@ -70,8 +70,6 @@ NFQUEUE_parse(int c, char **argv, int invert, unsigned int *flags,
        case 'B':
                xtables_error(PARAMETER_PROBLEM, "NFQUEUE target: "
                                   "--queue-balance not supported (kernel too old?)");
-       default:
-               return 0;
        }
 
        return 1;
@@ -114,8 +112,6 @@ NFQUEUE_parse_v1(int c, char **argv, int invert, unsigned int *flags,
                                                        firstqueue, lastqueue);
                info->queues_total = lastqueue - firstqueue + 1;
                break;
-       default:
-               return 0;
        }
 
        return 1;
index d89f818490e85094d8cdfa70a83254dcda9ff63e..173fee36fa79b028cf1b64e7184e364850431ece 100644 (file)
@@ -130,9 +130,6 @@ RATEEST_parse(int c, char **argv, int invert, unsigned int *flags,
                                   "RATEEST: bad ewmalog value `%s'", optarg);
 
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index 7bf4ff088fc8ecec66d2d01704606616912b78ba..b800d4a4732c522f4021b4f5e21fa89a15be2f50 100644 (file)
@@ -49,8 +49,6 @@ static int SECMARK_parse(int c, char **argv, int invert, unsigned int *flags,
                strcpy(info->secctx, optarg);
                *flags |= SECMARK_MODE_SEL;
                break;
-       default:
-               return 0;
        }
 
        return 1;
index c05811e6a28b48d6e74bcdec5a5f9f4183d52499..2d186c58d0fa92d61e74ef4cdd344d1b8e1ea011 100644 (file)
@@ -102,9 +102,6 @@ set_target_parse_v0(int c, char **argv, int invert, unsigned int *flags,
                parse_target_v0(argv, invert, flags,
                                &myinfo->del_set, "del-set");
                break;
-
-       default:
-               return 0;
        }
        return 1;
 }
@@ -204,9 +201,6 @@ set_target_parse(int c, char **argv, int invert, unsigned int *flags,
                parse_target(argv, invert, flags,
                             &myinfo->del_set, "del-set");
                break;
-
-       default:
-               return 0;
        }
        return 1;
 }
index b24789a2b673305540280cfcb5335c8c15b1654e..1468deebf8322e526e3a500fc172a6b63b26efba 100644 (file)
@@ -71,9 +71,6 @@ static int __TCPMSS_parse(int c, char **argv, int invert, unsigned int *flags,
                mssinfo->mss = XT_TCPMSS_CLAMP_PMTU;
                *flags = 1;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index 6ad22160b86e273158f80b0d3c0f026cc8081474..29bc69378784ab97429393c6b42cc4f041954ec3 100644 (file)
@@ -145,9 +145,6 @@ static int tos_tg_parse(int c, char **argv, int invert, unsigned int *flags,
                info->tos_value = bits;
                info->tos_mask  = 0;
                break;
-
-       default:
-               return false;
        }
 
        *flags |= FLAG_TOS;
index 15910455c71427cd873e972c905c989d62cc5d2f..c94741fc72f7cac8440305a0d90d1b42200a4403 100644 (file)
@@ -134,8 +134,6 @@ cluster_parse(int c, char **argv, int invert, unsigned int *flags,
                info->hash_seed = num;
                *flags |= 1 << c;
                break;
-       default:
-               return 0;
        }
 
        return 1;
index dba8bb24249bdb8bb7fb627d43f8302fc65afd47..bfdccb27c52e1ec4d61c1e487ce3ef74e243afc9 100644 (file)
@@ -55,9 +55,6 @@ comment_parse(int c, char **argv, int invert, unsigned int *flags,
                parse_comment(optarg, commentinfo);
                *flags = 1;
                break;
-
-       default:
-               return 0;
        }
        return 1;
 }
index 2e20862d9278de9c9a13ca82e0dbc4552790f205..7c96c32117bfc100f696bc5646618a00f506b66d 100644 (file)
@@ -89,8 +89,6 @@ connbytes_parse(int c, char **argv, int invert, unsigned int *flags,
                                   "Unknown --connbytes-mode `%s'", optarg);
                *flags |= 4;
                break;
-       default:
-               return 0;
        }
 
        return 1;
index 0cbcf01614feddbafac627aac826cf6a37f66a71..85c0ca852d3c18bf43b7c1075b1a45d01687378f 100644 (file)
@@ -94,8 +94,6 @@ static int connlimit_parse(int c, char **argv, int invert, unsigned int *flags,
                                info->v4_mask = htonl(0xFFFFFFFF << (32 - i));
                }
                break;
-       default:
-               return 0;
        }
 
        return 1;
index a9534431ae8ef9646d4657c7153724542b667605..4cc59acd560993ee33df546dce64ca029ebf8408 100644 (file)
@@ -102,9 +102,6 @@ connmark_parse(int c, char **argv, int invert, unsigned int *flags,
                        markinfo->invert = 1;
                *flags = 1;
                break;
-
-       default:
-               return 0;
        }
        return 1;
 }
index dcb17713a493453c57b55b4e7ce891b00cd8cbfc..f21d1ab8509038a3ae79ce9e643862506d311454 100644 (file)
@@ -461,9 +461,6 @@ static int conntrack_parse(int c, char **argv, int invert, unsigned int *flags,
                }
                sinfo->flags |= XT_CONNTRACK_EXPIRES;
                break;
-
-       default:
-               return 0;
        }
 
        *flags = sinfo->flags;
@@ -566,9 +563,6 @@ conntrack_mt_parse(int c, bool invert, unsigned int *flags,
                        xtables_param_act(XTF_BAD_VALUE, "conntrack", "--ctdir", optarg);
                }
                break;
-
-       default:
-               return false;
        }
 
        *flags = info->match_flags;
index ee0299605f1705e292d912d6f2200a6d5c167f78..b4ad45616fffb223d8812b93445c104b6e9c27b0 100644 (file)
@@ -49,9 +49,6 @@ cpu_parse(int c, char **argv, int invert, unsigned int *flags,
                        cpuinfo->invert = 1;
                *flags = 1;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index 84f15364ac1b43263b31ddfee5af3e78eb6d102e..7a0e96b51afc9c22e2b78ab78c75a12725c39e52 100644 (file)
@@ -183,8 +183,6 @@ dccp_parse(int c, char **argv, int invert, unsigned int *flags,
                        einfo->invflags |= XT_DCCP_OPTION;
                *flags |= XT_DCCP_OPTION;
                break;
-       default:
-               return 0;
        }
        return 1;
 }
index 4f81f2f12aaf19eefa4904e7d56a0543bd5139c3..1d7fadf3c496e9a7381da2a5c7fb31766b655b4c 100644 (file)
@@ -100,9 +100,6 @@ dscp_parse(int c, char **argv, int invert, unsigned int *flags,
                        dinfo->invert = 1;
                *flags = 1;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index b95ae1ce5b09d87c74014f149969424372b6981c..82ca3018695ce4820f69d38e8d1ce57c2cdcd51e 100644 (file)
@@ -95,8 +95,6 @@ esp_parse(int c, char **argv, int invert, unsigned int *flags,
                        espinfo->invflags |= XT_ESP_INV_SPI;
                *flags |= ESP_SPI;
                break;
-       default:
-               return 0;
        }
 
        return 1;
index b26628a61519bda89c083e04f6060dfb3d5f05a1..352e530379fb27a59b7348a5863da3ea083f8109 100644 (file)
@@ -298,8 +298,6 @@ hashlimit_parse(int c, char **argv, int invert, unsigned int *flags,
                strncpy(r->name, optarg, sizeof(r->name));
                *flags |= PARAM_NAME;
                break;
-       default:
-               return 0;
        }
 
        if (invert)
index e9551bc7a4022142cf8b7410c349dd5025a50c04..3c744c9fe01c9809b6f5424d8210442327bcacaa 100644 (file)
@@ -39,9 +39,6 @@ helper_parse(int c, char **argv, int invert, unsigned int *flags,
                        info->invert = 1;
                *flags = 1;
                break;
-
-       default:
-               return 0;
        }
        return 1;
 }
index 6565d42507b8c076eb69e2bfafd2f77f3e105a1e..2ac2fa4deb7897a078a3f50a6498b8c6c401d1d5 100644 (file)
@@ -128,9 +128,6 @@ static int iprange_parse(int c, char **argv, int invert, unsigned int *flags,
                info->dst.min_ip = range[0].ip;
                info->dst.max_ip = range[1].ip;
                break;
-
-       default:
-               return 0;
        }
        return 1;
 }
index 83de0426f65352998a4b6d95fb4a11faad55174e..3001417d4f68c4db2d279c01baab768bcde2d59b 100644 (file)
@@ -155,11 +155,6 @@ static int ipvs_mt_parse(int c, char **argv, int invert, unsigned int *flags,
        case '6': /* --vportctl */
                data->vportctl = htons(xtables_parse_port(optarg, "tcp"));
                break;
-
-       default:
-               /* Hu? How did we come here? */
-               assert(false);
-               return 0;
        }
 
        if (op & XT_IPVS_ONCE_MASK) {
index edcb6b5828a7e1d153b2e3ee0cab8286744adbde..86ccba073520c0fb9a972c00e2c659bdfd1484ab 100644 (file)
@@ -77,9 +77,6 @@ length_parse(int c, char **argv, int invert, unsigned int *flags,
                                info->invert = 1;
                        *flags = 1;
                        break;
-                       
-               default:
-                       return 0;
        }
        return 1;
 }
index 350cb2499a113198e20f4429fb7703d4f2d67435..a62d199046f422cc8035c3d77450a39849b53d1f 100644 (file)
@@ -107,9 +107,6 @@ limit_parse(int c, char **argv, int invert, unsigned int *flags,
                                   "bad --limit-burst `%s'", optarg);
                r->burst = num;
                break;
-
-       default:
-               return 0;
        }
 
        if (invert)
index eb074676bcf0976b47a6a89eada61bc396f08cac..15a7f3c15839592953b1b97310c73cbcd04f94fc 100644 (file)
@@ -64,9 +64,6 @@ mac_parse(int c, char **argv, int invert, unsigned int *flags,
                        macinfo->invert = 1;
                *flags = 1;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index d17a7b2e8814ab17c1864e3ff8fc1212386a9fb9..15b08b9af23b582d33ca5b3d5f9436076a9a1208 100644 (file)
@@ -79,9 +79,6 @@ mark_parse(int c, char **argv, int invert, unsigned int *flags,
                        markinfo->invert = 1;
                *flags = 1;
                break;
-
-       default:
-               return 0;
        }
        return 1;
 }
index 9ed5931d3c66e2a002745183e6a6e8b23ff38f89..2f523837168be948582e22aa1b5092cb25603e3d 100644 (file)
@@ -187,9 +187,6 @@ __multiport_parse(int c, char **argv, int invert, unsigned int *flags,
                                                     multiinfo->ports, proto);
                multiinfo->flags = XT_MULTIPORT_EITHER;
                break;
-
-       default:
-               return 0;
        }
 
        if (invert)
@@ -251,9 +248,6 @@ __multiport_parse_v1(int c, char **argv, int invert, unsigned int *flags,
                parse_multi_ports_v1(optarg, multiinfo, proto);
                multiinfo->flags = XT_MULTIPORT_EITHER;
                break;
-
-       default:
-               return 0;
        }
 
        if (invert)
index 66c23b4db5b31d9f15d61ea5642800a7fc4b84ad..38c4705e44edf97ba97e575d387f56c605e77b1a 100644 (file)
@@ -107,8 +107,6 @@ static int osf_parse(int c, char **argv, int invert, unsigned int *flags,
                                xtables_error(PARAMETER_PROBLEM, "Log level parameter is too big");
                        info->flags |= XT_OSF_LOG;
                        break;
-               default:
-                       return 0;
        }
 
        return 1;
index d92df9e0d4916f239789868ad9c7b719d390d18a..abd182c2c81302c2be8b4f7c47f4b276ca48f73f 100644 (file)
@@ -94,9 +94,6 @@ physdev_parse(int c, char **argv, int invert, unsigned int *flags,
                *flags |= XT_PHYSDEV_OP_BRIDGED;
                info->bitmask |= XT_PHYSDEV_OP_BRIDGED;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index d4025913802bdd88920636a6733ccd36b6f19b16..8aefd92f74088beabca6d9f5e0a361ed0a577a71 100644 (file)
@@ -94,9 +94,6 @@ static int pkttype_parse(int c, char **argv, int invert, unsigned int *flags,
                                info->invert=1;
                        *flags=1;
                        break;
-
-               default: 
-                       return 0;
        }
 
        return 1;
index 3fea1467a78d46e3e27947ece37bbd0501c563c0..565f8a302480fad6eb883af081c35a05b1b8a7b8 100644 (file)
@@ -261,8 +261,6 @@ static int policy_parse(int c, char **argv, int invert, unsigned int *flags,
                        xtables_error(PARAMETER_PROBLEM,
                                   "policy match: maximum policy depth reached");
                break;
-       default:
-               return 0;
        }
 
        policy_info = info;
index 9a88cbaefb7c54f466dd8a8537bfb0bc77206d0d..64100cdc61ff456cac45582ae6e7483ec50f1434 100644 (file)
@@ -71,9 +71,6 @@ quota_parse(int c, char **argv, int invert, unsigned int *flags,
                        info->flags |= XT_QUOTA_INVERT;
 
                break;
-
-       default:
-               return 0;
        }
        return 1;
 }
index 3809fe7d63581c27e5acc1b910b1f32a147ec368..7b6ba005795ccf54bada580b1d306e91f0ed77a2 100644 (file)
@@ -297,9 +297,6 @@ rateest_parse(int c, char **argv, int invert, unsigned int *flags,
                if (invert)
                        info->flags |= XT_RATEEST_MATCH_INVERT;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index 41faeb6128a6aaa23ef09232c3984a2d3134903f..85f3613d2de3574fbdee7af364c65b9801c4d8f2 100644 (file)
@@ -138,9 +138,6 @@ static int recent_parse(int c, char **argv, int invert, unsigned int *flags,
                case 210:
                        info->side = XT_RECENT_DEST;
                        break;
-
-               default:
-                       return 0;
        }
 
        return 1;
index fe010aa902b944a129694fab4dba498d9a4751dd..ad2607623c74b2bf94c0a00b4b8bd0bd2e13c4c6 100644 (file)
@@ -296,9 +296,6 @@ sctp_parse(int c, char **argv, int invert, unsigned int *flags,
                optind++;
                *flags |= XT_SCTP_CHUNK_TYPES;
                break;
-
-       default:
-               return 0;
        }
        return 1;
 }
index 594e2d4f0c242f62dcd657247523a2623fb90de9..6364011f4bc0c6353713fa3443ba3d60677dbaed 100644 (file)
@@ -85,9 +85,6 @@ set_parse_v0(int c, char **argv, int invert, unsigned int *flags,
                
                *flags = 1;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
@@ -170,9 +167,6 @@ set_parse(int c, char **argv, int invert, unsigned int *flags,
                
                *flags = 1;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index 40643335c0e63223badb2f24c6a0da06cc7b86ed..a236a3f01ba5249b6140ee235bef627773f780a2 100644 (file)
@@ -79,9 +79,6 @@ state_parse(int c, char **argv, int invert, unsigned int *flags,
                        sinfo->statemask = ~sinfo->statemask;
                *flags = 1;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index 94f291344bee3d0237f76c337e72a1f4c40c2950..f6fbd3b880c70371988fcc60b5210ccadec67e32 100644 (file)
@@ -90,8 +90,6 @@ statistic_parse(int c, char **argv, int invert, unsigned int *flags,
                info->u.nth.packet = val;
                *flags |= 0x8;
                break;
-       default:
-               return 0;
        }
        return 1;
 }
index a6c58813b9de71353b9abdff72a8c2f0671fd75e..c78f9cd8864be0e4c2692633dfbc55ed03f8b417 100644 (file)
@@ -238,9 +238,6 @@ string_parse(int c, char **argv, int invert, unsigned int *flags,
                stringinfo->u.v1.flags |= XT_STRING_FLAG_IGNORECASE;
                *flags |= ICASE;
                break;
-
-       default:
-               return 0;
        }
        return 1;
 }
index df5077f6f3a1ad5995e9d08a532667037db1f030..8bcb0dd5ba10b5570a64f7a47810b1d0e8a819e3 100644 (file)
@@ -203,9 +203,6 @@ tcp_parse(int c, char **argv, int invert, unsigned int *flags,
                        tcpinfo->invflags |= XT_TCP_INV_OPTION;
                *flags |= TCP_OPTION;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;
index 8dfbb14e154032c62883af40bed6de2734a8b866..35d6d189096e5f38948faba767f101cc7602c782 100644 (file)
@@ -73,8 +73,6 @@ tcpmss_parse(int c, char **argv, int invert, unsigned int *flags,
                        mssinfo->invert = 1;
                *flags = 1;
                break;
-       default:
-               return 0;
        }
        return 1;
 }
index 70e939dcd88ef8a1f6c618dfbae6e6fe75d83ee8..2550d71f67564d69314d9fd6aefe04524639f852 100644 (file)
@@ -90,9 +90,6 @@ udp_parse(int c, char **argv, int invert, unsigned int *flags,
                        udpinfo->invflags |= XT_UDP_INV_DSTPT;
                *flags |= UDP_DST_PORTS;
                break;
-
-       default:
-               return 0;
        }
 
        return 1;