From: Karl Fleischmann <karl.fleischmann@open-xchange.com>
Date: Wed, 26 Oct 2022 15:03:08 +0000 (+0200)
Subject: global: Replace settings_get_size() with str_parse_get_size() in project
X-Git-Tag: 2.4.0~3399
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29ecc955bcc9db54d3d9d8ddf19d42d44aee18c8;p=thirdparty%2Fdovecot%2Fcore.git

global: Replace settings_get_size() with str_parse_get_size() in project
---

diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c
index fa681019d1..acc6b597a8 100644
--- a/src/doveadm/doveadm-dsync.c
+++ b/src/doveadm/doveadm-dsync.c
@@ -13,6 +13,7 @@
 #include "write-full.h"
 #include "str.h"
 #include "strescape.h"
+#include "str-parse.h"
 #include "var-expand.h"
 #include "process-title.h"
 #include "settings-parser.h"
@@ -1224,7 +1225,7 @@ static void cmd_dsync_preinit(struct doveadm_mail_cmd_context *_ctx)
 				       &utc) < 0)
 		i_fatal("Invalid -e parameter: %s", value_str);
 	if (doveadm_cmd_param_str(cctx, "sync-max-size", &value_str) &&
-	    settings_get_size(value_str, &ctx->sync_max_size, &error) < 0)
+	    str_parse_get_size(value_str, &ctx->sync_max_size, &error) < 0)
 		i_fatal("Invalid -I parameter '%s': %s", value_str, error);
 
 	(void)doveadm_cmd_param_uint32(cctx, "timeout", &ctx->io_timeout_secs);
diff --git a/src/lib-settings/settings-parser.c b/src/lib-settings/settings-parser.c
index ab5f9008a2..7f19bed591 100644
--- a/src/lib-settings/settings-parser.c
+++ b/src/lib-settings/settings-parser.c
@@ -357,12 +357,6 @@ int settings_get_time_msecs(const char *str, unsigned int *msecs_r,
 	return str_parse_get_interval_msecs(str, msecs_r, error_r);
 }
 
-int settings_get_size(const char *str, uoff_t *bytes_r,
-		      const char **error_r)
-{
-	return str_parse_get_size(str, bytes_r, error_r);
-}
-
 static int get_enum(struct setting_parser_context *ctx, const char *value,
 		    char **result_r, const char *allowed_values)
 {
@@ -549,7 +543,7 @@ settings_parse(struct setting_parser_context *ctx, struct setting_link *link,
 		}
 		break;
 	case SET_SIZE:
-		if (settings_get_size(value, (uoff_t *)ptr, &error) < 0) {
+		if (str_parse_get_size(value, (uoff_t *)ptr, &error) < 0) {
 			ctx->error = p_strdup(ctx->parser_pool, error);
 			return -1;
 		}
diff --git a/src/lib-settings/settings-parser.h b/src/lib-settings/settings-parser.h
index 24d21c9bc6..5a33466ce2 100644
--- a/src/lib-settings/settings-parser.h
+++ b/src/lib-settings/settings-parser.h
@@ -276,9 +276,6 @@ int settings_get_time(const char *str, unsigned int *secs_r,
 /* Parse time interval string, return as milliseconds. */
 int settings_get_time_msecs(const char *str, unsigned int *msecs_r,
 			    const char **error_r);
-/* Parse size string, return as bytes. */
-int settings_get_size(const char *str, uoff_t *bytes_r,
-		      const char **error_r);
 /* Parse boolean string, return as boolean */
 int settings_get_bool(const char *value, bool *result_r,
 		      const char **error_r);
diff --git a/src/lib-storage/mail-search-register-human.c b/src/lib-storage/mail-search-register-human.c
index 4dc6694d6c..50e06a0e68 100644
--- a/src/lib-storage/mail-search-register-human.c
+++ b/src/lib-storage/mail-search-register-human.c
@@ -5,7 +5,7 @@
 #include "array.h"
 #include "str.h"
 #include "unichar.h"
-#include "settings-parser.h"
+#include "str-parse.h"
 #include "mail-storage.h"
 #include "mail-search-register.h"
 #include "mail-search-parser.h"
@@ -90,7 +90,7 @@ arg_new_human_size(struct mail_search_build_context *ctx,
 	if (mail_search_parse_string(ctx->parser, &value) < 0)
 		return NULL;
 
-	if (settings_get_size(value, &sarg->value.size, &error) < 0) {
+	if (str_parse_get_size(value, &sarg->value.size, &error) < 0) {
 		ctx->_error = p_strdup(ctx->pool, error);
 		return NULL;
 	}
diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index fd40710e20..5bc673e968 100644
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -15,7 +15,7 @@
 #include "quota-fs.h"
 #include "llist.h"
 #include "program-client.h"
-#include "settings-parser.h"
+#include "str-parse.h"
 
 #include <sys/wait.h>
 
@@ -316,8 +316,8 @@ int quota_user_read_settings(struct mail_user *user,
 						       "quota_max_mail_size");
 	if (max_size != NULL) {
 		const char *error = NULL;
-		if (settings_get_size(max_size, &quota_set->max_mail_size,
-					&error) < 0) {
+		if (str_parse_get_size(max_size, &quota_set->max_mail_size,
+				       &error) < 0) {
 			*error_r = t_strdup_printf("quota_max_mail_size: %s",
 					error);
 			return -1;