src: remove redundant casts

All of them are implicitly convertable without any wanted side effects.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c
index 40a551f4fd0dc1b095b4ec3265ee09ef0c9afb2d..1b21d5dd6bb568550f861d28baadfd04b28a8ca7 100644 (file)
--- a/extensions/libip6t_LOG.c
+++ b/extensions/libip6t_LOG.c
@@ -91,7 +91,7 @@ parse_level(const char *level)
                                   "log-level `%s' unknown", level);
        }
 
-       return (u_int8_t)lev;
+       return lev;
 }
 
 #define IP6T_LOG_OPT_LEVEL 0x01

diff --git a/extensions/libip6t_ah.c b/extensions/libip6t_ah.c
index 0bbd475418b44038946f74970b19693aff5efe70..63d157346306a8769336c9b46348ea24c87627c5 100644 (file)
--- a/extensions/libip6t_ah.c
+++ b/extensions/libip6t_ah.c
@@ -45,7 +45,7 @@ parse_ah_spi(const char *spistr, const char *typestr)
                exit_error(PARAMETER_PROBLEM,
                           "AH error parsing %s `%s'", typestr, spistr);
 
-       return (u_int32_t) spi;
+       return spi;
 }
 
 static void

diff --git a/extensions/libip6t_dst.c b/extensions/libip6t_dst.c
index 215e2d95b9c8db379330c35f7e41dd83b88ebc6b..43562c17b4506a04cd5a4b0c42a6c5ada815d8da 100644 (file)
--- a/extensions/libip6t_dst.c
+++ b/extensions/libip6t_dst.c
@@ -49,7 +49,7 @@ parse_opts_num(const char *idstr, const char *typestr)
                exit_error(PARAMETER_PROBLEM,
                           "dst: error parsing %s `%s'", typestr, idstr);
        }
-       return (u_int32_t) id;
+       return id;
 }
 
 static int
@@ -78,13 +78,12 @@ parse_options(const char *optsstr, u_int16_t *opts)
                         *range++ = '\0';
                 }
 
-                opts[i] = (u_int16_t)((parse_opts_num(cp,"opt") & 0x000000FF)<<8); 
+               opts[i] = (parse_opts_num(cp, "opt") & 0xFF) << 8;
                 if (range) {
                        if (opts[i] == 0)
                                exit_error(PARAMETER_PROBLEM,
                                        "PAD0 hasn't got length");
-                        opts[i] |= (u_int16_t)(parse_opts_num(range,"length") &
-                                       0x000000FF);
+                       opts[i] |= parse_opts_num(range, "length") & 0xFF;
                 } else
                         opts[i] |= (0x00FF);
 

diff --git a/extensions/libip6t_frag.c b/extensions/libip6t_frag.c
index 5ded1c652615bc3d747a17c6c5fc16e9ba00a82a..7c22429e72c62a4da38e93278d853f3a02c60fed 100644 (file)
--- a/extensions/libip6t_frag.c
+++ b/extensions/libip6t_frag.c
@@ -51,7 +51,7 @@ parse_frag_id(const char *idstr, const char *typestr)
                exit_error(PARAMETER_PROBLEM,
                           "FRAG error parsing %s `%s'", typestr, idstr);
        }
-       return (u_int32_t) id;
+       return id;
 }
 
 static void

diff --git a/extensions/libip6t_hbh.c b/extensions/libip6t_hbh.c
index 419c2506a38706e31ab84dc73bf662feaa4753a5..6c7458d8f63b20a83400eaef14b50684b46620ea 100644 (file)
--- a/extensions/libip6t_hbh.c
+++ b/extensions/libip6t_hbh.c
@@ -52,7 +52,7 @@ parse_opts_num(const char *idstr, const char *typestr)
                exit_error(PARAMETER_PROBLEM,
                           "hbh: error parsing %s `%s'", typestr, idstr);
        }
