From 6cc9220f185e46e90bbb2ff282efcacbfe10aa01 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Sat, 15 Jun 2013 22:19:23 +0200
Subject: src: constify first parameter of all nft_*_get

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 include/libnftables/expr.h | 10 +++++-----
 include/libnftables/rule.h | 10 +++++-----
 src/expr.c                 | 10 +++++-----
 src/expr/bitwise.c         |  3 ++-
 src/expr/byteorder.c       |  2 +-
 src/expr/cmp.c             |  3 ++-
 src/expr/counter.c         |  3 ++-
 src/expr/ct.c              |  3 ++-
 src/expr/exthdr.c          |  3 ++-
 src/expr/immediate.c       |  2 +-
 src/expr/limit.c           |  3 ++-
 src/expr/log.c             |  3 ++-
 src/expr/lookup.c          |  3 ++-
 src/expr/match.c           |  2 +-
 src/expr/meta.c            |  3 ++-
 src/expr/nat.c             |  3 ++-
 src/expr/payload.c         |  3 ++-
 src/expr/target.c          |  2 +-
 src/expr_ops.h             |  2 +-
 src/rule.c                 | 10 +++++-----
 20 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/include/libnftables/expr.h b/include/libnftables/expr.h
index 1ab5590..21bb3af 100644
--- 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 242ea07..fb6e804 100644
--- 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 0ee2c4b..678732e 100644
--- 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 9ebe3dc..5cbc44b 100644
--- 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 9d75824..201a943 100644
--- 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 673f3e0..dac1f54 100644
--- 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 129f32e..77054e2 100644
--- 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 4042926..7a239fa 100644
--- 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 fb3f7ad..8af6a63 100644
--- 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 295054d..b5a6a41 100644
--- 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 64a5b70..d6dc900 100644
--- 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 0e35a65..2d93b2a 100644
--- 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 6d2b9a2..0ae93ce 100644
--- 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 edb78ea..03d7e47 100644
--- 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 6316a49..535b456 100644
--- 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 5d924cf..1230d8e 100644
--- 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 ecb1bce..28c52ca 100644
--- 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 6652c47..4fd48a2 100644
--- 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 ff4c648..282225d 100644
--- 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 67062cf..864023b 100644
--- 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;
-- 
cgit v1.2.3