src: constify first parameter of all nft_*_get

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

diff --git a/include/libnftables/expr.h b/include/libnftables/expr.h
index 1ab559057aaf79c62635269766c0614b1558ba49..21bb3af36bd2ca256ad60d28b806875dee24a7d9 100644 (file)
--- a/include/libnftables/expr.h
+++ b/include/libnftables/expr.h
@@ -22,11 +22,11 @@ void nft_rule_expr_set_u32(struct nft_rule_expr *expr, uint16_t type, uint32_t d
 void nft_rule_expr_set_u64(struct nft_rule_expr *expr, uint16_t type, uint64_t data);
 void nft_rule_expr_set_str(struct nft_rule_expr *expr, uint16_t type, const char *str);
 
-const void *nft_rule_expr_get(struct nft_rule_expr *expr, uint16_t type, size_t *data_len);
-uint8_t nft_rule_expr_get_u8(struct nft_rule_expr *expr, uint16_t type);
-uint32_t nft_rule_expr_get_u32(struct nft_rule_expr *expr, uint16_t type);
-uint64_t nft_rule_expr_get_u64(struct nft_rule_expr *expr, uint16_t type);
-const char *nft_rule_expr_get_str(struct nft_rule_expr *expr, uint16_t type);
+const void *nft_rule_expr_get(const struct nft_rule_expr *expr, uint16_t type, size_t *data_len);
+uint8_t nft_rule_expr_get_u8(const struct nft_rule_expr *expr, uint16_t type);
+uint32_t nft_rule_expr_get_u32(const struct nft_rule_expr *expr, uint16_t type);
+uint64_t nft_rule_expr_get_u64(const struct nft_rule_expr *expr, uint16_t type);
+const char *nft_rule_expr_get_str(const struct nft_rule_expr *expr, uint16_t type);
 
 void nft_rule_expr_build_payload(struct nlmsghdr *nlh, struct nft_rule_expr *expr);
 

diff --git a/include/libnftables/rule.h b/include/libnftables/rule.h
index 242ea073ece51cd98bae0c413087c2963323e338..fb6e80490c8ad58c75adc3eed3175b9f8b3db601 100644 (file)
--- a/include/libnftables/rule.h
+++ b/include/libnftables/rule.h
@@ -31,11 +31,11 @@ void nft_rule_attr_set_u32(struct nft_rule *r, uint16_t attr, uint32_t val);
 void nft_rule_attr_set_u64(struct nft_rule *r, uint16_t attr, uint64_t val);
 void nft_rule_attr_set_str(struct nft_rule *r, uint16_t attr, const char *str);
 
-void *nft_rule_attr_get(struct nft_rule *r, uint16_t attr);
-const char *nft_rule_attr_get_str(struct nft_rule *r, uint16_t attr);
-uint8_t nft_rule_attr_get_u8(struct nft_rule *r, uint16_t attr);
-uint32_t nft_rule_attr_get_u32(struct nft_rule *r, uint16_t attr);
-uint64_t nft_rule_attr_get_u64(struct nft_rule *r, uint16_t attr);
+const void *nft_rule_attr_get(const struct nft_rule *r, uint16_t attr);
+const char *nft_rule_attr_get_str(const struct nft_rule *r, uint16_t attr);
+uint8_t nft_rule_attr_get_u8(const struct nft_rule *r, uint16_t attr);
+uint32_t nft_rule_attr_get_u32(const struct nft_rule *r, uint16_t attr);
+uint64_t nft_rule_attr_get_u64(const struct nft_rule *r, uint16_t attr);
 
 void nft_rule_add_expr(struct nft_rule *r, struct nft_rule_expr *expr);
 

diff --git a/src/expr.c b/src/expr.c
index 0ee2c4bcff867554fe5f9052abbfa43e782ecf47..678732ee8b16781fdbf366f85cb807246240b42e 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -102,7 +102,7 @@ nft_rule_expr_set_str(struct nft_rule_expr *expr, uint16_t type, const char *str
 }
 EXPORT_SYMBOL(nft_rule_expr_set_str);
 
-const void *nft_rule_expr_get(struct nft_rule_expr *expr, uint16_t type, size_t *data_len)
+const void *nft_rule_expr_get(const struct nft_rule_expr *expr, uint16_t type, size_t *data_len)
 {
        const void *ret = NULL;
 
@@ -122,7 +122,7 @@ const void *nft_rule_expr_get(struct nft_rule_expr *expr, uint16_t type, size_t
 }
 EXPORT_SYMBOL(nft_rule_expr_get);
 
-uint8_t nft_rule_expr_get_u8(struct nft_rule_expr *expr, uint16_t type)
+uint8_t nft_rule_expr_get_u8(const struct nft_rule_expr *expr, uint16_t type)
 {
        const void *data;
        size_t data_len;
@@ -138,7 +138,7 @@ uint8_t nft_rule_expr_get_u8(struct nft_rule_expr *expr, uint16_t type)
 }
 EXPORT_SYMBOL(nft_rule_expr_get_u8);
 
-uint32_t nft_rule_expr_get_u32(struct nft_rule_expr *expr, uint16_t type)
+uint32_t nft_rule_expr_get_u32(const struct nft_rule_expr *expr, uint16_t type)
 {
        const void *data;
        size_t data_len;
@@ -154,7 +154,7 @@ uint32_t nft_rule_expr_get_u32(struct nft_rule_expr *expr, uint16_t type)
 }
 EXPORT_SYMBOL(nft_rule_expr_get_u32);
 
-uint64_t nft_rule_expr_get_u64(struct nft_rule_expr *expr, uint16_t type)
+uint64_t nft_rule_expr_get_u64(const struct nft_rule_expr *expr, uint16_t type)
 {
        const void *data;
        size_t data_len;
@@ -170,7 +170,7 @@ uint64_t nft_rule_expr_get_u64(struct nft_rule_expr *expr, uint16_t type)
 }
 EXPORT_SYMBOL(nft_rule_expr_get_u64);
 
-const char *nft_rule_expr_get_str(struct nft_rule_expr *expr, uint16_t type)
+const char *nft_rule_expr_get_str(const struct nft_rule_expr *expr, uint16_t type)
 {
        size_t data_len;
 

diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index 9ebe3dc95cd32351802dc825b0adc568e1c9f2bc..5cbc44b62b3cd686cdbcbfa09e93ed4ddc86eca6 100644 (file)
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -62,7 +62,8 @@ nft_rule_expr_bitwise_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_bitwise_get(struct nft_rule_expr *e, uint16_t type, size_t *data_len)
+nft_rule_expr_bitwise_get(const struct nft_rule_expr *e, uint16_t type,
+                         size_t *data_len)
 {
        struct nft_expr_bitwise *bitwise = (struct nft_expr_bitwise *)e->data;
 

diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
index 9d758244b25e50e6006e92158bfeec25afc09907..201a943ab587bfaec3fc8b1cc01237b0dcbc9406 100644 (file)
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
@@ -61,7 +61,7 @@ nft_rule_expr_byteorder_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_byteorder_get(struct nft_rule_expr *e, uint16_t type,
+nft_rule_expr_byteorder_get(const struct nft_rule_expr *e, uint16_t type,
                            size_t *data_len)
 {
        struct nft_expr_byteorder *byteorder =

diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index 673f3e02f9e0f61433d9af2cbf44d17efe5672bd..dac1f5439e82d630e238431c4f4632b5abec6573 100644 (file)
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -54,7 +54,8 @@ nft_rule_expr_cmp_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_cmp_get(struct nft_rule_expr *e, uint16_t type, size_t *data_len)
+nft_rule_expr_cmp_get(const struct nft_rule_expr *e, uint16_t type,
+                     size_t *data_len)
 {
        struct nft_expr_cmp *cmp = (struct nft_expr_cmp *)e->data;
 

diff --git a/src/expr/counter.c b/src/expr/counter.c
index 129f32e0b57145b41cd37c651fd9fb95964f85de..77054e208291464bb8f2cb72db72cc38103d7f6d 100644 (file)
--- a/src/expr/counter.c
+++ b/src/expr/counter.c
@@ -47,7 +47,8 @@ nft_rule_expr_counter_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_counter_get(struct nft_rule_expr *e, uint16_t type, size_t *data_len)
+nft_rule_expr_counter_get(const struct nft_rule_expr *e, uint16_t type,
+                         size_t *data_len)
 {
        struct nft_expr_counter *ctr = (struct nft_expr_counter *)e->data;
 

diff --git a/src/expr/ct.c b/src/expr/ct.c
index 40429260cea509820f18272e323516f985450718..7a239fa4d49b7a6652179ebb8eddeb3ca1370172 100644 (file)
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -50,7 +50,8 @@ nft_rule_expr_ct_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_ct_get(struct nft_rule_expr *e, uint16_t type, size_t *data_len)
+nft_rule_expr_ct_get(const struct nft_rule_expr *e, uint16_t type,
+                    size_t *data_len)
 {
        struct nft_expr_ct *ct = (struct nft_expr_ct *)e->data;
 

diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
index fb3f7ad3e04e190e8a7383f2c4af1585896b88eb..8af6a632ba456ea8a479e0516113ff7e388d06b1 100644 (file)
--- a/src/expr/exthdr.c
+++ b/src/expr/exthdr.c
@@ -58,7 +58,8 @@ nft_rule_expr_exthdr_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_exthdr_get(struct nft_rule_expr *e, uint16_t type, size_t *data_len)
+nft_rule_expr_exthdr_get(const struct nft_rule_expr *e, uint16_t type,
+                        size_t *data_len)
 {
        struct nft_expr_exthdr *exthdr = (struct nft_expr_exthdr *)e->data;
 

diff --git a/src/expr/immediate.c b/src/expr/immediate.c
index 295054dd80f64349e638d884ac441f75fb729bb4..b5a6a411d96f7b9ea18a02335d1b702bb123dc0e 100644 (file)
--- a/src/expr/immediate.c
+++ b/src/expr/immediate.c
@@ -57,7 +57,7 @@ nft_rule_expr_immediate_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_immediate_get(struct nft_rule_expr *e, uint16_t type,
+nft_rule_expr_immediate_get(const struct nft_rule_expr *e, uint16_t type,
                            size_t *data_len)
 {
        struct nft_expr_immediate *imm = (struct nft_expr_immediate *)e->data;

diff --git a/src/expr/limit.c b/src/expr/limit.c
index 64a5b70bf955a0807ab7f08d15fc2109290a7de5..d6dc9008620f68492fd8edf771a369328c23ffd6 100644 (file)
--- a/src/expr/limit.c
+++ b/src/expr/limit.c
@@ -48,7 +48,8 @@ nft_rule_expr_limit_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_limit_get(struct nft_rule_expr *e, uint16_t type, size_t *data_len)
+nft_rule_expr_limit_get(const struct nft_rule_expr *e, uint16_t type,
+                       size_t *data_len)
 {
        struct nft_expr_limit *limit = (struct nft_expr_limit *)e->data;
 

diff --git a/src/expr/log.c b/src/expr/log.c
index 0e35a6506ab05a5d1d01eb31bb6c3c67e0cb50a7..2d93b2ae41bdfdeacace1ec68bd9ede29863ead3 100644 (file)
--- a/src/expr/log.c
+++ b/src/expr/log.c
@@ -58,7 +58,8 @@ nft_rule_expr_log_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_log_get(struct nft_rule_expr *e, uint16_t type, size_t *data_len)
+nft_rule_expr_log_get(const struct nft_rule_expr *e, uint16_t type,
+                     size_t *data_len)
 {
        struct nft_expr_log *log = (struct nft_expr_log *)e->data;
 

diff --git a/src/expr/lookup.c b/src/expr/lookup.c
index 6d2b9a2a9e60f042aee6224fede6238f353309b4..0ae93ce185f77142afdbdccfd78c257c07d92788 100644 (file)
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
@@ -57,7 +57,8 @@ nft_rule_expr_lookup_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_lookup_get(struct nft_rule_expr *e, uint16_t type, size_t *data_len)
+nft_rule_expr_lookup_get(const struct nft_rule_expr *e, uint16_t type,
+                        size_t *data_len)
 {
        struct nft_expr_lookup *lookup = (struct nft_expr_lookup *)e->data;
 

diff --git a/src/expr/match.c b/src/expr/match.c
index edb78ea5269f03cb5bcf3e85d4eb7daa7510e258..03d7e472f21d86e1abb424eb8e286df975076b5b 100644 (file)
--- a/src/expr/match.c
+++ b/src/expr/match.c
@@ -62,7 +62,7 @@ nft_rule_expr_match_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_match_get(struct nft_rule_expr *e, uint16_t type,
+nft_rule_expr_match_get(const struct nft_rule_expr *e, uint16_t type,
                        size_t *data_len)
 {
        struct nft_expr_match *mt = (struct nft_expr_match *)e->data;

diff --git a/src/expr/meta.c b/src/expr/meta.c
index 6316a49c507b1399469f26363b040e9711817494..535b456caeb22931cb3115e58e411dc2eb66a75c 100644 (file)
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -46,7 +46,8 @@ nft_rule_expr_meta_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_meta_get(struct nft_rule_expr *e, uint16_t type, size_t *data_len)
+nft_rule_expr_meta_get(const struct nft_rule_expr *e, uint16_t type,
+                      size_t *data_len)
 {
        struct nft_expr_meta *meta = (struct nft_expr_meta *)e->data;
 

diff --git a/src/expr/nat.c b/src/expr/nat.c
index 5d924cffbf07087bce90e31afae5312522583e3f..1230d8e7f805319959556c6560ef449143161efe 100644 (file)
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -65,7 +65,8 @@ nft_rule_expr_nat_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_nat_get(struct nft_rule_expr *e, uint16_t type, size_t *data_len)
+nft_rule_expr_nat_get(const struct nft_rule_expr *e, uint16_t type,
+                     size_t *data_len)
 {
        struct nft_expr_nat *nat = (struct nft_expr_nat *)e->data;
 

diff --git a/src/expr/payload.c b/src/expr/payload.c
index ecb1bce54021cf648387c3f65d7badaa676c4a11..28c52ca28ee4852b24db405b624c199f8d8a8bf3 100644 (file)
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -58,7 +58,8 @@ nft_rule_expr_payload_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_payload_get(struct nft_rule_expr *e, uint16_t type, size_t *data_len)
+nft_rule_expr_payload_get(const struct nft_rule_expr *e, uint16_t type,
+                         size_t *data_len)
 {
        struct nft_expr_payload *payload = (struct nft_expr_payload *)e->data;
 

diff --git a/src/expr/target.c b/src/expr/target.c
index 6652c47a11391ba19109c5b3cfd8236e0290a81e..4fd48a286045ce2d81880fc62b8688af6e84e1f0 100644 (file)
--- a/src/expr/target.c
+++ b/src/expr/target.c
@@ -62,7 +62,7 @@ nft_rule_expr_target_set(struct nft_rule_expr *e, uint16_t type,
 }
 
 static const void *
-nft_rule_expr_target_get(struct nft_rule_expr *e, uint16_t type,
+nft_rule_expr_target_get(const struct nft_rule_expr *e, uint16_t type,
                         size_t *data_len)
 {
        struct nft_expr_target *tg = (struct nft_expr_target *)e->data;

diff --git a/src/expr_ops.h b/src/expr_ops.h
index ff4c6482a5c84876fff334a0c4e344fb0a8a6908..282225da26c119d9ad97955e9155733a458f4549 100644 (file)
--- a/src/expr_ops.h
+++ b/src/expr_ops.h
@@ -13,7 +13,7 @@ struct expr_ops {
        size_t  alloc_len;
        int     max_attr;
        int     (*set)(struct nft_rule_expr *e, uint16_t type, const void *data, size_t data_len);
-       const void *(*get)(struct nft_rule_expr *e, uint16_t type, size_t *data_len);
+       const void *(*get)(const struct nft_rule_expr *e, uint16_t type, size_t *data_len);
        int     (*parse)(struct nft_rule_expr *e, struct nlattr *attr);
        void    (*build)(struct nlmsghdr *nlh, struct nft_rule_expr *e);
        int     (*snprintf)(char *buf, size_t len, uint32_t type, uint32_t flags, struct nft_rule_expr *e);

diff --git a/src/rule.c b/src/rule.c
index 67062cf23d3a0b1867b693560f13a9501f77dcea..864023b1b9af027e75df2912d28dfdad87d5cfb0 100644 (file)
--- a/src/rule.c
+++ b/src/rule.c
@@ -163,7 +163,7 @@ void nft_rule_attr_set_str(struct nft_rule *r, uint16_t attr, const char *str)
 }
 EXPORT_SYMBOL(nft_rule_attr_set_str);
 
-void *nft_rule_attr_get(struct nft_rule *r, uint16_t attr)
+const void *nft_rule_attr_get(const struct nft_rule *r, uint16_t attr)
 {
        switch(attr) {
        case NFT_RULE_ATTR_FAMILY:
@@ -213,27 +213,27 @@ void *nft_rule_attr_get(struct nft_rule *r, uint16_t attr)
 }
 EXPORT_SYMBOL(nft_rule_attr_get);
 
-const char *nft_rule_attr_get_str(struct nft_rule *r, uint16_t attr)
+const char *nft_rule_attr_get_str(const struct nft_rule *r, uint16_t attr)
 {
        return nft_rule_attr_get(r, attr);
 }
 EXPORT_SYMBOL(nft_rule_attr_get_str);
 
-uint32_t nft_rule_attr_get_u32(struct nft_rule *r, uint16_t attr)
+uint32_t nft_rule_attr_get_u32(const struct nft_rule *r, uint16_t attr)
 {
        uint32_t val = *((uint32_t *)nft_rule_attr_get(r, attr));
        return val;
 }
 EXPORT_SYMBOL(nft_rule_attr_get_u32);
 
-uint64_t nft_rule_attr_get_u64(struct nft_rule *r, uint16_t attr)
+uint64_t nft_rule_attr_get_u64(const struct nft_rule *r, uint16_t attr)
 {
        uint64_t val = *((uint64_t *)nft_rule_attr_get(r, attr));
        return val;
 }
 EXPORT_SYMBOL(nft_rule_attr_get_u64);
 
-uint8_t nft_rule_attr_get_u8(struct nft_rule *r, uint16_t attr)
+uint8_t nft_rule_attr_get_u8(const struct nft_rule *r, uint16_t attr)
 {
        uint8_t val = *((uint8_t *)nft_rule_attr_get(r, attr));
        return val;