From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 9 Jan 2017 17:10:25 +0000 (+0200)
Subject: dict-ldap|fs: Explicitly specify used dict_vfuncs methods.
X-Git-Tag: 2.3.0.rc1~2333
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=788810ad6d657e75f33640815f04722de0fd0cfd;p=thirdparty%2Fdovecot%2Fcore.git

dict-ldap|fs: Explicitly specify used dict_vfuncs methods.

This was done for other dict drivers in
ade5567577dadb0b275c840208d3ad21a9f00a36
---

diff --git a/src/lib-dict-extra/dict-fs.c b/src/lib-dict-extra/dict-fs.c
index caf68b1e4c..db190610a7 100644
--- a/src/lib-dict-extra/dict-fs.c
+++ b/src/lib-dict-extra/dict-fs.c
@@ -282,20 +282,16 @@ fs_dict_transaction_commit(struct dict_transaction_context *_ctx,
 struct dict dict_driver_fs = {
 	.name = "fs",
 	{
-		fs_dict_init,
-		fs_dict_deinit,
-		NULL,
-		fs_dict_lookup,
-		fs_dict_iterate_init,
-		fs_dict_iterate,
-		fs_dict_iterate_deinit,
-		fs_dict_transaction_init,
-		fs_dict_transaction_commit,
-		dict_transaction_memory_rollback,
-		dict_transaction_memory_set,
-		dict_transaction_memory_unset,
-		NULL,
-		NULL,
-		NULL
+		.init = fs_dict_init,
+		.deinit = fs_dict_deinit,
+		.lookup = fs_dict_lookup,
+		.iterate_init = fs_dict_iterate_init,
+		.iterate = fs_dict_iterate,
+		.iterate_deinit = fs_dict_iterate_deinit,
+		.transaction_init = fs_dict_transaction_init,
+		.transaction_commit = fs_dict_transaction_commit,
+		.transaction_rollback = dict_transaction_memory_rollback,
+		.set = dict_transaction_memory_set,
+		.unset = dict_transaction_memory_unset,
 	}
 };
diff --git a/src/plugins/dict-ldap/dict-ldap.c b/src/plugins/dict-ldap/dict-ldap.c
index 99ac2784d9..4d60e51f32 100644
--- a/src/plugins/dict-ldap/dict-ldap.c
+++ b/src/plugins/dict-ldap/dict-ldap.c
@@ -428,21 +428,12 @@ void ldap_dict_lookup_async(struct dict *dict, const char *key,
 struct dict dict_driver_ldap = {
 	.name = "ldap",
 	{
-		ldap_dict_init,
-		ldap_dict_deinit,
-		ldap_dict_wait,
-		ldap_dict_lookup,
-		NULL, /*ldap_dict_iterate_init,*/
-		NULL, /*ldap_dict_iterate,*/
-		NULL, /*ldap_dict_iterate_deinit,*/
-		NULL, /*ldap_transaction_init,*/
-		NULL, /*ldap_transaction_commit,*/
-		NULL, /*ldap_transaction_rollback,*/
-		NULL, /*ldap_set,*/
-		NULL, /*ldap_unset,*/
-		NULL, /*ldap_atomic_inc,*/
-		ldap_dict_lookup_async,
-		ldap_dict_switch_ioloop
+		.init = ldap_dict_init,
+		.deinit = ldap_dict_deinit,
+		.wait = ldap_dict_wait,
+		.lookup = ldap_dict_lookup,
+		.lookup_async = ldap_dict_lookup_async,
+		.switch_ioloop = ldap_dict_switch_ioloop,
 	}
 };