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 <pablo@netfilter.org>

diff --git a/include/libnftables/chain.h b/include/libnftables/chain.h
index 53fd4074f6467f26d3bb50b94ea1383ebbd08c70..e80d00753d8765d7da30807d0a211782dbee8848 100644 (file)
--- a/include/libnftables/chain.h
+++ b/include/libnftables/chain.h
@@ -35,7 +35,7 @@ void nft_chain_attr_set_s32(struct nft_chain *t, uint16_t attr, int32_t data);
 void nft_chain_attr_set_u64(struct nft_chain *t, uint16_t attr, uint64_t data);
 void nft_chain_attr_set_str(struct nft_chain *t, uint16_t attr, const char *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);
 const char *nft_chain_attr_get_str(struct nft_chain *c, uint16_t attr);
 uint32_t nft_chain_attr_get_u32(struct nft_chain *c, uint16_t attr);
 int32_t nft_chain_attr_get_s32(struct nft_chain *c, uint16_t attr);

diff --git a/include/libnftables/set.h b/include/libnftables/set.h
index 4fc3a8d1b171d35a34d1e26efae73688b524a6c8..06380d4ac74cb11ffb3ac6381a0a603d527a1144 100644 (file)
--- a/include/libnftables/set.h
+++ b/include/libnftables/set.h
@@ -26,7 +26,7 @@ void nft_set_attr_set(struct nft_set *s, uint16_t attr, const void *data);
 void nft_set_attr_set_u32(struct nft_set *s, uint16_t attr, uint32_t val);
 void nft_set_attr_set_str(struct nft_set *s, uint16_t attr, const char *str);
 
-void *nft_set_attr_get(struct nft_set *s, uint16_t attr);
+const void *nft_set_attr_get(struct nft_set *s, uint16_t attr);
 const char *nft_set_attr_get_str(struct nft_set *s, uint16_t attr);
 uint32_t nft_set_attr_get_u32(struct nft_set *s, uint16_t attr);
 

diff --git a/src/chain.c b/src/chain.c
index 1f1760a441c5087a24b38c02bb1edca2b2ecd041..0dd3461a6bf83428d53a82e36edf4c9ebeea8484 100644 (file)
--- 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);

diff --git a/src/expr/log.c b/src/expr/log.c
index 5b9b87181eaffeb587e5c4b9fd6b32978b471dc6..10abd68e723375d5455213626bd3d980b5cf46c7 100644 (file)
--- a/src/expr/log.c
+++ b/src/expr/log.c
@@ -26,7 +26,7 @@ struct nft_expr_log {
        uint32_t                group;
        uint32_t                snaplen;
        uint32_t                qthreshold;
-       char                    *prefix;
+       const char              *prefix;
 };
 
 static int

diff --git a/src/expr_ops.h b/src/expr_ops.h
index 78413fc1834f42445e8e273eea91d88e72c22d84..a46a3097000af12bccc6f2378cd39afc9e0a0574 100644 (file)
--- a/src/expr_ops.h
+++ b/src/expr_ops.h
@@ -16,7 +16,7 @@ struct nft_rule_expr;
 struct expr_ops {
        struct list_head head;
 
-       char    *name;
+       const char *name;
        size_t  alloc_len;
        int     max_attr;
        int     (*set)(struct nft_rule_expr *e, uint16_t type, const void *data, size_t data_len);

diff --git a/src/internal.h b/src/internal.h
index 4d39660433e055ad91500d3f1b461ad07b5d8573..8d11acfc87cc1a61801400e2b251e98e987facd7 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -73,8 +73,8 @@ struct nft_set {
 
        uint32_t                family;
        uint32_t                set_flags;
-       char                    *table;
-       char                    *name;
+       const char              *table;
+       const char              *name;
        uint32_t                key_type;
        uint32_t                key_len;
        uint32_t                data_type;

diff --git a/src/set.c b/src/set.c
index 6e1be380868ecc9507261b428d187089d9476667..6afbc0314d214272993e92702f3e03edc55174d6 100644 (file)
--- a/src/set.c
+++ b/src/set.c
@@ -148,7 +148,7 @@ void nft_set_attr_set_str(struct nft_set *s, uint16_t attr, const char *str)
 }
 EXPORT_SYMBOL(nft_set_attr_set_str);
 
-void *nft_set_attr_get(struct nft_set *s, uint16_t attr)
+const void *nft_set_attr_get(struct nft_set *s, uint16_t attr)
 {
        if (!(s->flags & (1 << attr)))
                return NULL;

diff --git a/src/table.c b/src/table.c
index 92ad37d922d2c5787f0d86d81aced489d2d6378b..6875dd71aacb88b7dade387c9f479a52f5ed7540 100644 (file)
--- a/src/table.c
+++ b/src/table.c
@@ -28,7 +28,7 @@
 struct nft_table {
        struct list_head head;
 
-       char            *name;
+       const char      *name;
        uint8_t         family;
        uint32_t        table_flags;
        uint32_t        flags;