-       return (u_int32_t) id;
+       return id;
 }
 
 static int
@@ -75,12 +75,11 @@ parse_options(const char *optsstr, u_int16_t *opts)
                                            "too many ports specified");
                         *range++ = '\0';
                 }
-                opts[i] = (u_int16_t)((parse_opts_num(cp,"opt") & 0x000000FF)<<8); 
+               opts[i] = (parse_opts_num(cp, "opt") & 0xFF) << 8;
                 if (range) {
                        if (opts[i] == 0)
                                exit_error(PARAMETER_PROBLEM, "PAD0 hasn't got length");
-                        opts[i] |= (u_int16_t)(parse_opts_num(range,"length") &
-                                       0x000000FF);
+                       opts[i] |= parse_opts_num(range, "length") & 0xFF;
                 } else {
                         opts[i] |= (0x00FF);
                }

diff --git a/extensions/libip6t_ipv6header.c b/extensions/libip6t_ipv6header.c
index 1fc9b7e972bcadeb7a3cf8ee657856a450c002a5..ea8870a579ef5f41757b62d3b64bbd3c407b9a71 100644 (file)
--- a/extensions/libip6t_ipv6header.c
+++ b/extensions/libip6t_ipv6header.c
@@ -110,7 +110,7 @@ name_to_proto(const char *s)
                                s);
         }
 
-        return (u_int16_t)proto;
+        return proto;
 }
 
 static unsigned int 

diff --git a/extensions/libip6t_rt.c b/extensions/libip6t_rt.c
index 9468da18de508c4258b62a846e0ea874c68d8fef..49d86fa36f658db00c54f5e3fa471bdbbe4d5467 100644 (file)
--- a/extensions/libip6t_rt.c
+++ b/extensions/libip6t_rt.c
@@ -58,7 +58,7 @@ parse_rt_num(const char *idstr, const char *typestr)
                exit_error(PARAMETER_PROBLEM,
                           "RT error parsing %s `%s'", typestr, idstr);
        }
-       return (u_int32_t) id;
+       return id;
 }
 
 static void

diff --git a/extensions/libipt_CLUSTERIP.c b/extensions/libipt_CLUSTERIP.c
index 47184965fabb9dddc3489ee1d5b8e5c942ceedc1..e93290ac6c9ffd6325371ac796b1ac58b81ce797 100644 (file)
--- a/extensions/libipt_CLUSTERIP.c
+++ b/extensions/libipt_CLUSTERIP.c
@@ -122,7 +122,7 @@ static int CLUSTERIP_parse(int c, char **argv, int invert, unsigned int *flags,
                        exit_error(PARAMETER_PROBLEM, "Can only specify total node number once\n");
                if (string_to_number(optarg, 1, CLUSTERIP_MAX_NODES, &num) < 0)
                        exit_error(PARAMETER_PROBLEM, "Unable to parse `%s'\n", optarg);
-               cipinfo->num_total_nodes = (u_int16_t)num;
+               cipinfo->num_total_nodes = num;
                *flags |= PARAM_TOTALNODE;
                break;
        case '5':
@@ -133,7 +133,7 @@ static int CLUSTERIP_parse(int c, char **argv, int invert, unsigned int *flags,
                if (string_to_number(optarg, 1, CLUSTERIP_MAX_NODES, &num) < 0)
                        exit_error(PARAMETER_PROBLEM, "Unable to parse `%s'\n", optarg);
                cipinfo->num_local_nodes = 1;
-               cipinfo->local_nodes[0] = (u_int16_t)num;
+               cipinfo->local_nodes[0] = num;
                *flags |= PARAM_LOCALNODE;
                break;
        case '6':

diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c
index 668b56540498de4ffab1970aad0b75e89b3228ff..2aee910fc3c89c58746d7d9865695f04e8c71456 100644 (file)
--- a/extensions/libipt_LOG.c
+++ b/extensions/libipt_LOG.c
@@ -91,7 +91,7 @@ parse_level(const char *level)
                                   "log-level `%s' unknown", level);
        }
 
