1 files changed, 63 insertions, 52 deletions

diff --git a/camel/camel-seekable-stream.c b/camel/camel-seekable-stream.c
index 6d51c6c554..a62ae9544f 100644
--- a/camel/camel-seekable-stream.c
+++ b/camel/camel-seekable-stream.c
@@ -1,14 +1,13 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 
-/* 
- *
- * 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.
  *
@@ -24,31 +23,31 @@
  */
 
 
-
 #include <config.h>
 #include "camel-seekable-stream.h"
 
-static CamelStreamClass *parent_class=NULL;
-
+static CamelStreamClass *parent_class = NULL;
 
 /* Returns the class for a CamelSeekableStream */
 #define CSS_CLASS(so) CAMEL_SEEKABLE_STREAM_CLASS (GTK_OBJECT(so)->klass)
 
-static off_t seek      (CamelSeekableStream *stream, 
-			      off_t offset, 
-			      CamelStreamSeekPolicy policy);
-static	off_t  stream_tell (CamelSeekableStream *stream);
-static void reset     (CamelStream *stream);
-static void set_bounds (CamelSeekableStream *stream, off_t start, off_t end);
+static off_t seek        (CamelSeekableStream *stream, off_t offset,
+			  CamelStreamSeekPolicy policy,
+			  CamelException *ex);
+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 void
 camel_seekable_stream_class_init (CamelSeekableStreamClass *camel_seekable_stream_class)
 {
-	CamelStreamClass *camel_stream_class = CAMEL_STREAM_CLASS (camel_seekable_stream_class);
+	CamelStreamClass *camel_stream_class =
+		CAMEL_STREAM_CLASS (camel_seekable_stream_class);
 
 	parent_class = gtk_type_class (camel_stream_get_type ());
-	
+
 	/* seekable stream methods */
 	camel_seekable_stream_class->seek = seek;
 	camel_seekable_stream_class->tell = stream_tell;
@@ -71,9 +70,9 @@ GtkType
 camel_seekable_stream_get_type (void)
 {
 	static GtkType camel_seekable_stream_type = 0;
-	
-	if (!camel_seekable_stream_type)	{
-		GtkTypeInfo camel_seekable_stream_info =	
+
+	if (!camel_seekable_stream_type) {
+		GtkTypeInfo camel_seekable_stream_info =
 		{
 			"CamelSeekableStream",
 			sizeof (CamelSeekableStream),
@@ -84,19 +83,20 @@ camel_seekable_stream_get_type (void)
 				/* reserved_2 */ NULL,
 			(GtkClassInitFunc) NULL,
 		};
-		
+
 		camel_seekable_stream_type = gtk_type_unique (camel_stream_get_type (), &camel_seekable_stream_info);
 	}
-	
+
 	return camel_seekable_stream_type;
 }
 
+
 static off_t
-seek (CamelSeekableStream *stream, 
-       off_t offset, 
-       CamelStreamSeekPolicy policy)
+seek (CamelSeekableStream *stream, off_t offset,
+      CamelStreamSeekPolicy policy, CamelException *ex)
 {
-	g_warning ("CamelSeekableStream::seek called on default implementation \n");
+	g_warning ("CamelSeekableStream::seek called on default "
+		   "implementation\n");
 	return -1;
 }
 
@@ -105,7 +105,8 @@ seek (CamelSeekableStream *stream,
  * @stream: a CamelStream object.
  * @offset: offset value
  * @policy: what to do with the offset
- * 
+ * @ex: a CamelException
+ *
  * Seek to the specified position in @stream.
  *
  * If @policy is CAMEL_STREAM_SET, seeks to @offset.
@@ -117,78 +118,88 @@ seek (CamelSeekableStream *stream,
  * @offset.
  *
  * Regardless of @policy, the stream's final position will be clamped
- * to the range specified by its lower and upper bounds.
- * 
+ * to the range specified by its lower and upper bounds, and the
+ * stream's eos state will be updated.
+ *
  * Return value: new position, -1 if operation failed.
  **/
 off_t
-camel_seekable_stream_seek (CamelSeekableStream *stream, 
-			    off_t offset, 
-			    CamelStreamSeekPolicy policy)
+camel_seekable_stream_seek (CamelSeekableStream *stream, off_t offset,
+			    CamelStreamSeekPolicy policy,
+			    CamelException *ex)
 {
-	return CSS_CLASS (stream)->seek (stream, offset, policy);
+	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);
+
+	return CSS_CLASS (stream)->seek (stream, offset, policy, ex);
 }
 
+
 static off_t
-stream_tell(CamelSeekableStream *stream)
+stream_tell (CamelSeekableStream *stream)
 {
 	return stream->position;
 }
 
 /**
- * camel_seekable_stream_tell: get the position of a stream
- * @stream: seekable stream object 
- * 
+ * camel_seekable_stream_tell:
+ * @stream: seekable stream object
+ *
  * Get the current position of a seekable stream.
- * 
+ *
  * Return value: the position.
  **/
 off_t
 camel_seekable_stream_tell (CamelSeekableStream *stream)
 {
+	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);
+
 	return CSS_CLASS (stream)->tell (stream);
 }
 
+
 static void
-set_bounds (CamelSeekableStream *stream, off_t start, off_t end)
+set_bounds (CamelSeekableStream *stream, off_t start, off_t end,
+	    CamelException *ex)
 {
 	/* store the bounds */
 	stream->bound_start = start;
 	stream->bound_end = end;
 
-	/* FIXME: this is probably to be reset by seek ... */
-	((CamelStream *)stream)->eos = FALSE;
-
 	if (start > stream->position)
-		camel_seekable_stream_seek(stream, start, CAMEL_STREAM_SET);
+		camel_seekable_stream_seek (stream, start, CAMEL_STREAM_SET, ex);
 }
 
 /**
  * camel_seekable_stream_set_bounds:
- * @stream: 
- * @start: 
- * @end: 
- * 
+ * @stream: a seekable stream
+ * @start: the first valid position
+ * @end: the first invalid position, or CAMEL_STREAM_UNBOUND
+ *
  * 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.
  **/
 void
-camel_seekable_stream_set_bounds(CamelSeekableStream *stream, off_t start, off_t end)
+camel_seekable_stream_set_bounds (CamelSeekableStream *stream,
+				  off_t start, off_t end, CamelException *ex)
 {
-	CSS_CLASS (stream)->set_bounds (stream, start, end);
+	g_return_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream));
+	g_return_if_fail (end == CAMEL_STREAM_UNBOUND || end >= start);
+
+	CSS_CLASS (stream)->set_bounds (stream, start, end, ex);
 }
 
 /* a default implementation of reset for seekable streams */
-static void 
-reset (CamelStream *stream)
+static void
+reset (CamelStream *stream, CamelException *ex)
 {
 	CamelSeekableStream *seekable_stream;
 
-	g_assert (stream);
 	seekable_stream = CAMEL_SEEKABLE_STREAM (stream);
 
-	camel_seekable_stream_seek (seekable_stream, seekable_stream->bound_start, CAMEL_STREAM_SET);
+	camel_seekable_stream_seek (seekable_stream,
+				    seekable_stream->bound_start,
+				    CAMEL_STREAM_SET, ex);
 }