From: Timo Sirainen <tss@iki.fi>
Date: Tue, 10 Feb 2009 17:01:41 +0000 (-0500)
Subject: Renamed imap_args_to_str() to imap_write_args() and added a new imap_args_to_str().
X-Git-Tag: 1.2.beta1~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=78ba4bc1b40a1b6da000eb80fa76853944becb31;p=thirdparty%2Fdovecot%2Fcore.git

Renamed imap_args_to_str() to imap_write_args() and added a new imap_args_to_str().

--HG--
branch : HEAD
---

diff --git a/src/imap/client.c b/src/imap/client.c
index 46f927a6a1..ebf2984451 100644
--- a/src/imap/client.c
+++ b/src/imap/client.c
@@ -314,7 +314,7 @@ bool client_read_args(struct client_command_context *cmd, unsigned int count,
 			 cmd->client->input_lock == cmd);
 
 		str = t_str_new(256);
-		imap_args_to_str(str, *args_r);
+		imap_write_args(str, *args_r);
 		cmd->args = p_strdup(cmd->pool, str_c(str));
 
 		cmd->client->input_lock = NULL;
diff --git a/src/lib-imap/imap-util.c b/src/lib-imap/imap-util.c
index 62e758d1e1..a08c559ab4 100644
--- a/src/lib-imap/imap-util.c
+++ b/src/lib-imap/imap-util.c
@@ -55,7 +55,7 @@ void imap_write_seq_range(string_t *dest, const ARRAY_TYPE(seq_range) *array)
 	}
 }
 
-void imap_args_to_str(string_t *dest, const struct imap_arg *args)
+void imap_write_args(string_t *dest, const struct imap_arg *args)
 {
 	const ARRAY_TYPE(imap_arg_list) *list;
 	bool first = TRUE;
@@ -88,7 +88,7 @@ void imap_args_to_str(string_t *dest, const struct imap_arg *args)
 		case IMAP_ARG_LIST:
 			str_append_c(dest, '(');
 			list = IMAP_ARG_LIST(args);
-			imap_args_to_str(dest, array_idx(list, 0));
+			imap_write_args(dest, array_idx(list, 0));
 			str_append_c(dest, ')');
 			break;
 		case IMAP_ARG_LITERAL_SIZE:
@@ -102,3 +102,12 @@ void imap_args_to_str(string_t *dest, const struct imap_arg *args)
 		}
 	}
 }
+
+const char *imap_args_to_str(const struct imap_arg *args)
+{
+	string_t *str;
+
+	str = t_str_new(128);
+	imap_write_args(str, args);
+	return str_c(str);
+}
diff --git a/src/lib-imap/imap-util.h b/src/lib-imap/imap-util.h
index bfb3e79118..33881540c7 100644
--- a/src/lib-imap/imap-util.h
+++ b/src/lib-imap/imap-util.h
@@ -13,6 +13,8 @@ void imap_write_flags(string_t *dest, enum mail_flags flags,
 /* Write sequence range as IMAP sequence-set */
 void imap_write_seq_range(string_t *dest, const ARRAY_TYPE(seq_range) *array);
 /* Write IMAP args to given string. The string is mainly useful for humans. */
-void imap_args_to_str(string_t *dest, const struct imap_arg *args);
+void imap_write_args(string_t *dest, const struct imap_arg *args);
+/* Like imap_write_args(), but return the string allocated from data stack. */
+const char *imap_args_to_str(const struct imap_arg *args);
 
 #endif