From ec75831c439ebd3475e0ba6766188d963538129a Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 6 Aug 2013 11:36:54 +0200 Subject: src: fully constify nft_*_get functions We have several char * field that were not constify to avoid gcc compilation warnings when calling free. Since (99d2574 src: add xfree and use it), we can fully constify these objects fields without trouble. Signed-off-by: Pablo Neira Ayuso --- src/chain.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/chain.c') diff --git a/src/chain.c b/src/chain.c index 1f1760a..0dd3461 100644 --- a/src/chain.c +++ b/src/chain.c @@ -31,8 +31,8 @@ struct nft_chain { struct list_head head; char name[NFT_CHAIN_MAXNAMELEN]; - char *type; - char *table; + const char *type; + const char *table; uint8_t family; uint32_t policy; uint32_t hooknum; @@ -186,7 +186,7 @@ void nft_chain_attr_set_str(struct nft_chain *c, uint16_t attr, const char *str) } EXPORT_SYMBOL(nft_chain_attr_set_str); -void *nft_chain_attr_get(struct nft_chain *c, uint16_t attr) +const void *nft_chain_attr_get(struct nft_chain *c, uint16_t attr) { if (!(c->flags & (1 << attr))) return NULL; @@ -227,21 +227,21 @@ EXPORT_SYMBOL(nft_chain_attr_get_str); uint32_t nft_chain_attr_get_u32(struct nft_chain *c, uint16_t attr) { - uint32_t *val = nft_chain_attr_get(c, attr); + const uint32_t *val = nft_chain_attr_get(c, attr); return val ? *val : 0; } EXPORT_SYMBOL(nft_chain_attr_get_u32); int32_t nft_chain_attr_get_s32(struct nft_chain *c, uint16_t attr) { - int32_t *val = nft_chain_attr_get(c, attr); + const int32_t *val = nft_chain_attr_get(c, attr); return val ? *val : 0; } EXPORT_SYMBOL(nft_chain_attr_get_s32); uint64_t nft_chain_attr_get_u64(struct nft_chain *c, uint16_t attr) { - uint64_t *val = nft_chain_attr_get(c, attr); + const uint64_t *val = nft_chain_attr_get(c, attr); return val ? *val : 0; } EXPORT_SYMBOL(nft_chain_attr_get_u64); -- cgit v1.2.3