diff options
author | Not Zed <NotZed@HelixCode.com> | 2000-12-05 19:50:32 +0800 |
---|---|---|
committer | Michael Zucci <zucchi@src.gnome.org> | 2000-12-05 19:50:32 +0800 |
commit | a8d65409decc86cf8d9f9ebadea28be551b3a4d2 (patch) | |
tree | 757a46fc3ee25686150e2bcdeb2a6954574d0ba3 /camel/camel-stream-mem.c | |
parent | 90feaa4ad02462c8e91d27070e7d8ae178771a06 (diff) | |
download | gsoc2013-evolution-a8d65409decc86cf8d9f9ebadea28be551b3a4d2.tar gsoc2013-evolution-a8d65409decc86cf8d9f9ebadea28be551b3a4d2.tar.gz gsoc2013-evolution-a8d65409decc86cf8d9f9ebadea28be551b3a4d2.tar.bz2 gsoc2013-evolution-a8d65409decc86cf8d9f9ebadea28be551b3a4d2.tar.lz gsoc2013-evolution-a8d65409decc86cf8d9f9ebadea28be551b3a4d2.tar.xz gsoc2013-evolution-a8d65409decc86cf8d9f9ebadea28be551b3a4d2.tar.zst gsoc2013-evolution-a8d65409decc86cf8d9f9ebadea28be551b3a4d2.zip |
stream_flush does make sense for a substream afterall (if you have a
2000-12-05 Not Zed <NotZed@HelixCode.com>
* camel-seekable-substream.c (stream_flush): stream_flush does
make sense for a substream afterall (if you have a stream_write).
(stream_write): Implement this.
(stream_seek): Change the STREAM_END behaviour to be more sane.
if bounded go from the end of the bound, if unbounded, go from the
end of the parent stream.
* camel-stream-mem.c (stream_read): Dont return error if reading
past the end of data, just return 0.
* camel-stream-fs.c (camel_stream_fs_init): Initialise the stream
to be unbound.
(stream_seek): Fix the logic when seeking from the end of an
unbounded stream.
(camel_stream_fs_new_with_fd): If the fd is invalid (-1), then
return NULL immediately.
(stream_seek): Range check a SEEK_END so it fits within
bound_start.
2000-12-01 Not Zed <NotZed@HelixCode.com>
* tests/lib/folders.c (test_folder_basic): New test to perform
basic store operations on folders (taken from folders/test1).
(test_folder_message_ops): Tkane the guts out of folders/test2.
svn path=/trunk/; revision=6790
Diffstat (limited to 'camel/camel-stream-mem.c')
-rw-r--r-- | camel/camel-stream-mem.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/camel/camel-stream-mem.c b/camel/camel-stream-mem.c index 0c07a2759f..b9012bcccb 100644 --- a/camel/camel-stream-mem.c +++ b/camel/camel-stream-mem.c @@ -163,11 +163,10 @@ stream_read (CamelStream *stream, char *buffer, size_t n) nread = MIN (n, camel_stream_mem->buffer->len - seekable->position); if (nread > 0) { - memcpy (buffer, camel_stream_mem->buffer->data + - seekable->position, nread); + memcpy (buffer, camel_stream_mem->buffer->data + seekable->position, nread); seekable->position += nread; } else - nread = -1; + nread = 0; return nread; } @@ -186,12 +185,10 @@ stream_write (CamelStream *stream, const char *buffer, size_t n) #warning "g_byte_arrays use g_malloc and so are totally unsuitable for this object" #endif if (seekable->position == stream_mem->buffer->len) { - stream_mem->buffer = - g_byte_array_append (stream_mem->buffer, (const guint8 *)buffer, nwrite); + g_byte_array_append(stream_mem->buffer, (const guint8 *)buffer, nwrite); } else { - g_byte_array_set_size (stream_mem->buffer, - nwrite + stream_mem->buffer->len); - memcpy (stream_mem->buffer->data + seekable->position, buffer, nwrite); + g_byte_array_set_size(stream_mem->buffer, nwrite + stream_mem->buffer->len); + memcpy(stream_mem->buffer->data + seekable->position, buffer, nwrite); } seekable->position += nwrite; |