* [libnftables PATCH] src: constify nft_*_parse input data
@ 2013-08-21 12:21 Arturo Borrero Gonzalez
2013-08-21 17:07 ` Pablo Neira Ayuso
0 siblings, 1 reply; 4+ messages in thread
From: Arturo Borrero Gonzalez @ 2013-08-21 12:21 UTC (permalink / raw)
To: netfilter-devel
Since the input string is not changing, let's make it constant.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
0 files changed
diff --git a/include/libnftables/chain.h b/include/libnftables/chain.h
index e80d007..52c39db 100644
--- a/include/libnftables/chain.h
+++ b/include/libnftables/chain.h
@@ -56,7 +56,7 @@ enum nft_chain_parse_type {
NFT_CHAIN_PARSE_MAX
};
-int nft_chain_parse(struct nft_chain *c, enum nft_chain_parse_type type, char *data);
+int nft_chain_parse(struct nft_chain *c, enum nft_chain_parse_type type, const char *data);
int nft_chain_snprintf(char *buf, size_t size, struct nft_chain *t, uint32_t type, uint32_t flags);
struct nlmsghdr *nft_chain_nlmsg_build_hdr(char *buf, uint16_t cmd, uint16_t family, uint16_t type, uint32_t seq);
diff --git a/include/libnftables/rule.h b/include/libnftables/rule.h
index dd0e212..af9a0f3 100644
--- a/include/libnftables/rule.h
+++ b/include/libnftables/rule.h
@@ -55,7 +55,7 @@ enum nft_rule_parse_type {
NFT_RULE_PARSE_MAX,
};
-int nft_rule_parse(struct nft_rule *r, enum nft_rule_parse_type type, char *data);
+int nft_rule_parse(struct nft_rule *r, enum nft_rule_parse_type type, const char *data);
int nft_rule_snprintf(char *buf, size_t size, struct nft_rule *t, uint32_t type, uint32_t flags);
struct nlmsghdr *nft_rule_nlmsg_build_hdr(char *buf, uint16_t cmd, uint16_t family, uint16_t type, uint32_t seq);
diff --git a/include/libnftables/set.h b/include/libnftables/set.h
index e81b3ac..c55718c 100644
--- a/include/libnftables/set.h
+++ b/include/libnftables/set.h
@@ -58,7 +58,7 @@ enum nft_set_parse_type {
NFT_SET_PARSE_MAX,
};
-int nft_set_parse(struct nft_set *s, enum nft_set_parse_type type, char *data);
+int nft_set_parse(struct nft_set *s, enum nft_set_parse_type type, const char *data);
/*
* Set elements
@@ -102,7 +102,7 @@ void nft_set_elem_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_set_elem
int nft_set_elem_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set_elem *s);
-int nft_set_elem_parse(struct nft_set_elem *e, enum nft_set_parse_type type, char *data);
+int nft_set_elem_parse(struct nft_set_elem *e, enum nft_set_parse_type type, const char *data);
int nft_set_elem_snprintf(char *buf, size_t size, struct nft_set_elem *s, uint32_t type, uint32_t flags);
int nft_set_elem_foreach(struct nft_set *s, int (*cb)(struct nft_set_elem *e, void *data), void *data);
diff --git a/include/libnftables/table.h b/include/libnftables/table.h
index 24ca374..1a015ca 100644
--- a/include/libnftables/table.h
+++ b/include/libnftables/table.h
@@ -44,7 +44,7 @@ enum nft_table_parse_type {
NFT_TABLE_PARSE_MAX,
};
-int nft_table_parse(struct nft_table *t, enum nft_table_parse_type type, char *data);
+int nft_table_parse(struct nft_table *t, enum nft_table_parse_type type, const char *data);
int nft_table_snprintf(char *buf, size_t size, struct nft_table *t, uint32_t type, uint32_t flags);
struct nlmsghdr *nft_table_nlmsg_build_hdr(char *buf, uint16_t cmd, uint16_t family, uint16_t type, uint32_t seq);
diff --git a/src/chain.c b/src/chain.c
index ac6e7ad..93896c9 100644
--- a/src/chain.c
+++ b/src/chain.c
@@ -479,7 +479,7 @@ static inline int nft_str2hooknum(const char *hook)
return -1;
}
-static int nft_chain_json_parse(struct nft_chain *c, char *json)
+static int nft_chain_json_parse(struct nft_chain *c, const char *json)
{
#ifdef JSON_PARSING
json_t *root, *node;
@@ -580,7 +580,7 @@ err:
#endif
}
-static int nft_chain_xml_parse(struct nft_chain *c, char *xml)
+static int nft_chain_xml_parse(struct nft_chain *c, const char *xml)
{
#ifdef XML_PARSING
mxml_node_t *tree;
@@ -686,7 +686,7 @@ err:
}
int nft_chain_parse(struct nft_chain *c, enum nft_chain_parse_type type,
- char *data)
+ const char *data)
{
int ret;
diff --git a/src/rule.c b/src/rule.c
index 98e7940..98c2022 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -475,7 +475,7 @@ int nft_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_rule *r)
}
EXPORT_SYMBOL(nft_rule_nlmsg_parse);
-static int nft_rule_json_parse(struct nft_rule *r, char *json)
+static int nft_rule_json_parse(struct nft_rule *r, const char *json)
{
#ifdef JSON_PARSING
json_t *root, *node, *array;
@@ -562,7 +562,7 @@ err:
#endif
}
-static int nft_rule_xml_parse(struct nft_rule *r, char *xml)
+static int nft_rule_xml_parse(struct nft_rule *r, const char *xml)
{
#ifdef XML_PARSING
mxml_node_t *tree, *node, *save;
@@ -668,7 +668,8 @@ err:
#endif
}
-int nft_rule_parse(struct nft_rule *r, enum nft_rule_parse_type type, char *data)
+int nft_rule_parse(struct nft_rule *r, enum nft_rule_parse_type type,
+ const char *data)
{
int ret;
diff --git a/src/set.c b/src/set.c
index ff34bf5..3617265 100644
--- a/src/set.c
+++ b/src/set.c
@@ -303,7 +303,7 @@ int nft_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s)
}
EXPORT_SYMBOL(nft_set_nlmsg_parse);
-static int nft_set_xml_parse(struct nft_set *s, char *xml)
+static int nft_set_xml_parse(struct nft_set *s, const char *xml)
{
#ifdef XML_PARSING
mxml_node_t *tree;
@@ -406,7 +406,8 @@ err:
#endif
}
-int nft_set_parse(struct nft_set *s, enum nft_set_parse_type type, char *data)
+int nft_set_parse(struct nft_set *s, enum nft_set_parse_type type,
+ const char *data)
{
int ret;
diff --git a/src/set_elem.c b/src/set_elem.c
index c3ac1da..2b2e414 100644
--- a/src/set_elem.c
+++ b/src/set_elem.c
@@ -417,7 +417,7 @@ int nft_mxml_set_elem_parse(mxml_node_t *tree, struct nft_set_elem *e)
}
#endif
-static int nft_set_elem_xml_parse(struct nft_set_elem *e, char *xml)
+static int nft_set_elem_xml_parse(struct nft_set_elem *e, const char *xml)
{
#ifdef XML_PARSING
mxml_node_t *tree;
@@ -447,7 +447,7 @@ err:
}
int nft_set_elem_parse(struct nft_set_elem *e,
- enum nft_set_parse_type type, char *data) {
+ enum nft_set_parse_type type, const char *data) {
int ret;
switch (type) {
diff --git a/src/table.c b/src/table.c
index b51a383..a096da7 100644
--- a/src/table.c
+++ b/src/table.c
@@ -218,7 +218,7 @@ int nft_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_table *t)
}
EXPORT_SYMBOL(nft_table_nlmsg_parse);
-static int nft_table_xml_parse(struct nft_table *t, char *xml)
+static int nft_table_xml_parse(struct nft_table *t, const char *xml)
{
#ifdef XML_PARSING
mxml_node_t *tree;
@@ -266,7 +266,7 @@ err:
#endif
}
-static int nft_table_json_parse(struct nft_table *t, char *json)
+static int nft_table_json_parse(struct nft_table *t, const char *json)
{
#ifdef JSON_PARSING
json_t *root, *node;
@@ -312,7 +312,7 @@ err:
}
int nft_table_parse(struct nft_table *t, enum nft_table_parse_type type,
- char *data)
+ const char *data)
{
int ret;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [libnftables PATCH] src: constify nft_*_parse input data
2013-08-21 12:21 [libnftables PATCH] src: constify nft_*_parse input data Arturo Borrero Gonzalez
@ 2013-08-21 17:07 ` Pablo Neira Ayuso
2013-08-21 19:21 ` Arturo Borrero Gonzalez
0 siblings, 1 reply; 4+ messages in thread
From: Pablo Neira Ayuso @ 2013-08-21 17:07 UTC (permalink / raw)
To: Arturo Borrero Gonzalez; +Cc: netfilter-devel
On Wed, Aug 21, 2013 at 02:21:28PM +0200, Arturo Borrero Gonzalez wrote:
> Since the input string is not changing, let's make it constant.
I hit these compilation warnings:
table.c: In function 'nft_table_json_parse':
table.c:278:2: warning: passing argument 1 of 'nft_jansson_create_root' discards 'const' qualifier from pointer target type [enabled by default]
In file included from table.c:11:0:
internal.h:51:9: note: expected 'char *' but argument is of type 'const char *'
chain.c: In function 'nft_chain_json_parse': CC expr.lo
rule.c: In function 'nft_rule_json_parse':
chain.c:492:2: warning: passing argument 1 of 'nft_jansson_create_root' discards 'const' qualifier from pointer target type [enabled by default]
In file included from chain.c:11:0:
internal.h:51:9: note: expected 'char *' but argument is of type 'const char *'
rule.c:489:2: warning: passing argument 1 of 'nft_jansson_create_root' discards 'const' qualifier from pointer target type [enabled by default]
In file included from rule.c:11:0:
internal.h:51:9: note: expected 'char *' but argument is of type 'const char *'
Please, fix them and resend. Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [libnftables PATCH] src: constify nft_*_parse input data
2013-08-21 17:07 ` Pablo Neira Ayuso
@ 2013-08-21 19:21 ` Arturo Borrero Gonzalez
2013-08-22 0:19 ` Pablo Neira Ayuso
0 siblings, 1 reply; 4+ messages in thread
From: Arturo Borrero Gonzalez @ 2013-08-21 19:21 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Netfilter Development Mailing list
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
On 21 August 2013 19:07, Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> Please, fix them and resend. Thanks.
Fixed. Find it attached.
Regards.
--
Arturo Borrero González
[-- Attachment #2: src_constify_nft_-_parse_input_data.patch --]
[-- Type: application/octet-stream, Size: 8037 bytes --]
commit fd286aa093aae181e80286c46ba438f4d3a782e9
Author: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Date: Wed Aug 21 14:05:46 2013 +0200
src: constify nft_*_parse input data
Since the input string is not changing, let's make it constant.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
diff --git a/include/libnftables/chain.h b/include/libnftables/chain.h
index e80d007..52c39db 100644
--- a/include/libnftables/chain.h
+++ b/include/libnftables/chain.h
@@ -56,7 +56,7 @@ enum nft_chain_parse_type {
NFT_CHAIN_PARSE_MAX
};
-int nft_chain_parse(struct nft_chain *c, enum nft_chain_parse_type type, char *data);
+int nft_chain_parse(struct nft_chain *c, enum nft_chain_parse_type type, const char *data);
int nft_chain_snprintf(char *buf, size_t size, struct nft_chain *t, uint32_t type, uint32_t flags);
struct nlmsghdr *nft_chain_nlmsg_build_hdr(char *buf, uint16_t cmd, uint16_t family, uint16_t type, uint32_t seq);
diff --git a/include/libnftables/rule.h b/include/libnftables/rule.h
index dd0e212..af9a0f3 100644
--- a/include/libnftables/rule.h
+++ b/include/libnftables/rule.h
@@ -55,7 +55,7 @@ enum nft_rule_parse_type {
NFT_RULE_PARSE_MAX,
};
-int nft_rule_parse(struct nft_rule *r, enum nft_rule_parse_type type, char *data);
+int nft_rule_parse(struct nft_rule *r, enum nft_rule_parse_type type, const char *data);
int nft_rule_snprintf(char *buf, size_t size, struct nft_rule *t, uint32_t type, uint32_t flags);
struct nlmsghdr *nft_rule_nlmsg_build_hdr(char *buf, uint16_t cmd, uint16_t family, uint16_t type, uint32_t seq);
diff --git a/include/libnftables/set.h b/include/libnftables/set.h
index e81b3ac..c55718c 100644
--- a/include/libnftables/set.h
+++ b/include/libnftables/set.h
@@ -58,7 +58,7 @@ enum nft_set_parse_type {
NFT_SET_PARSE_MAX,
};
-int nft_set_parse(struct nft_set *s, enum nft_set_parse_type type, char *data);
+int nft_set_parse(struct nft_set *s, enum nft_set_parse_type type, const char *data);
/*
* Set elements
@@ -102,7 +102,7 @@ void nft_set_elem_nlmsg_build_payload(struct nlmsghdr *nlh, struct nft_set_elem
int nft_set_elem_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set_elem *s);
-int nft_set_elem_parse(struct nft_set_elem *e, enum nft_set_parse_type type, char *data);
+int nft_set_elem_parse(struct nft_set_elem *e, enum nft_set_parse_type type, const char *data);
int nft_set_elem_snprintf(char *buf, size_t size, struct nft_set_elem *s, uint32_t type, uint32_t flags);
int nft_set_elem_foreach(struct nft_set *s, int (*cb)(struct nft_set_elem *e, void *data), void *data);
diff --git a/include/libnftables/table.h b/include/libnftables/table.h
index 24ca374..1a015ca 100644
--- a/include/libnftables/table.h
+++ b/include/libnftables/table.h
@@ -44,7 +44,7 @@ enum nft_table_parse_type {
NFT_TABLE_PARSE_MAX,
};
-int nft_table_parse(struct nft_table *t, enum nft_table_parse_type type, char *data);
+int nft_table_parse(struct nft_table *t, enum nft_table_parse_type type, const char *data);
int nft_table_snprintf(char *buf, size_t size, struct nft_table *t, uint32_t type, uint32_t flags);
struct nlmsghdr *nft_table_nlmsg_build_hdr(char *buf, uint16_t cmd, uint16_t family, uint16_t type, uint32_t seq);
diff --git a/src/chain.c b/src/chain.c
index ac6e7ad..93896c9 100644
--- a/src/chain.c
+++ b/src/chain.c
@@ -479,7 +479,7 @@ static inline int nft_str2hooknum(const char *hook)
return -1;
}
-static int nft_chain_json_parse(struct nft_chain *c, char *json)
+static int nft_chain_json_parse(struct nft_chain *c, const char *json)
{
#ifdef JSON_PARSING
json_t *root, *node;
@@ -580,7 +580,7 @@ err:
#endif
}
-static int nft_chain_xml_parse(struct nft_chain *c, char *xml)
+static int nft_chain_xml_parse(struct nft_chain *c, const char *xml)
{
#ifdef XML_PARSING
mxml_node_t *tree;
@@ -686,7 +686,7 @@ err:
}
int nft_chain_parse(struct nft_chain *c, enum nft_chain_parse_type type,
- char *data)
+ const char *data)
{
int ret;
diff --git a/src/internal.h b/src/internal.h
index cf110c3..5cf899a 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -48,7 +48,7 @@ int nft_jansson_value_parse_val(json_t *root, const char *tag,
int type, void *out);
const char *nft_jansson_value_parse_str(json_t *root, const char *tag);
bool nft_jansson_node_exist(json_t *root, const char *tag);
-json_t *nft_jansson_create_root(char *json, json_error_t *err);
+json_t *nft_jansson_create_root(const char *json, json_error_t *err);
json_t *nft_jansson_get_node(json_t *root, const char *tag);
void nft_jansson_free_root(json_t *root);
int nft_jansson_parse_family(json_t *root, void *out);
diff --git a/src/jansson.c b/src/jansson.c
index f0ef04c..f2b2f00 100644
--- a/src/jansson.c
+++ b/src/jansson.c
@@ -76,7 +76,7 @@ bool nft_jansson_node_exist(json_t *root, const char *tag)
return json_object_get(root, tag) != NULL;
}
-json_t *nft_jansson_create_root(char *json, json_error_t *err)
+json_t *nft_jansson_create_root(const char *json, json_error_t *err)
{
json_t *root;
diff --git a/src/rule.c b/src/rule.c
index 98e7940..98c2022 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -475,7 +475,7 @@ int nft_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_rule *r)
}
EXPORT_SYMBOL(nft_rule_nlmsg_parse);
-static int nft_rule_json_parse(struct nft_rule *r, char *json)
+static int nft_rule_json_parse(struct nft_rule *r, const char *json)
{
#ifdef JSON_PARSING
json_t *root, *node, *array;
@@ -562,7 +562,7 @@ err:
#endif
}
-static int nft_rule_xml_parse(struct nft_rule *r, char *xml)
+static int nft_rule_xml_parse(struct nft_rule *r, const char *xml)
{
#ifdef XML_PARSING
mxml_node_t *tree, *node, *save;
@@ -668,7 +668,8 @@ err:
#endif
}
-int nft_rule_parse(struct nft_rule *r, enum nft_rule_parse_type type, char *data)
+int nft_rule_parse(struct nft_rule *r, enum nft_rule_parse_type type,
+ const char *data)
{
int ret;
diff --git a/src/set.c b/src/set.c
index ff34bf5..3617265 100644
--- a/src/set.c
+++ b/src/set.c
@@ -303,7 +303,7 @@ int nft_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s)
}
EXPORT_SYMBOL(nft_set_nlmsg_parse);
-static int nft_set_xml_parse(struct nft_set *s, char *xml)
+static int nft_set_xml_parse(struct nft_set *s, const char *xml)
{
#ifdef XML_PARSING
mxml_node_t *tree;
@@ -406,7 +406,8 @@ err:
#endif
}
-int nft_set_parse(struct nft_set *s, enum nft_set_parse_type type, char *data)
+int nft_set_parse(struct nft_set *s, enum nft_set_parse_type type,
+ const char *data)
{
int ret;
diff --git a/src/set_elem.c b/src/set_elem.c
index c3ac1da..2b2e414 100644
--- a/src/set_elem.c
+++ b/src/set_elem.c
@@ -417,7 +417,7 @@ int nft_mxml_set_elem_parse(mxml_node_t *tree, struct nft_set_elem *e)
}
#endif
-static int nft_set_elem_xml_parse(struct nft_set_elem *e, char *xml)
+static int nft_set_elem_xml_parse(struct nft_set_elem *e, const char *xml)
{
#ifdef XML_PARSING
mxml_node_t *tree;
@@ -447,7 +447,7 @@ err:
}
int nft_set_elem_parse(struct nft_set_elem *e,
- enum nft_set_parse_type type, char *data) {
+ enum nft_set_parse_type type, const char *data) {
int ret;
switch (type) {
diff --git a/src/table.c b/src/table.c
index b51a383..a096da7 100644
--- a/src/table.c
+++ b/src/table.c
@@ -218,7 +218,7 @@ int nft_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_table *t)
}
EXPORT_SYMBOL(nft_table_nlmsg_parse);
-static int nft_table_xml_parse(struct nft_table *t, char *xml)
+static int nft_table_xml_parse(struct nft_table *t, const char *xml)
{
#ifdef XML_PARSING
mxml_node_t *tree;
@@ -266,7 +266,7 @@ err:
#endif
}
-static int nft_table_json_parse(struct nft_table *t, char *json)
+static int nft_table_json_parse(struct nft_table *t, const char *json)
{
#ifdef JSON_PARSING
json_t *root, *node;
@@ -312,7 +312,7 @@ err:
}
int nft_table_parse(struct nft_table *t, enum nft_table_parse_type type,
- char *data)
+ const char *data)
{
int ret;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [libnftables PATCH] src: constify nft_*_parse input data
2013-08-21 19:21 ` Arturo Borrero Gonzalez
@ 2013-08-22 0:19 ` Pablo Neira Ayuso
0 siblings, 0 replies; 4+ messages in thread
From: Pablo Neira Ayuso @ 2013-08-22 0:19 UTC (permalink / raw)
To: Arturo Borrero Gonzalez; +Cc: Netfilter Development Mailing list
On Wed, Aug 21, 2013 at 09:21:29PM +0200, Arturo Borrero Gonzalez wrote:
> On 21 August 2013 19:07, Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> > Please, fix them and resend. Thanks.
>
> Fixed. Find it attached.
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-08-22 0:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-21 12:21 [libnftables PATCH] src: constify nft_*_parse input data Arturo Borrero Gonzalez
2013-08-21 17:07 ` Pablo Neira Ayuso
2013-08-21 19:21 ` Arturo Borrero Gonzalez
2013-08-22 0:19 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).