From 11b8f83aadaf2c49a7a29721fde80ac2015b2484 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@ximian.com>
Date: Tue, 8 Jul 2003 18:36:40 +0000
Subject: Updated (new copy/paste from e-iconv).

2003-07-08  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-iconv.c: Updated (new copy/paste from e-iconv).

	* camel-block-file.c (camel_block_file_get_block): Use
	camel_read() rather than libc read.

	* camel-tcp-stream-raw.c (stream_read): Use camel_read().
	(stream_write): Use camel_write().

	* camel-stream-fs.c (stream_read): Use camel_read().
	(stream_write): Use camel_write().

svn path=/trunk/; revision=21759
---
 camel/camel-block-file.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'camel/camel-block-file.c')

diff --git a/camel/camel-block-file.c b/camel/camel-block-file.c
index 885ebc34f5..de7d757367 100644
--- a/camel/camel-block-file.c
+++ b/camel/camel-block-file.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001 Ximian Inc.
+ * Copyright (C) 2001-2003 Ximian Inc.
  *
  * Authors: Michael Zucchi <notzed@ximian.com>
  *
@@ -573,8 +573,8 @@ CamelBlock *camel_block_file_get_block(CamelBlockFile *bs, camel_block_t id)
 
 		bl = g_malloc0(sizeof(*bl));
 		bl->id = id;
-		if (lseek(bs->fd, id, SEEK_SET) == -1
-		    || read(bs->fd, bl->data, CAMEL_BLOCK_SIZE) == -1) {
+		if (lseek(bs->fd, id, SEEK_SET) == -1 ||
+		    camel_read (bs->fd, bl->data, CAMEL_BLOCK_SIZE) == -1) {
 			block_file_unuse(bs);
 			CAMEL_BLOCK_FILE_UNLOCK(bs, cache_lock);
 			g_free(bl);
-- 
cgit v1.2.3