aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-seekable-stream.c
diff options
context:
space:
mode:
authorNotZed <NotZed@HelixCode.com>2000-05-20 03:58:41 +0800
committerMichael Zucci <zucchi@src.gnome.org>2000-05-20 03:58:41 +0800
commit2ce4eb74b65f3e9d07a921aad3899a7141b0000f (patch)
tree50439e412a6f12dc0b7db68274de8a8f16b74e08 /camel/camel-seekable-stream.c
parentb5ae6150b2a72683b7311af3252230069300d9e2 (diff)
downloadgsoc2013-evolution-2ce4eb74b65f3e9d07a921aad3899a7141b0000f.tar
gsoc2013-evolution-2ce4eb74b65f3e9d07a921aad3899a7141b0000f.tar.gz
gsoc2013-evolution-2ce4eb74b65f3e9d07a921aad3899a7141b0000f.tar.bz2
gsoc2013-evolution-2ce4eb74b65f3e9d07a921aad3899a7141b0000f.tar.lz
gsoc2013-evolution-2ce4eb74b65f3e9d07a921aad3899a7141b0000f.tar.xz
gsoc2013-evolution-2ce4eb74b65f3e9d07a921aad3899a7141b0000f.tar.zst
gsoc2013-evolution-2ce4eb74b65f3e9d07a921aad3899a7141b0000f.zip
> 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
Diffstat (limited to 'camel/camel-seekable-stream.c')
-rw-r--r--camel/camel-seekable-stream.c49
1 files changed, 23 insertions, 26 deletions
diff --git a/camel/camel-seekable-stream.c b/camel/camel-seekable-stream.c
index a62ae9544f..507c69dd48 100644
--- a/camel/camel-seekable-stream.c
+++ b/camel/camel-seekable-stream.c
@@ -32,13 +32,10 @@ static CamelStreamClass *parent_class = NULL;
#define CSS_CLASS(so) CAMEL_SEEKABLE_STREAM_CLASS (GTK_OBJECT(so)->klass)
static off_t seek (CamelSeekableStream *stream, off_t offset,
- CamelStreamSeekPolicy policy,
- CamelException *ex);
+ CamelStreamSeekPolicy policy);
static off_t stream_tell (CamelSeekableStream *stream);
-static void reset (CamelStream *stream, CamelException *ex);
-static void set_bounds (CamelSeekableStream *stream, off_t start, off_t end,
- CamelException *ex);
-
+static int reset (CamelStream *stream);
+static int set_bounds (CamelSeekableStream *stream, off_t start, off_t end);
static void
camel_seekable_stream_class_init (CamelSeekableStreamClass *camel_seekable_stream_class)
@@ -93,7 +90,7 @@ camel_seekable_stream_get_type (void)
static off_t
seek (CamelSeekableStream *stream, off_t offset,
- CamelStreamSeekPolicy policy, CamelException *ex)
+ CamelStreamSeekPolicy policy)
{
g_warning ("CamelSeekableStream::seek called on default "
"implementation\n");
@@ -105,7 +102,6 @@ seek (CamelSeekableStream *stream, off_t offset,
* @stream: a CamelStream object.
* @offset: offset value
* @policy: what to do with the offset
- * @ex: a CamelException
*
* Seek to the specified position in @stream.
*
@@ -125,12 +121,11 @@ seek (CamelSeekableStream *stream, off_t offset,
**/
off_t
camel_seekable_stream_seek (CamelSeekableStream *stream, off_t offset,
- CamelStreamSeekPolicy policy,
- CamelException *ex)
+ CamelStreamSeekPolicy policy)
{
g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);
- return CSS_CLASS (stream)->seek (stream, offset, policy, ex);
+ return CSS_CLASS (stream)->seek (stream, offset, policy);
}
@@ -156,17 +151,17 @@ camel_seekable_stream_tell (CamelSeekableStream *stream)
return CSS_CLASS (stream)->tell (stream);
}
-
-static void
-set_bounds (CamelSeekableStream *stream, off_t start, off_t end,
- CamelException *ex)
+static int
+set_bounds (CamelSeekableStream *stream, off_t start, off_t end)
{
/* store the bounds */
stream->bound_start = start;
stream->bound_end = end;
if (start > stream->position)
- camel_seekable_stream_seek (stream, start, CAMEL_STREAM_SET, ex);
+ return camel_seekable_stream_seek (stream, start, CAMEL_STREAM_SET);
+
+ return 0;
}
/**
@@ -178,28 +173,30 @@ set_bounds (CamelSeekableStream *stream, off_t start, off_t end,
* Set the range of valid data this stream is allowed to cover. If
* there is to be no @end value, then @end should be set to
* #CAMEL_STREAM_UNBOUND.
+ *
+ * Return value: -1 on error.
**/
-void
+int
camel_seekable_stream_set_bounds (CamelSeekableStream *stream,
- off_t start, off_t end, CamelException *ex)
+ off_t start, off_t end)
{
- g_return_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream));
- g_return_if_fail (end == CAMEL_STREAM_UNBOUND || end >= start);
+ g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);
+ g_return_val_if_fail (end == CAMEL_STREAM_UNBOUND || end >= start, -1);
- CSS_CLASS (stream)->set_bounds (stream, start, end, ex);
+ return CSS_CLASS (stream)->set_bounds (stream, start, end);
}
/* a default implementation of reset for seekable streams */
-static void
-reset (CamelStream *stream, CamelException *ex)
+static int
+reset (CamelStream *stream)
{
CamelSeekableStream *seekable_stream;
seekable_stream = CAMEL_SEEKABLE_STREAM (stream);
- camel_seekable_stream_seek (seekable_stream,
- seekable_stream->bound_start,
- CAMEL_STREAM_SET, ex);
+ return camel_seekable_stream_seek (seekable_stream,
+ seekable_stream->bound_start,
+ CAMEL_STREAM_SET);
}