From: Martti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
Date: Tue, 17 Oct 2017 13:05:47 +0000 (+0300)
Subject: quota: Initialize quota_backends with designated initializers
X-Git-Tag: 2.3.0.rc1~812
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5997118fa7aee2535edac28092261ca085a958ae;p=thirdparty%2Fdovecot%2Fcore.git

quota: Initialize quota_backends with designated initializers
---

diff --git a/src/plugins/quota/quota-count.c b/src/plugins/quota/quota-count.c
index f9f46dc09e..9501ae7a8d 100644
--- a/src/plugins/quota/quota-count.c
+++ b/src/plugins/quota/quota-count.c
@@ -322,19 +322,14 @@ count_quota_update(struct quota_root *root,
 }
 
 struct quota_backend quota_backend_count = {
-	"count",
-
-	{
-		count_quota_alloc,
-		count_quota_init,
-		count_quota_deinit,
-		NULL,
-		NULL,
-		NULL,
-		count_quota_root_get_resources,
-		count_quota_get_resource,
-		count_quota_update,
-		NULL,
-		NULL
+	.name = "count",
+
+	.v = {
+		.alloc = count_quota_alloc,
+		.init = count_quota_init,
+		.deinit = count_quota_deinit,
+		.get_resources = count_quota_root_get_resources,
+		.get_resource = count_quota_get_resource,
+		.update = count_quota_update,
 	}
 };
diff --git a/src/plugins/quota/quota-dict.c b/src/plugins/quota/quota-dict.c
index 8d5cb9518f..bec5e5f3b5 100644
--- a/src/plugins/quota/quota-dict.c
+++ b/src/plugins/quota/quota-dict.c
@@ -246,19 +246,15 @@ static void dict_quota_flush(struct quota_root *_root)
 }
 
 struct quota_backend quota_backend_dict = {
-	"dict",
-
-	{
-		dict_quota_alloc,
-		dict_quota_init,
-		dict_quota_deinit,
-		NULL,
-		NULL,
-		NULL,
-		dict_quota_root_get_resources,
-		dict_quota_get_resource,
-		dict_quota_update,
-		NULL,
-		dict_quota_flush
+	.name = "dict",
+
+	.v = {
+		.alloc = dict_quota_alloc,
+		.init = dict_quota_init,
+		.deinit = dict_quota_deinit,
+		.get_resources = dict_quota_root_get_resources,
+		.get_resource = dict_quota_get_resource,
+		.update = dict_quota_update,
+		.flush = dict_quota_flush,
 	}
 };
diff --git a/src/plugins/quota/quota-dirsize.c b/src/plugins/quota/quota-dirsize.c
index 91464201e9..6807658f11 100644
--- a/src/plugins/quota/quota-dirsize.c
+++ b/src/plugins/quota/quota-dirsize.c
@@ -214,19 +214,14 @@ dirsize_quota_update(struct quota_root *root ATTR_UNUSED,
 }
 
 struct quota_backend quota_backend_dirsize = {
-	"dirsize",
-
-	{
-		dirsize_quota_alloc,
-		dirsize_quota_init,
-		dirsize_quota_deinit,
-		NULL,
-		NULL,
-		NULL,
-		dirsize_quota_root_get_resources,
-		dirsize_quota_get_resource,
-		dirsize_quota_update,
-		NULL,
-		NULL
+	.name = "dirsize",
+
+	.v = {
+		.alloc = dirsize_quota_alloc,
+		.init = dirsize_quota_init,
+		.deinit = dirsize_quota_deinit,
+		.get_resources = dirsize_quota_root_get_resources,
+		.get_resource = dirsize_quota_get_resource,
+		.update = dirsize_quota_update,
 	}
 };
diff --git a/src/plugins/quota/quota-fs.c b/src/plugins/quota/quota-fs.c
index fdd7d45ce9..c38e0204c6 100644
--- a/src/plugins/quota/quota-fs.c
+++ b/src/plugins/quota/quota-fs.c
@@ -917,23 +917,20 @@ fs_quota_update(struct quota_root *root ATTR_UNUSED,
 }
 
 struct quota_backend quota_backend_fs = {
-	"fs",
+	.name = "fs",
 
-	{
-		fs_quota_alloc,
-		fs_quota_init,
-		fs_quota_deinit,
-		NULL,
-		NULL,
+	.v = {
+		.alloc = fs_quota_alloc,
+		.init = fs_quota_init,
+		.deinit = fs_quota_deinit,
 
-		fs_quota_namespace_added,
+		.namespace_added = fs_quota_namespace_added,
 
-		fs_quota_root_get_resources,
-		fs_quota_get_resource,
-		fs_quota_update,
+		.get_resources = fs_quota_root_get_resources,
+		.get_resource = fs_quota_get_resource,
+		.update = fs_quota_update,
 
-		fs_quota_match_box,
-		NULL
+		.match_box = fs_quota_match_box,
 	}
 };
 
diff --git a/src/plugins/quota/quota-imapc.c b/src/plugins/quota/quota-imapc.c
index 9682e975f7..f7b0dedd06 100644
--- a/src/plugins/quota/quota-imapc.c
+++ b/src/plugins/quota/quota-imapc.c
@@ -443,19 +443,16 @@ imapc_quota_update(struct quota_root *root ATTR_UNUSED,
 }
 
 struct quota_backend quota_backend_imapc = {
-	"imapc",
-
-	{
-		imapc_quota_alloc,
-		imapc_quota_init,
-		imapc_quota_deinit,
-		NULL,
-		imapc_quota_init_limits,
-		imapc_quota_namespace_added,
-		imapc_quota_root_get_resources,
-		imapc_quota_get_resource,
-		imapc_quota_update,
-		NULL,
-		NULL
+	.name = "imapc",
+
+	.v = {
+		.alloc = imapc_quota_alloc,
+		.init = imapc_quota_init,
+		.deinit = imapc_quota_deinit,
+		.init_limits = imapc_quota_init_limits,
+		.namespace_added = imapc_quota_namespace_added,
+		.get_resources = imapc_quota_root_get_resources,
+		.get_resource = imapc_quota_get_resource,
+		.update = imapc_quota_update,
 	}
 };
diff --git a/src/plugins/quota/quota-maildir.c b/src/plugins/quota/quota-maildir.c
index f92cf6873a..01de69ad8f 100644
--- a/src/plugins/quota/quota-maildir.c
+++ b/src/plugins/quota/quota-maildir.c
@@ -889,19 +889,17 @@ maildir_quota_update(struct quota_root *_root,
 }
 
 struct quota_backend quota_backend_maildir = {
-	"maildir",
-
-	{
-		maildir_quota_alloc,
-		maildir_quota_init,
-		maildir_quota_deinit,
-		maildir_quota_parse_rule,
-		maildir_quota_init_limits,
-		maildir_quota_namespace_added,
-		maildir_quota_root_get_resources,
-		maildir_quota_get_resource,
-		maildir_quota_update,
-		NULL,
-		NULL
+	.name = "maildir",
+
+	.v = {
+		.alloc = maildir_quota_alloc,
+		.init = maildir_quota_init,
+		.deinit = maildir_quota_deinit,
+		.parse_rule = maildir_quota_parse_rule,
+		.init_limits = maildir_quota_init_limits,
+		.namespace_added = maildir_quota_namespace_added,
+		.get_resources = maildir_quota_root_get_resources,
+		.get_resource = maildir_quota_get_resource,
+		.update = maildir_quota_update,
 	}
 };