> searchpart = strchr(namepart, '?');

2000-05-19  NotZed  <NotZed@HelixCode.com>

        * camel-simple-data-wrapper.c (construct_from_stream): If we
        already have been constructed, unref our content.
        (write_to_stream): Check we've been constructued, and change for
        stream api changes.

        * camel-mime-parser.c: Removed exception stuff.

        * md5-utils.c (md5_get_digest_from_stream): repaired.

        * camel-mime-message.c: Remove exception from write_to_stream, and
        fix, and fix formatting.

        * providers/sendmail/camel-sendmail-transport.c (_send_internal):
        Fix for stream changes.

        * providers/pop3/camel-pop3-store.c (camel_pop3_command): Fixes
        for stream changes.

        * providers/mbox/camel-mbox-folder.c, and elsewhere, fix all
        stream api changes.
        (mbox_append_message): Use stream_close() now its back.
        (mbox_append_message): unref the from filter.

        * camel-stream-mem.c: And here.

        * camel-stream-fs.[ch]: Here too.

        * camel-stream-filter.c: Likewise.  This is getting tedious.

        * camel-stream-buffer.c (stream_write): Fix a few little problems.
        (stream_close): Reimplmeent.
        (camel_stream_buffer_read_line): Slightly more efficient version,
        that also only allocates the right amount of memory for strings.

        * camel-seekable-substream.c: Likewise.

        * camel-seekable-stream.[ch]: Remove exceptions, fix formatting,
        changes for stream (re)fixes.  set_bounds returns an error.

        * camel-stream.[ch]: Remove exceptions.  Make flush and reset return
        an error code, repair all the screwed up formatting, and put back
        close.

        * camel-mime-part-utils.c
        (camel_mime_part_construct_content_from_parser): And here.

        * camel-mime-part.c (camel_mime_part_set_content): And this too.
        (write_to_stream): Fixed for stream changes.

        * camel.h: Fixed.

        * providers/vee/camel-vee-folder.c (vee_search_by_expression):
        Implement.  Performs an intersection of the two searches.
        (camel_vee_folder_finalise): Unref search folders.
        (vee_append_message): Implement append.

svn path=/trunk/; revision=3142

1 files changed, 15 insertions, 22 deletions

diff --git a/camel/camel-stream.h b/camel/camel-stream.h
index c1a044e68f..44562b3321 100644
--- a/camel/camel-stream.h
+++ b/camel/camel-stream.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
 /* camel-stream.h : class for an abstract stream */
 
 /*
@@ -53,13 +53,12 @@ typedef struct {
 
 	/* 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);
+	int       (*read)       (CamelStream *stream, char *buffer, unsigned int n);
+	int       (*write)      (CamelStream *stream, const char *buffer, unsigned int n);
+	int       (*close)      (CamelStream *stream);
+	int       (*flush)      (CamelStream *stream);
 	gboolean  (*eos)        (CamelStream *stream);
-	void      (*reset)      (CamelStream *stream, CamelException *ex);
+	int       (*reset)      (CamelStream *stream);
 
 } CamelStreamClass;
 
@@ -67,28 +66,22 @@ typedef struct {
 GtkType camel_stream_get_type (void);
 
 /* public methods */
-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);
+int        camel_stream_read       (CamelStream *stream, char *buffer, unsigned int n);
+int        camel_stream_write      (CamelStream *stream, const char *buffer, unsigned int n);
+int        camel_stream_flush      (CamelStream *stream);
+int        camel_stream_close      (CamelStream *stream);
 gboolean   camel_stream_eos        (CamelStream *stream);
-void       camel_stream_reset      (CamelStream *stream, CamelException *ex);
+int        camel_stream_reset      (CamelStream *stream);
 
 /* utility macros and funcs */
-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);
+int camel_stream_write_string (CamelStream *stream, const char *string);
+int camel_stream_printf (CamelStream *stream, const char *fmt, ... ) G_GNUC_PRINTF (2, 3);
+int camel_stream_vprintf (CamelStream *stream, 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);
+int camel_stream_write_to_stream (CamelStream *stream, CamelStream *output_stream);
 
 #ifdef __cplusplus
 }