From: Martti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
Date: Mon, 16 Oct 2017 19:50:11 +0000 (+0300)
Subject: quota-fs: Remove T_BEGIN..T_END from fs_quota_get_resource()
X-Git-Tag: 2.3.0.rc1~809
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d77b5c30f4e757add1028de85e7ad95fccd96f98;p=thirdparty%2Fdovecot%2Fcore.git

quota-fs: Remove T_BEGIN..T_END from fs_quota_get_resource()

This is to enable using t_strdup_printf() with error_r later on.
---

diff --git a/src/plugins/quota/quota-fs.c b/src/plugins/quota/quota-fs.c
index c38e0204c6..7d46fd9dee 100644
--- a/src/plugins/quota/quota-fs.c
+++ b/src/plugins/quota/quota-fs.c
@@ -872,12 +872,10 @@ fs_quota_get_resource(struct quota_root *_root, const char *name,
 
 #ifdef HAVE_RQUOTA
 	if (mount_type_is_nfs(root->mount)) {
-		T_BEGIN {
-			ret = root->user_disabled ? 0 :
-				do_rquota_user(root, &bytes_value, &bytes_limit, &count_value, &count_limit);
-			if (ret == 0 && !root->group_disabled)
-				ret = do_rquota_group(root, &bytes_value, &bytes_limit, &count_value, &count_limit);
-		} T_END;
+		ret = root->user_disabled ? 0 :
+			do_rquota_user(root, &bytes_value, &bytes_limit, &count_value, &count_limit);
+		if (ret == 0 && !root->group_disabled)
+			ret = do_rquota_group(root, &bytes_value, &bytes_limit, &count_value, &count_limit);
 	} else
 #endif
 	{