lib-dict: Explicitly specify used dict_vfuncs methods for drivers.

This allows adding more methods without modifying all the existing drivers.

diff --git a/src/lib-dict/dict-cdb.c b/src/lib-dict/dict-cdb.c
index 755dbde5622836278c3fa33ac013bdb8672786d7..25e1def4e03cfe9373ca344f3660be161aaf3c96 100644 (file)
--- a/src/lib-dict/dict-cdb.c
+++ b/src/lib-dict/dict-cdb.c
@@ -122,20 +122,9 @@ static int cdb_dict_lookup(struct dict *_dict, pool_t pool,
 struct dict dict_driver_cdb = {
        .name = "cdb",
        {
-               cdb_dict_init,
-               cdb_dict_deinit,
-               NULL,
-               cdb_dict_lookup,
-               NULL,
-               NULL,
-               NULL,
-               NULL,
-               NULL,
-               NULL,
-               NULL,
-               NULL,
-               NULL,
-               NULL
+               .init = cdb_dict_init,
+               .deinit = cdb_dict_deinit,
+               .lookup = cdb_dict_lookup,
        }
 };
 #endif

diff --git a/src/lib-dict/dict-client.c b/src/lib-dict/dict-client.c
index 032ae0c3491aae271d4aacf40d272422f6dd02fb..916504a927fab159b427a1f9b47ac4d7921b59ca 100644 (file)
--- a/src/lib-dict/dict-client.c
+++ b/src/lib-dict/dict-client.c
@@ -1007,21 +1007,20 @@ struct dict dict_driver_client = {
        .name = "proxy",
 
        {
-               client_dict_init,
-               client_dict_deinit,
-               client_dict_wait,
-               client_dict_lookup,
-               client_dict_iterate_init,
-               client_dict_iterate,
-               client_dict_iterate_deinit,
-               client_dict_transaction_init,
-               client_dict_transaction_commit,
-               client_dict_transaction_rollback,
-               client_dict_set,
-               client_dict_unset,
-               NULL,
-               client_dict_atomic_inc,
-               client_dict_lookup_async,
-               client_dict_switch_ioloop
+               .init = client_dict_init,
+               .deinit = client_dict_deinit,
+               .wait = client_dict_wait,
+               .lookup = client_dict_lookup,
+               .iterate_init = client_dict_iterate_init,
+               .iterate = client_dict_iterate,
+               .iterate_deinit = client_dict_iterate_deinit,
+               .transaction_init = client_dict_transaction_init,
+               .transaction_commit = client_dict_transaction_commit,
+               .transaction_rollback = client_dict_transaction_rollback,
+               .set = client_dict_set,
+               .unset = client_dict_unset,
+               .atomic_inc = client_dict_atomic_inc,
+               .lookup_async = client_dict_lookup_async,
+               .switch_ioloop = client_dict_switch_ioloop
        }
 };

diff --git a/src/lib-dict/dict-db.c b/src/lib-dict/dict-db.c
index 729824b5f495ba885d3817199c56f9bd5bc37711..541665b2b3149da6cb2ebe6bc5ff333775889ad5 100644 (file)
--- a/src/lib-dict/dict-db.c
+++ b/src/lib-dict/dict-db.c
@@ -465,19 +465,18 @@ db_dict_atomic_inc(struct dict_transaction_context *_ctx ATTR_UNUSED,
 struct dict dict_driver_db = {
        .name = "db",
        {
-               db_dict_init,
-               db_dict_deinit,
-               NULL,
-               db_dict_lookup,
-               db_dict_iterate_init,
-               db_dict_iterate,
-               db_dict_iterate_deinit,
-               db_dict_transaction_init,
-               db_dict_transaction_commit,
-               db_dict_transaction_rollback,
-               db_dict_set,
-               db_dict_unset,
-               db_dict_atomic_inc
+               .init = db_dict_init,
+               .deinit = db_dict_deinit,
+               .lookup = db_dict_lookup,
+               .iterate_init = db_dict_iterate_init,
+               .iterate = db_dict_iterate,
+               .iterate_deinit = db_dict_iterate_deinit,
+               .transaction_init = db_dict_transaction_init,
+               .transaction_commit = db_dict_transaction_commit,
+               .transaction_rollback = db_dict_transaction_rollback,
+               .set = db_dict_set,
+               .unset = db_dict_unset,
+               .atomic_inc = db_dict_atomic_inc,
        }
 };
 #endif

diff --git a/src/lib-dict/dict-file.c b/src/lib-dict/dict-file.c
index e22465ee20dc6d9781e0524fa90d760a68b64011..ae9aa4aa01f1b8f271eeedde0f6dbd2156158cff 100644 (file)
--- a/src/lib-dict/dict-file.c
+++ b/src/lib-dict/dict-file.c
@@ -649,21 +649,18 @@ file_dict_transaction_commit(struct dict_transaction_context *_ctx,
 struct dict dict_driver_file = {
        .name = "file",
        {
-               file_dict_init,
-               file_dict_deinit,
-               NULL,
-               file_dict_lookup,
-               file_dict_iterate_init,
-               file_dict_iterate,
-               file_dict_iterate_deinit,
-               file_dict_transaction_init,
-               file_dict_transaction_commit,
-               dict_transaction_memory_rollback,
-               dict_transaction_memory_set,
-               dict_transaction_memory_unset,
-               dict_transaction_memory_append,
-               dict_transaction_memory_atomic_inc,
-               NULL,
-               NULL
+               .init = file_dict_init,
+               .deinit = file_dict_deinit,
+               .lookup = file_dict_lookup,
+               .iterate_init = file_dict_iterate_init,
+               .iterate = file_dict_iterate,
+               .iterate_deinit = file_dict_iterate_deinit,
+               .transaction_init = file_dict_transaction_init,
+               .transaction_commit = file_dict_transaction_commit,
+               .transaction_rollback = dict_transaction_memory_rollback,
+               .set = dict_transaction_memory_set,
+               .unset = dict_transaction_memory_unset,
+               .append = dict_transaction_memory_append,
+               .atomic_inc = dict_transaction_memory_atomic_inc,
        }
 };

diff --git a/src/lib-dict/dict-memcached-ascii.c b/src/lib-dict/dict-memcached-ascii.c
index ebb27871ba3b5098faf4c25ba9d8432c8686969b..efcabd9f1af8931c7ab273a2187a719f958d1172 100644 (file)
--- a/src/lib-dict/dict-memcached-ascii.c
+++ b/src/lib-dict/dict-memcached-ascii.c
@@ -650,21 +650,15 @@ memcached_ascii_transaction_commit(struct dict_transaction_context *_ctx,
 struct dict dict_driver_memcached_ascii = {
        .name = "memcached_ascii",
        {
-               memcached_ascii_dict_init,
-               memcached_ascii_dict_deinit,
-               NULL,
-               memcached_ascii_dict_lookup,
-               NULL,
-               NULL,
-               NULL,
-               memcached_ascii_transaction_init,
-               memcached_ascii_transaction_commit,
-               dict_transaction_memory_rollback,
-               dict_transaction_memory_set,
-               dict_transaction_memory_unset,
-               dict_transaction_memory_append,
-               dict_transaction_memory_atomic_inc,
-               NULL,
-               NULL
+               .init = memcached_ascii_dict_init,
+               .deinit = memcached_ascii_dict_deinit,
+               .lookup = memcached_ascii_dict_lookup,
+               .transaction_init = memcached_ascii_transaction_init,
+               .transaction_commit = memcached_ascii_transaction_commit,
+               .transaction_rollback = dict_transaction_memory_rollback,
+               .set = dict_transaction_memory_set,
+               .unset = dict_transaction_memory_unset,
+               .append = dict_transaction_memory_append,
+               .atomic_inc = dict_transaction_memory_atomic_inc,
        }
 };

diff --git a/src/lib-dict/dict-memcached.c b/src/lib-dict/dict-memcached.c
index e3bd6067fe4206b00eaaeb86b3800a2e04e53e77..eafd22584fefe4e6bd1f4035a748b71d346b9a86 100644 (file)
--- a/src/lib-dict/dict-memcached.c
+++ b/src/lib-dict/dict-memcached.c
@@ -377,20 +377,8 @@ static int memcached_dict_lookup(struct dict *_dict, pool_t pool,
 struct dict dict_driver_memcached = {
        .name = "memcached",
        {
-               memcached_dict_init,
-               memcached_dict_deinit,
-               NULL,
-               memcached_dict_lookup,
-               NULL,
-               NULL,
-               NULL,
-               NULL,
-               NULL,
-               NULL,
-               NULL,
-               NULL,
-               NULL,
-               NULL,
-               NULL
+               .init = memcached_dict_init,
+               .deinit = memcached_dict_deinit,
+               .lookup = memcached_dict_lookup,
        }
 };

diff --git a/src/lib-dict/dict-redis.c b/src/lib-dict/dict-redis.c
index b7e92ce92854b1412884156379315188055071ae..77e3a1dd389d24af069896ae37ae72e051212cfc 100644 (file)
--- a/src/lib-dict/dict-redis.c
+++ b/src/lib-dict/dict-redis.c
@@ -790,21 +790,15 @@ static void redis_atomic_inc(struct dict_transaction_context *_ctx,
 struct dict dict_driver_redis = {
        .name = "redis",
        {
-               redis_dict_init,
-               redis_dict_deinit,
-               NULL,
-               redis_dict_lookup,
-               NULL,
-               NULL,
-               NULL,
-               redis_transaction_init,
-               redis_transaction_commit,
-               redis_transaction_rollback,
-               redis_set,
-               redis_unset,
-               redis_append,
-               redis_atomic_inc,
-               NULL,
-               NULL
+               .init = redis_dict_init,
+               .deinit = redis_dict_deinit,
+               .lookup = redis_dict_lookup,
+               .transaction_init = redis_transaction_init,
+               .transaction_commit = redis_transaction_commit,
+               .transaction_rollback = redis_transaction_rollback,
+               .set = redis_set,
+               .unset = redis_unset,
+               .append = redis_append,
+               .atomic_inc = redis_atomic_inc,
        }
 };

diff --git a/src/lib-dict/dict-sql.c b/src/lib-dict/dict-sql.c
index b142e360e18ac12eaa89e351bda627155316e078..feb46a67c9a3ba96742643fedb87484571baaa6e 100644 (file)
--- a/src/lib-dict/dict-sql.c
+++ b/src/lib-dict/dict-sql.c
@@ -1246,22 +1246,21 @@ static struct dict sql_dict = {
        .name = "sql",
 
        {
-               sql_dict_init,
-               sql_dict_deinit,
-               sql_dict_wait,
-               sql_dict_lookup,
-               sql_dict_iterate_init,
-               sql_dict_iterate,
-               sql_dict_iterate_deinit,
-               sql_dict_transaction_init,
-               sql_dict_transaction_commit,
-               sql_dict_transaction_rollback,
-               sql_dict_set,
-               sql_dict_unset,
-               sql_dict_append,
-               sql_dict_atomic_inc,
-               sql_dict_lookup_async,
-               NULL
+               .init = sql_dict_init,
+               .deinit = sql_dict_deinit,
+               .wait = sql_dict_wait,
+               .lookup = sql_dict_lookup,
+               .iterate_init = sql_dict_iterate_init,
+               .iterate = sql_dict_iterate,
+               .iterate_deinit = sql_dict_iterate_deinit,
+               .transaction_init = sql_dict_transaction_init,
+               .transaction_commit = sql_dict_transaction_commit,
+               .transaction_rollback = sql_dict_transaction_rollback,
+               .set = sql_dict_set,
+               .unset = sql_dict_unset,
+               .append = sql_dict_append,
+               .atomic_inc = sql_dict_atomic_inc,
+               .lookup_async = sql_dict_lookup_async,
        }
 };