callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Increment the copy source address to match the data read offset. (seek):

Browse Source 
2000-02-09  NotZed  <notzed@zedzone.helixcode.com>

	* camel/camel-simple-data-wrapper-stream.c (read): Increment the
	copy source address to match the data read offset.
	(seek): Actually implement the seek.

svn path=/trunk/; revision=1722
This commit is contained in:
NotZed
2000-02-10 03:54:22 +00:00
committed by Michael Zucci
parent 8c9cb1454e
commit 3ef8dbd93a
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2000-02-09 NotZed <notzed@zedzone.helixcode.com> 2000-02-09 NotZed <notzed@zedzone.helixcode.com>
* camel/camel-simple-data-wrapper-stream.c (read): Increment the
copy source address to match the data read offset.
(seek): Actually implement the seek.
* camel/camel-mime-part-utils.c * camel/camel-mime-part-utils.c
(camel_mime_part_store_stream_in_buffer): If we get a -1 read, (camel_mime_part_store_stream_in_buffer): If we get a -1 read,
DONT update the total bytes, and try and truncate the array in DONT update the total bytes, and try and truncate the array in

9
camel/camel-simple-data-wrapper-stream.c
View File

@ -50,7 +50,7 @@ read (CamelStream *stream,
len = MIN (n, array->len - wrapper_stream->current_position); len = MIN (n, array->len - wrapper_stream->current_position);
if (len > 0) { if (len > 0) {
memcpy (buffer, array->data, len); memcpy (buffer, wrapper_stream->current_position + array->data, len);
wrapper_stream->current_position += len; wrapper_stream->current_position += len;
return len; return len;
} else { } else {
@ -161,13 +161,18 @@ seek (CamelSeekableStream *stream,
new_position = wrapper_stream->current_position + offset; new_position = wrapper_stream->current_position + offset;
break; break;
case CAMEL_STREAM_END: case CAMEL_STREAM_END:
new_position = wrapper_stream->wrapper->byte_array->len; new_position = wrapper_stream->wrapper->byte_array->len - offset;
break; break;
default: default:
g_warning ("Unknown CamelStreamSeekPolicy %d.", policy); g_warning ("Unknown CamelStreamSeekPolicy %d.", policy);
return -1; return -1;
} }
if (new_position<0)
new_position = 0;
else if (new_position>=wrapper_stream->wrapper->byte_array->len)
new_position = wrapper_stream->wrapper->byte_array->len-1;
wrapper_stream->current_position = new_position; wrapper_stream->current_position = new_position;
return new_position; return new_position;
} }