[dovecot-cvs] dovecot/src/lib-imap imap-envelope.c,1.23,1.24 imap-envelope.h,1.8,1.9 imap-quote.c,1.9,1.10 imap-quote.h,1.4,1.5

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-imap
In directory danu:/tmp/cvs-serv9747/src/lib-imap

Modified Files:
	imap-envelope.c imap-envelope.h imap-quote.c imap-quote.h 
Log Message:
memory usage fixes



Index: imap-envelope.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-imap/imap-envelope.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- imap-envelope.c	8 Feb 2003 10:44:01 -0000	1.23
+++ imap-envelope.c	26 Mar 2003 15:40:16 -0000	1.24
@@ -98,13 +98,13 @@
 	str_append_c(str, '(');
 	while (addr != NULL) {
 		str_append_c(str, '(');
-		str_append(str, imap_quote_str_nil(addr->name));
+		imap_quote_append_string(str, addr->name);
 		str_append_c(str, ' ');
-		str_append(str, imap_quote_str_nil(addr->route));
+		imap_quote_append_string(str, addr->route);
 		str_append_c(str, ' ');
-		str_append(str, imap_quote_str_nil(addr->mailbox));
+		imap_quote_append_string(str, addr->mailbox);
 		str_append_c(str, ' ');
-		str_append(str, imap_quote_str_nil(addr->domain));
+		imap_quote_append_string(str, addr->domain);
 		str_append_c(str, ')');
 
 		addr = addr->next;
@@ -136,16 +136,6 @@
 	str_append(str, NVL(data->in_reply_to, "NIL"));
 	str_append_c(str, ' ');
 	str_append(str, NVL(data->message_id, "NIL"));
-}
-
-const char *
-imap_envelope_get_part_data(struct message_part_envelope_data *data)
-{
-	string_t *str;
-
-	str = t_str_new(2048);
-        imap_envelope_write_part_data(data, str);
-	return str_c(str);
 }
 
 static int imap_address_arg_append(struct imap_arg *arg, string_t *str,

Index: imap-envelope.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-imap/imap-envelope.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- imap-envelope.h	5 Jan 2003 13:09:52 -0000	1.8
+++ imap-envelope.h	26 Mar 2003 15:40:16 -0000	1.9
@@ -33,9 +33,6 @@
 /* Write envelope to given string */
 void imap_envelope_write_part_data(struct message_part_envelope_data *data,
 				   string_t *str);
-/* Return envelope. */
-const char *
-imap_envelope_get_part_data(struct message_part_envelope_data *data);
 
 /* Parse envelope and store specified field to result. NIL is stored as NULL.
    Returns TRUE if successful. */

Index: imap-quote.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-imap/imap-quote.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- imap-quote.c	4 Mar 2003 01:10:28 -0000	1.9
+++ imap-quote.c	26 Mar 2003 15:40:16 -0000	1.10
@@ -10,6 +10,11 @@
 	size_t i, linefeeds = 0;
 	int literal = FALSE;
 
+	if (value == NULL) {
+		str_append(str, "NIL");
+		return;
+	}
+
 	for (i = 0; i < value_len; i++) {
 		if (value[i] == 0) {
 			value_len = i;
@@ -45,21 +50,12 @@
 		str_append_c(str, '"');
 }
 
-const char *imap_quote_str_nil(const char *value)
+char *imap_quote(pool_t pool, const unsigned char *value, size_t value_len)
 {
 	string_t *str;
 
 	if (value == NULL)
 		return "NIL";
-
-	str = t_str_new(512);
-	imap_quote_append(str, (const unsigned char *) value, (size_t)-1);
-	return str_c(str);
-}
-
-char *imap_quote(pool_t pool, const unsigned char *value, size_t value_len)
-{
-	string_t *str;
 
 	str = t_str_new(value_len + MAX_INT_STRLEN + 5);
 	imap_quote_append(str, value, value_len);

Index: imap-quote.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib-imap/imap-quote.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imap-quote.h	8 Feb 2003 10:44:01 -0000	1.4
+++ imap-quote.h	26 Mar 2003 15:40:16 -0000	1.5
@@ -9,7 +9,7 @@
 void imap_quote_append(string_t *str, const unsigned char *value,
 		       size_t value_len);
 
-/* If value is NULL, return NIL. */
-const char *imap_quote_str_nil(const char *value);
+#define imap_quote_append_string(str, value) \
+	imap_quote_append(str, (const unsigned char *) value, (size_t)-1)
 
 #endif