From: Timo Sirainen <tss@iki.fi>
Date: Mon, 14 Dec 2009 00:54:20 +0000 (-0500)
Subject: lib-settings: settings_get_time/size() are now public.
X-Git-Tag: 2.0.beta1~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b73cc2ac2a6e6234338429871ed4251c72bdbc78;p=thirdparty%2Fdovecot%2Fcore.git

lib-settings: settings_get_time/size() are now public.

--HG--
branch : HEAD
---

diff --git a/src/lib-settings/settings-parser.c b/src/lib-settings/settings-parser.c
index 4a1f3d5b9b..0e4a4687d0 100644
--- a/src/lib-settings/settings-parser.c
+++ b/src/lib-settings/settings-parser.c
@@ -309,14 +309,13 @@ get_uint(struct setting_parser_context *ctx, const char *value,
 	return 0;
 }
 
-static int
-get_time(struct setting_parser_context *ctx, const char *value,
-	 unsigned int *result_r)
+int settings_get_time(const char *str, unsigned int *secs_r,
+		      const char **error_r)
 {
 	unsigned int num, multiply = 1;
 	char *p;
 
-	num = strtoull(value, &p, 10);
+	num = strtoull(str, &p, 10);
 	while (*p == ' ') p++;
 	switch (i_toupper(*p)) {
 	case 'S':
@@ -347,29 +346,25 @@ get_time(struct setting_parser_context *ctx, const char *value,
 	}
 
 	if (*p != '\0') {
-		ctx->error = p_strconcat(ctx->parser_pool,
-					 "Invalid time interval: ",
-					 value, NULL);
+		*error_r = t_strconcat("Invalid time interval: ", str, NULL);
 		return -1;
 	}
 	if (num > -1U / multiply) {
-		ctx->error = p_strconcat(ctx->parser_pool,
-					 "Time interval is too large: ",
-					 value, NULL);
+		*error_r = t_strconcat("Time interval is too large: ",
+				       str, NULL);
 		return -1;
 	}
-	*result_r = num * multiply;
+	*secs_r = num * multiply;
 	return 0;
 }
 
-static int
-get_size(struct setting_parser_context *ctx, const char *value,
-	 uoff_t *result_r)
+int settings_get_size(const char *str, uoff_t *bytes_r,
+		      const char **error_r)
 {
 	unsigned long long num, multiply = 1;
 	char *p;
 
-	num = strtoull(value, &p, 10);
+	num = strtoull(str, &p, 10);
 	while (*p == ' ') p++;
 	switch (i_toupper(*p)) {
 	case 'B':
@@ -402,16 +397,14 @@ get_size(struct setting_parser_context *ctx, const char *value,
 			p++;
 	}
 	if (*p != '\0') {
-		ctx->error = p_strconcat(ctx->parser_pool, "Invalid size: ",
-					 value, NULL);
+		*error_r = t_strconcat("Invalid size: ", str, NULL);
 		return -1;
 	}
 	if (num > -1ULL / multiply) {
-		ctx->error = p_strconcat(ctx->parser_pool,
-					 "Size is too large: ", value, NULL);
+		*error_r = t_strconcat("Size is too large: ", str, NULL);
 		return -1;
 	}
-	*result_r = num * multiply;
+	*bytes_r = num * multiply;
 	return 0;
 }
 
@@ -518,6 +511,7 @@ settings_parse(struct setting_parser_context *ctx, struct setting_link *link,
 	       const char *key, const char *value)
 {
         void *ptr, *ptr2, *change_ptr;
+	const char *error;
 
 	ctx->prev_info = link->info;
 
@@ -556,12 +550,16 @@ settings_parse(struct setting_parser_context *ctx, struct setting_link *link,
 			return -1;
 		break;
 	case SET_TIME:
-		if (get_time(ctx, value, (unsigned int *)ptr) < 0)
+		if (settings_get_time(value, (unsigned int *)ptr, &error) < 0) {
+			ctx->error = p_strdup(ctx->parser_pool, error);
 			return -1;
+		}
 		break;
 	case SET_SIZE:
-		if (get_size(ctx, value, (uoff_t *)ptr) < 0)
+		if (settings_get_size(value, (uoff_t *)ptr, &error) < 0) {
+			ctx->error = p_strdup(ctx->parser_pool, error);
 			return -1;
+		}
 		break;
 	case SET_STR:
 		*((char **)ptr) = p_strdup(ctx->set_pool, value);
diff --git a/src/lib-settings/settings-parser.h b/src/lib-settings/settings-parser.h
index 352ac70892..0de9d9132b 100644
--- a/src/lib-settings/settings-parser.h
+++ b/src/lib-settings/settings-parser.h
@@ -195,5 +195,11 @@ int settings_parser_apply_changes(struct setting_parser_context *dest,
 
 /* Return section name escaped */
 const char *settings_section_escape(const char *name);
+/* Parse time interval string, return as seconds. */
+int settings_get_time(const char *str, unsigned int *secs_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);
 
 #endif