src: remove useless casting

Not needed anymore after constification.

Based on patch from Arturo Borrero.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
index 305e4d23e6844ee3c42352dfd781829b4a7e77ba..fceec5a9e863fb33c71814bcfc39cc706396ad98 100644 (file)
--- a/src/expr/data_reg.c
+++ b/src/expr/data_reg.c
@@ -108,8 +108,7 @@ static int nft_data_reg_chain_xml_parse(union nft_data_reg *reg, char *xml)
        if (reg->chain)
                xfree(reg->chain);
 
-       reg->chain = (char *)nft_mxml_str_parse(tree, "chain",
-                                               MXML_DESCEND);
+       reg->chain = nft_mxml_str_parse(tree, "chain", MXML_DESCEND);
        if (reg->chain == NULL) {
                mxmlDelete(tree);
                return -1;

diff --git a/src/expr/data_reg.h b/src/expr/data_reg.h
index 1552c1e572ce75e46d9c2067ecb3282950fd8e65..9aee11fc7dbf1ff2b2a65ecf8b1b153821eba111 100644 (file)
--- a/src/expr/data_reg.h
+++ b/src/expr/data_reg.h
@@ -14,7 +14,7 @@ union nft_data_reg {
        };
        struct {
                int             verdict;
-               char            *chain;
+               const char      *chain;
        };
 };
 

diff --git a/src/expr/log.c b/src/expr/log.c
index 10abd68e723375d5455213626bd3d980b5cf46c7..14785fd896e632664c08efbd5a47267345384460 100644 (file)
--- a/src/expr/log.c
+++ b/src/expr/log.c
@@ -162,7 +162,7 @@ static int nft_rule_expr_log_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre
        if (prefix == NULL)
                return -1;
 
-       log->prefix = (char *)prefix;
+       log->prefix = prefix;
        e->flags |= (1 << NFT_EXPR_LOG_PREFIX);
 
        if (nft_mxml_num_parse(tree, "group", MXML_DESCEND_FIRST, BASE_DEC,

diff --git a/src/set.c b/src/set.c
index 6afbc0314d214272993e92702f3e03edc55174d6..34cffa24092e6caab977878dc8c47ce20e1c8c6c 100644 (file)
--- a/src/set.c
+++ b/src/set.c
@@ -309,10 +309,8 @@ static int nft_set_xml_parse(struct nft_set *s, char *xml)
        mxml_node_t *tree;
        mxml_node_t *node = NULL;
        struct nft_set_elem *elem;
-       char *name;
-       char *table;
+       const char *name, *table, *family_str;
        int family;
-       char *family_str;
 
        tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK);
        if (tree == NULL) {
@@ -323,8 +321,7 @@ static int nft_set_xml_parse(struct nft_set *s, char *xml)
        if (strcmp(tree->value.opaque, "set") != 0)
                goto err;
 
-       name = (char *)nft_mxml_str_parse(tree, "set_name",
-                                         MXML_DESCEND_FIRST);
+       name = nft_mxml_str_parse(tree, "set_name", MXML_DESCEND_FIRST);
        if (name == NULL)
                goto err;
 
@@ -334,8 +331,7 @@ static int nft_set_xml_parse(struct nft_set *s, char *xml)
        s->name = name;
        s->flags |= (1 << NFT_SET_ATTR_NAME);
 
-       table = (char *)nft_mxml_str_parse(tree, "set_table",
-                                         MXML_DESCEND_FIRST);
+       table = nft_mxml_str_parse(tree, "set_table", MXML_DESCEND_FIRST);
        if (table == NULL)
                goto err;
 
@@ -345,8 +341,7 @@ static int nft_set_xml_parse(struct nft_set *s, char *xml)
        s->table = strdup(table);
        s->flags |= (1 << NFT_SET_ATTR_TABLE);
 
-       family_str = (char *)nft_mxml_str_parse(tree, "family",
-                                               MXML_DESCEND_FIRST);
+       family_str = nft_mxml_str_parse(tree, "family", MXML_DESCEND_FIRST);
        if (family_str == NULL)
                goto err;