From 65ec43cb553420890c8d14b6c76ce2606674d893 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@src.gnome.org>
Date: Mon, 8 May 2000 22:27:59 +0000
Subject: Use CamelException to signal failure. (camel_stream_write_strings):

	* camel-stream.c (camel_stream_read, camel_stream_write,
	camel_stream_flush, camel_stream_reset, camel_stream_printf,
	camel_stream_write_to_stream): Use CamelException to signal
	failure.
	(camel_stream_write_strings): Remove. camel_stream_printf is more
	useful in most of the places that used this.
	(camel_stream_write_string): Change from macro to function to
	prevent problems with double-evaluation.

	* camel-seekable-stream.c (camel_seekable_stream_seek,
	camel_seekable_stream_set_bounds): Use CamelException.
	(reset): Update.

	* camel-seekable-substream.c, camel-stream-buffer.c,
	camel-stream-filter.c, camel-stream-fs.c, camel-stream-mem.c:
	Update.

	* camel-stream-fs.c: Remove the virtual init functions and move
	the code into the creator functions. Add CamelExceptions to
	creation functions that could fail.

	* camel-data-wrapper.c (camel_data_wrapper_write_to_stream): Use
	CamelException.
	* camel-mime-message.c, camel-mime-part.c, camel-multipart.c
	(write_to_stream): Update.

	* camel-mime-parser.c: add an exception to the mime parser private
	data and pass that to stream functions as needed.

	* gmime-content-field.c, md5-utils.c: Update (badly) for stream
	changes.

	* camel-exception.h (camel_exception_is_set): convenience macro.

	* providers/Makefile.am: disable SMTP for now

	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Pass
	CamelException to the functions that now need it. Check the
	exception after calling camel_stream_flush, and fail if it fails.
	(mbox_get_message_by_uid): More updates.

	* providers/pop/camel-pop3-folder.c,
	providers/pop/camel-pop3-store.c,
	providers/sendmail/camel-sendmail/transport.c: Update.

svn path=/trunk/; revision=2924
---
 camel/camel-mime-part.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'camel/camel-mime-part.c')

diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index 1688168737..cd6362f8d3 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -36,6 +36,7 @@
 #include "camel-stream-mem.h"
 #include "camel-stream-filter.h"
 #include "camel-mime-filter-basic.h"
+#include "camel-exception.h"
 
 #define d(x)
 
@@ -66,7 +67,8 @@ static void            finalize (GtkObject *object);
 
 /* from CamelDataWrapper */
 static int             write_to_stream                 (CamelDataWrapper *data_wrapper, 
-							CamelStream *stream);
+							CamelStream *stream,
+							CamelException *ex);
 static int	       construct_from_stream	       (CamelDataWrapper *dw, CamelStream *s);
 
 /* from CamelMedia */ 
@@ -478,12 +480,13 @@ set_content_object (CamelMedium *medium, CamelDataWrapper *content)
 /**********************************************************************/
 
 static int
-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
+write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream,
+		 CamelException *ex)
 {
 	CamelMimePart *mp = CAMEL_MIME_PART (data_wrapper);
 	CamelMedium *medium = CAMEL_MEDIUM (data_wrapper);
 	CamelDataWrapper *content;
-	int total = 0, count;
+	int total = 0;
 
 	d(printf("mime_part::write_to_stream\n"));
 
@@ -494,16 +497,19 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 	if (mp->headers) {
 		struct _header_raw *h = mp->headers;
 		while (h) {
-			if ( (count = camel_stream_write_strings (stream, h->name, isspace(h->value[0])?":":": ", h->value, "\n", NULL) ) == -1 )
+			total += camel_stream_printf (stream, ex, "%s%s%s\n",
+						      h->name,
+						      isspace(h->value[0]) ? ":" : ": ",
+						      h->value);
+			if (camel_exception_is_set (ex))
 				return -1;
-			total += count;
 			h = h->next;
 		}
 	}
 
-	if ( (count = camel_stream_write_string(stream,"\n")) == -1)
+	total += camel_stream_write (stream, "\n", 1, ex);
+	if (camel_exception_is_set (ex))
 		return -1;
-	total += count;
 
 	content = camel_medium_get_content_object (medium);
 	if (content) {
@@ -531,13 +537,11 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 		}
 
 #endif
-		if ( (count = camel_data_wrapper_write_to_stream(content, stream)) == -1 )
-			total = -1;
-		else
-			total += count;
-
+		total += camel_data_wrapper_write_to_stream (content, stream, ex);
 		if (filter_stream)
 			gtk_object_unref((GtkObject *)filter_stream);
+		if (camel_exception_is_set (ex))
+			return -1;
 	} else {
 		g_warning("No content for medium, nothing to write");
 	}
-- 
cgit