-       return (u_int8_t)lev;
+       return lev;
 }
 
 #define IPT_LOG_OPT_LEVEL 0x01

diff --git a/extensions/libipt_ah.c b/extensions/libipt_ah.c
index fec87a74b947104391576abe3d1ea3266970edb6..10998d8bcd586d36a025472b46a5b7980fbbb094 100644 (file)
--- a/extensions/libipt_ah.c
+++ b/extensions/libipt_ah.c
@@ -41,7 +41,7 @@ parse_ah_spi(const char *spistr)
                exit_error(PARAMETER_PROBLEM,
                           "AH error parsing spi `%s'", spistr);
        }
-       return (u_int32_t) spi;
+       return spi;
 }
 
 static void

diff --git a/extensions/libipt_realm.c b/extensions/libipt_realm.c
index 5af2fd416c9bb96e117d279d0aeda66b41fe0e76..22cbe276cac814f69800f5f10404a58959dc1d00 100644 (file)
--- a/extensions/libipt_realm.c
+++ b/extensions/libipt_realm.c
@@ -173,7 +173,7 @@ static int realm_parse(int c, char **argv, int invert, unsigned int *flags,
                        if (id == -1)
                                exit_error(PARAMETER_PROBLEM,
                                           "Realm `%s' not found", optarg);
-                       realminfo->id = (u_int32_t)id;
+                       realminfo->id = id;
                        realminfo->mask = 0xffffffff;
                }
                if (invert)

diff --git a/extensions/libxt_DSCP.c b/extensions/libxt_DSCP.c
index c9b032721ec2a9b58914b0ca12bcd6d2409a6fe9..409fa1961f464e5a8ad44d6673a50e3579e6fc7b 100644 (file)
--- a/extensions/libxt_DSCP.c
+++ b/extensions/libxt_DSCP.c
@@ -56,7 +56,7 @@ parse_dscp(const char *s, struct xt_DSCP_info *dinfo)
                exit_error(PARAMETER_PROBLEM,
                           "DSCP `%d` out of range\n", dscp);
 
-       dinfo->dscp = (u_int8_t )dscp;
+       dinfo->dscp = dscp;
 }
 
 
@@ -66,7 +66,7 @@ parse_class(const char *s, struct xt_DSCP_info *dinfo)
        unsigned int dscp = class_to_dscp(s);
 
        /* Assign the value */
-       dinfo->dscp = (u_int8_t)dscp;
+       dinfo->dscp = dscp;
 }
 
 

diff --git a/extensions/libxt_dccp.c b/extensions/libxt_dccp.c
index 24bf6f7fd965c58108478bdf2b761af54cd6fda9..b1ae62eed711791d97867803f7fc3bbf9beacf91 100644 (file)
--- a/extensions/libxt_dccp.c
+++ b/extensions/libxt_dccp.c
@@ -125,7 +125,7 @@ static u_int8_t parse_dccp_option(char *optstring)
                exit_error(PARAMETER_PROBLEM, "Bad DCCP option `%s'",
                           optstring);
 
-       return (u_int8_t)ret;
+       return ret;
 }
 
 static int

diff --git a/extensions/libxt_dscp.c b/extensions/libxt_dscp.c
index bb794f50c0dd8ccf422eb68bc01459960bb57fab..315e219aad62c80bea6475e1244c5882d2c5ad2b 100644 (file)
--- a/extensions/libxt_dscp.c
+++ b/extensions/libxt_dscp.c
@@ -56,7 +56,7 @@ parse_dscp(const char *s, struct xt_dscp_info *dinfo)
                exit_error(PARAMETER_PROBLEM,
                           "DSCP `%d` out of range\n", dscp);
 
