From 53a2fd88258ea2b413ed4fad081c08aa0edd33e4 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 6 Aug 2013 13:47:13 +0200 Subject: src: remove useless casting Not needed anymore after constification. Based on patch from Arturo Borrero. Signed-off-by: Pablo Neira Ayuso --- src/expr/data_reg.c | 3 +-- src/expr/data_reg.h | 2 +- src/expr/log.c | 2 +- src/set.c | 13 ++++--------- 4 files changed, 7 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c index 305e4d2..fceec5a 100644 --- 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 1552c1e..9aee11f 100644 --- 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 10abd68..14785fd 100644 --- 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 6afbc03..34cffa2 100644 --- 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; -- cgit v1.2.3