From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Thu, 9 Nov 2017 09:29:56 +0000 (+0100)
Subject: cache API: for `read/write` the key is const, really
X-Git-Tag: v2.0.0~6^2~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beb78004a6dad08129ca1b8725715d929d207cf7;p=thirdparty%2Fknot-resolver.git

cache API: for `read/write` the key is const, really

It might better be passed by value, but let me keep the way for now.
---

diff --git a/lib/cdb.h b/lib/cdb.h
index 3a30a2bfa..d5bce36b2 100644
--- a/lib/cdb.h
+++ b/lib/cdb.h
@@ -43,8 +43,10 @@ struct kr_cdb_api {
 
 	/* Data access */
 
-	int (*read)(knot_db_t *db, knot_db_val_t *key, knot_db_val_t *val, int maxcount);
-	int (*write)(knot_db_t *db, knot_db_val_t *key, knot_db_val_t *val, int maxcount);
+	int (*read)(knot_db_t *db, const knot_db_val_t *key, knot_db_val_t *val,
+			int maxcount);
+	int (*write)(knot_db_t *db, const knot_db_val_t *key, knot_db_val_t *val,
+			int maxcount);
 	int (*remove)(knot_db_t *db, knot_db_val_t *key, int maxcount);
 
 	/* Specialised operations */
diff --git a/lib/cdb_lmdb.c b/lib/cdb_lmdb.c
index 47f90fc7c..ac209dbde 100644
--- a/lib/cdb_lmdb.c
+++ b/lib/cdb_lmdb.c
@@ -464,7 +464,8 @@ static int cdb_clear(knot_db_t *db)
 	return ret;
 }
 
-static int cdb_readv(knot_db_t *db, knot_db_val_t *key, knot_db_val_t *val, int maxcount)
+static int cdb_readv(knot_db_t *db, const knot_db_val_t *key, knot_db_val_t *val,
+		     int maxcount)
 {
 	struct lmdb_env *env = db;
 	MDB_txn *txn = NULL;
@@ -487,7 +488,8 @@ static int cdb_readv(knot_db_t *db, knot_db_val_t *key, knot_db_val_t *val, int
 	return kr_ok();
 }
 
-static int cdb_write(struct lmdb_env *env, MDB_txn **txn, knot_db_val_t *key, knot_db_val_t *val, unsigned flags)
+static int cdb_write(struct lmdb_env *env, MDB_txn **txn, const knot_db_val_t *key,
+			knot_db_val_t *val, unsigned flags)
 {
 	/* Convert key structs and write */
 	MDB_val _key = val_knot2mdb(*key);
@@ -514,7 +516,8 @@ static int cdb_write(struct lmdb_env *env, MDB_txn **txn, knot_db_val_t *key, kn
 	return kr_ok();
 }
 
-static int cdb_writev(knot_db_t *db, knot_db_val_t *key, knot_db_val_t *val, int maxcount)
+static int cdb_writev(knot_db_t *db, const knot_db_val_t *key, knot_db_val_t *val,
+			int maxcount)
 {
 	struct lmdb_env *env = db;
 	MDB_txn *txn = NULL;
diff --git a/modules/kmemcached/cdb_memcached.c b/modules/kmemcached/cdb_memcached.c
index ffe96be6c..0290a26ad 100644
--- a/modules/kmemcached/cdb_memcached.c
+++ b/modules/kmemcached/cdb_memcached.c
@@ -106,7 +106,8 @@ static int cdb_clear(knot_db_t *db)
 	return 0;
 }
 
-static int cdb_readv(knot_db_t *db, knot_db_val_t *key, knot_db_val_t *val, int maxcount)
+static int cdb_readv(knot_db_t *db, const knot_db_val_t *key, knot_db_val_t *val,
+		     int maxcount)
 {
 	if (!db || !key || !val) {
 		return kr_error(EINVAL);
@@ -138,7 +139,8 @@ static int cdb_readv(knot_db_t *db, knot_db_val_t *key, knot_db_val_t *val, int
 	return 0;
 }
 
-static int cdb_writev(knot_db_t *db, knot_db_val_t *key, knot_db_val_t *val, int maxcount)
+static int cdb_writev(knot_db_t *db, const knot_db_val_t *key, knot_db_val_t *val,
+			int maxcount)
 {
 	if (!db || !key || !val) {
 		return kr_error(EINVAL);
diff --git a/modules/redis/cdb_redis.c b/modules/redis/cdb_redis.c
index 59e346308..262c0f93d 100644
--- a/modules/redis/cdb_redis.c
+++ b/modules/redis/cdb_redis.c
@@ -221,7 +221,8 @@ static int cdb_clear(knot_db_t *cache)
 	return kr_ok();
 }
 
-static int cdb_readv(knot_db_t *cache, knot_db_val_t *key, knot_db_val_t *val, int maxcount)
+static int cdb_readv(knot_db_t *cache, const knot_db_val_t *key, knot_db_val_t *val,
+		     int maxcount)
 {
 	if (!cache || !key || !val) {
 		return kr_error(EINVAL);
@@ -256,7 +257,8 @@ static int cdb_readv(knot_db_t *cache, knot_db_val_t *key, knot_db_val_t *val, i
 	return kr_ok();
 }
 
-static int cdb_writev(knot_db_t *cache, knot_db_val_t *key, knot_db_val_t *val, int maxcount)
+static int cdb_writev(knot_db_t *cache, const knot_db_val_t *key, knot_db_val_t *val,
+			int maxcount)
 {
 	if (!cache || !key || !val) {
 		return kr_error(EINVAL);