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

Handle partial writes.

Browse Source 
2008-01-15  Matthias Clasen  <mclasne@redhat.com>

        * gdk-pixbuf-io.c (save_to_stream): Handle partial writes.



svn path=/trunk/; revision=19380
This commit is contained in:
Matthias Clasen 2008-01-16 17:38:13 +00:00 committed by Matthias Clasen
parent 37fcd9e6f9
commit 00a56fc2ab
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,7 @@
2008-01-15 Matthias Clasen <mclasne@redhat.com>
* gdk-pixbuf-io.c (save_to_stream): Handle partial writes.
2008-01-16 Michael Natterer <mitch@imendio.com>
* gdk-pixbuf-io.c (save_to_stream): fix signature of this function

38
gdk-pixbuf/gdk-pixbuf-io.c
View File

@ -2218,24 +2218,32 @@ save_to_stream (const gchar *buffer,
gpointer data)
{
SaveToStreamData *sdata = (SaveToStreamData *)data;
gsize remaining;
gssize written;
GError *my_error = NULL;
gsize n;
n = g_output_stream_write (sdata->stream,
buffer, count,
sdata->cancellable,
&my_error);
if (n != count) {
if (!my_error) {
g_set_error (error,
G_IO_ERROR, 0,
_("Error writing to image stream"));
}
else {
g_propagate_error (error, my_error);
}
return FALSE;
remaining = count;
written = 0;
while (remaining > 0) {
buffer += written;
remaining -= written;
written = g_output_stream_write (sdata->stream,
buffer, remaining,
sdata->cancellable,
&my_error);
if (written < 0) {
if (!my_error) {
g_set_error (error,
G_IO_ERROR, 0,
_("Error writing to image stream"));
}
else {
g_propagate_error (error, my_error);
}
return FALSE;
}
}
return TRUE;
}