> 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, 5 insertions, 18 deletions

diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
index 3db6adfe83..74c7653df3 100644
--- a/camel/camel-mime-parser.c
+++ b/camel/camel-mime-parser.c
@@ -41,7 +41,6 @@
 #include "camel-mime-filter.h"
 #include "camel-stream.h"
 #include "camel-seekable-stream.h"
-#include "camel-exception.h"
 
 #define r(x)
 #define h(x)
@@ -209,7 +208,6 @@ struct _header_scan_state {
 
 	int fd;			/* input for a fd input */
 	CamelStream *stream;	/* or for a stream */
-	CamelException *ex;	/* exception for the stream */
 
 	/* for scanning input buffers */
 	char *realbuf;		/* the real buffer, SCAN_HEAD*2 + SCAN_BUF bytes */
@@ -826,8 +824,7 @@ folder_read(struct _header_scan_state *s)
 		memcpy(s->inbuf, s->inptr, inoffset);
 	}
 	if (s->stream) {
-		len = camel_stream_read(s->stream, s->inbuf+inoffset,
-					SCAN_BUF-inoffset, s->ex);
+		len = camel_stream_read(s->stream, s->inbuf+inoffset, SCAN_BUF-inoffset);
 	} else {
 		len = read(s->fd, s->inbuf+inoffset, SCAN_BUF-inoffset);
 	}
@@ -872,7 +869,7 @@ folder_seek(struct _header_scan_state *s, off_t offset, int whence)
 		if (CAMEL_IS_SEEKABLE_STREAM(s->stream)) {
 			/* NOTE: assumes whence seekable stream == whence libc, which is probably
 			   the case (or bloody well should've been) */
-			newoffset = camel_seekable_stream_seek((CamelSeekableStream *)s->stream, offset, whence, s->ex);
+			newoffset = camel_seekable_stream_seek((CamelSeekableStream *)s->stream, offset, whence);
 		} else {
 			newoffset = -1;
 			errno = EINVAL;
@@ -889,7 +886,7 @@ folder_seek(struct _header_scan_state *s, off_t offset, int whence)
 		s->inptr = s->inbuf;
 		s->inend = s->inbuf;
 		if (s->stream)
-			len = camel_stream_read(s->stream, s->inbuf, SCAN_BUF, s->ex);
+			len = camel_stream_read(s->stream, s->inbuf, SCAN_BUF);
 		else
 			len = read(s->fd, s->inbuf, SCAN_BUF);
 		if (len>=0) {
@@ -1358,7 +1355,6 @@ folder_scan_close(struct _header_scan_state *s)
 		close(s->fd);
 	if (s->stream) {
 		gtk_object_unref((GtkObject *)s->stream);
-		camel_exception_free(s->ex);
 	}
 	g_free(s);
 }
@@ -1373,7 +1369,6 @@ folder_scan_init(void)
 
 	s->fd = -1;
 	s->stream = NULL;
-	s->ex = NULL;
 
 	s->outbuf = g_malloc(1024);
 	s->outptr = s->outbuf;
@@ -1421,8 +1416,6 @@ folder_scan_init_with_fd(struct _header_scan_state *s, int fd)
 		if (s->stream) {
 			gtk_object_unref((GtkObject *)s->stream);
 			s->stream = NULL;
-			camel_exception_free(s->ex);
-			s->ex = NULL;
 		}
 		return 0;
 	} else {
@@ -1434,11 +1427,9 @@ static int
 folder_scan_init_with_stream(struct _header_scan_state *s, CamelStream *stream)
 {
 	int len;
-	CamelException *ex;
 
-	ex = camel_exception_new();
-	len = camel_stream_read(stream, s->inbuf, SCAN_BUF, ex);
-	if (!camel_exception_is_set (ex)) {
+	len = camel_stream_read(stream, s->inbuf, SCAN_BUF);
+	if (len >= 0) {
 		s->inend = s->inbuf+len;
 		s->inptr = s->inbuf;
 		s->inend[0] = '\n';
@@ -1446,16 +1437,12 @@ folder_scan_init_with_stream(struct _header_scan_state *s, CamelStream *stream)
 			gtk_object_unref((GtkObject *)s->stream);
 		s->stream = stream;
 		gtk_object_ref((GtkObject *)stream);
-		if (s->ex)
-			camel_exception_free(s->ex);
-		s->ex = ex;
 		if (s->fd != -1) {
 			close(s->fd);
 			s->fd = -1;
 		}
 		return 0;
 	} else {
-		camel_exception_free (ex);
 		return -1;
 	}
 }