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

1 files changed, 36 insertions, 32 deletions

diff --git a/camel/camel-stream.h b/camel/camel-stream.h
index c2b91d0e6a..c1a044e68f 100644
--- a/camel/camel-stream.h
+++ b/camel/camel-stream.h
@@ -1,15 +1,14 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* camel-stream.h : class for an abstract stream */
 
-/* 
- *
- * Author : 
+/*
+ * Author:
  *  Bertrand Guiheneuf <bertrand@helixcode.com>
  *
  * Copyright 1999, 2000 Helix Code, Inc. (http://www.helixcode.com)
  *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
  *
@@ -35,6 +34,7 @@ extern "C" {
 #endif /* __cplusplus }*/
 
 #include <camel/camel-object.h>
+#include <stdarg.h>
 
 #define CAMEL_STREAM_TYPE     (camel_stream_get_type ())
 #define CAMEL_STREAM(obj)     (GTK_CHECK_CAST((obj), CAMEL_STREAM_TYPE, CamelStream))
@@ -45,49 +45,53 @@ struct _CamelStream
 {
 	CamelObject parent_object;
 
-	gboolean eos;		/* end of stream indicator, for use by implementing classes */
+	gboolean eos;
 };
 
 typedef struct {
 	CamelObjectClass parent_class;
-	
-	/* Virtual methods */	
-	
-	void  (*data_available) (CamelStream *stream); /* default "data_available" signal handler */
-
-	gint      (*read)       (CamelStream *stream, gchar *buffer, gint n);
-	gint      (*write)      (CamelStream *stream, const gchar *buffer, gint n);
-	void      (*flush)      (CamelStream *stream);
+
+	/* Virtual methods */
+
+	int       (*read)       (CamelStream *stream, char *buffer,
+				 unsigned int n, CamelException *ex);
+	int       (*write)      (CamelStream *stream, const char *buffer,
+				 unsigned int n, CamelException *ex);
+	void      (*flush)      (CamelStream *stream, CamelException *ex);
 	gboolean  (*eos)        (CamelStream *stream);
-	void      (*reset)      (CamelStream *stream);
+	void      (*reset)      (CamelStream *stream, CamelException *ex);
+
 } CamelStreamClass;
 
 /* Standard Gtk function */
 GtkType camel_stream_get_type (void);
 
 /* public methods */
-gint       camel_stream_read      (CamelStream *stream, gchar *buffer, gint n);
-gint       camel_stream_write     (CamelStream *stream, const gchar *buffer, gint n);
-void       camel_stream_flush     (CamelStream *stream);
-gboolean   camel_stream_eos       (CamelStream *stream);
-void       camel_stream_reset     (CamelStream *stream);
+int        camel_stream_read       (CamelStream *stream, char *buffer,
+				    unsigned int n, CamelException *ex);
+int        camel_stream_write      (CamelStream *stream, const char *buffer,
+				    unsigned int n, CamelException *ex);
+void       camel_stream_flush      (CamelStream *stream, CamelException *ex);
+gboolean   camel_stream_eos        (CamelStream *stream);
+void       camel_stream_reset      (CamelStream *stream, CamelException *ex);
 
 /* utility macros and funcs */
-#define camel_stream_write_string(stream, string) (camel_stream_write ((stream), (string), strlen (string)))
-int camel_stream_write_strings (CamelStream *stream, ... );
-int camel_stream_printf (CamelStream *stream, const char *fmt, ... ) G_GNUC_PRINTF (2, 3);
-
-/* write a whole stream to another stream, until eof or error on either stream */
-int camel_stream_write_to_stream (CamelStream *stream, CamelStream *output_stream);
+int camel_stream_write_string (CamelStream *stream, const char *string,
+			       CamelException *ex);
+int camel_stream_printf (CamelStream *stream, CamelException *ex,
+			 const char *fmt, ... ) G_GNUC_PRINTF (3, 4);
+int camel_stream_vprintf (CamelStream *stream, CamelException *ex,
+			  const char *fmt, va_list ap);
+
+/* Write a whole stream to another stream, until eof or error on
+ * either stream.
+ */
+int camel_stream_write_to_stream (CamelStream *stream,
+				  CamelStream *output_stream,
+				  CamelException *ex);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
 #endif /* CAMEL_STREAM_H */
-
-
-
-
-
-