-       dinfo->dscp = (u_int8_t )dscp;
+       dinfo->dscp = dscp;
 }
 
 
@@ -66,7 +66,7 @@ parse_class(const char *s, struct xt_dscp_info *dinfo)
        unsigned int dscp = class_to_dscp(s);
 
        /* Assign the value */
-       dinfo->dscp = (u_int8_t)dscp;
+       dinfo->dscp = dscp;
 }
 
 

diff --git a/extensions/libxt_esp.c b/extensions/libxt_esp.c
index 999733c318d701b727b0f55a7ca2e18ae40456ff..34df876d6c14c7cf4c1a81fa6362a45dbfefa662 100644 (file)
--- a/extensions/libxt_esp.c
+++ b/extensions/libxt_esp.c
@@ -43,7 +43,7 @@ parse_esp_spi(const char *spistr)
                exit_error(PARAMETER_PROBLEM,
                           "ESP error parsing spi `%s'", spistr);
        }
-       return (u_int32_t) spi;
+       return spi;
 }
 
 static void

diff --git a/extensions/libxt_length.c b/extensions/libxt_length.c
index 98e816736857dd0d51b05473fd534ed0e0b7998b..e350431c9612f92a1da76f913870a7c551966158 100644 (file)
--- a/extensions/libxt_length.c
+++ b/extensions/libxt_length.c
@@ -29,7 +29,7 @@ parse_length(const char *s)
        if (string_to_number(s, 0, 0xFFFF, &len) == -1)
                exit_error(PARAMETER_PROBLEM, "length invalid: `%s'\n", s);
        else
-               return (u_int16_t )len;
+               return len;
 }
 
 /* If a single value is provided, min and max are both set to the value */

diff --git a/extensions/libxt_tcp.c b/extensions/libxt_tcp.c
index 14d8c1868067bf97fba0ea6edcc021f51ec67545..a9039f0b130a5b7a20ed0eb6cc648165960abeca 100644 (file)
--- a/extensions/libxt_tcp.c
+++ b/extensions/libxt_tcp.c
@@ -124,7 +124,7 @@ parse_tcp_option(const char *option, u_int8_t *result)
        if (string_to_number(option, 1, 255, &ret) == -1)
                exit_error(PARAMETER_PROBLEM, "Bad TCP option `%s'", option);
 
-       *result = (u_int8_t)ret;
+       *result = ret;
 }
 
 static void tcp_init(struct xt_entry_match *m)

diff --git a/extensions/libxt_tcpmss.c b/extensions/libxt_tcpmss.c
index 000d85a62a6eac94c34546c40ad97280a7bf2a79..a720c425a557764f8cc803978aa1982a8f0d7141 100644 (file)
--- a/extensions/libxt_tcpmss.c
+++ b/extensions/libxt_tcpmss.c
@@ -27,7 +27,7 @@ parse_tcp_mssvalue(const char *mssvalue)
        unsigned int mssvaluenum;
 
        if (string_to_number(mssvalue, 0, 65535, &mssvaluenum) != -1)
-               return (u_int16_t)mssvaluenum;
+               return mssvaluenum;
 
        exit_error(PARAMETER_PROBLEM,
                   "Invalid mss `%s' specified", mssvalue);

diff --git a/xtables.c b/xtables.c
index abdd283b2773c90a73fddb3a0aba5c67cacff6d0..ecfbccf34d8e2e42acdd3b9c65438893f687c228 100644 (file)
--- a/xtables.c
+++ b/xtables.c
@@ -262,7 +262,7 @@ u_int16_t parse_port(const char *port, const char *proto)
 
        if ((string_to_number(port, 0, 65535, &portnum)) != -1 ||
            (portnum = service_to_port(port, proto)) != (unsigned)-1)
-               return (u_int16_t)portnum;
+               return portnum;
 
        exit_error(PARAMETER_PROBLEM,
                   "invalid port/service `%s' specified", port);