[dovecot-cvs] dovecot/src/lib-storage/index index-fetch-section.c,1.18,1.19 index-msgcache.c,1.11,1.12 index-search.c,1.35,1.36

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-storage/index
In directory danu:/tmp/cvs-serv7993/lib-storage/index

Modified Files:
	index-fetch-section.c index-msgcache.c index-search.c 
Log Message:
keep i_buffer_seek() void and make it close the buffer if any errors happen.
next read will then notice the error. easier to handle it that way.



Index: index-fetch-section.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-fetch-section.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- index-fetch-section.c	15 Oct 2002 23:46:42 -0000	1.18
+++ index-fetch-section.c	28 Oct 2002 04:33:00 -0000	1.19
@@ -307,8 +307,7 @@
 			uoff_t first_size = ctx.dest_size;
 
 			ctx.outbuf = outbuf;
-			if (!i_buffer_seek(inbuf, start_offset))
-				failed = TRUE;
+			i_buffer_seek(inbuf, start_offset);
 
 			if (!failed &&
 			    !fetch_header_fields(inbuf, section, &ctx))

Index: index-msgcache.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-msgcache.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- index-msgcache.c	27 Oct 2002 06:37:18 -0000	1.11
+++ index-msgcache.c	28 Oct 2002 04:33:00 -0000	1.12
@@ -83,13 +83,7 @@
 static IBuffer *index_msgcache_inbuf_rewind(IBuffer *inbuf,
 					    void *context __attr_unused__)
 {
-	if (!i_buffer_seek(inbuf, 0)) {
-		i_error("index_msgcache_inbuf_rewind: lseek() failed: %m");
-
-		i_buffer_unref(inbuf);
-		return NULL;
-	}
-
+	i_buffer_seek(inbuf, 0);
 	return inbuf;
 }
 

Index: index-search.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/index-search.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- index-search.c	27 Oct 2002 06:37:18 -0000	1.35
+++ index-search.c	28 Oct 2002 04:33:00 -0000	1.36
@@ -637,11 +637,7 @@
 	if (have_text) {
 		if (inbuf->v_offset != 0) {
 			/* need to rewind back to beginning of headers */
-			if (!i_buffer_seek(inbuf, 0)) {
-				errno = inbuf->buf_errno;
-				i_error("i_buffer_seek() failed: %m");
-				return FALSE;
-			}
+			i_buffer_seek(inbuf, 0);
 		}
 
 		old_limit = inbuf->v_limit;