diff options
| author | Christian Persch <chpe@gnome.org> | 2010-09-23 13:02:50 +0200 |
|---|---|---|
| committer | Christian Persch <chpe@gnome.org> | 2010-11-03 14:25:35 +0100 |
| commit | 9e0c07870af1dac84c033031cf301671779c8328 (patch) | |
| tree | 70354004512aad7d289ea30a031afdede65f694c /gio/gbufferedinputstream.c | |
| parent | 63b87b2c26bf983823f83943b8d752bd053ce539 (diff) | |
Use g_simple_async_result_{new_,}take_error
Bug #633685.
Diffstat (limited to 'gio/gbufferedinputstream.c')
| -rw-r--r-- | gio/gbufferedinputstream.c | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/gio/gbufferedinputstream.c b/gio/gbufferedinputstream.c index f0f912494..78e61cbf4 100644 --- a/gio/gbufferedinputstream.c +++ b/gio/gbufferedinputstream.c @@ -937,8 +937,7 @@ fill_async_callback (GObject *source_object, g_simple_async_result_set_op_res_gssize (simple, res); if (res == -1) { - g_simple_async_result_set_from_error (simple, error); - g_error_free (error); + g_simple_async_result_take_error (simple, error); } else { @@ -1049,14 +1048,13 @@ large_read_callback (GObject *source_object, /* Only report the error if we've not already read some data */ if (nread < 0 && data->bytes_read == 0) - g_simple_async_result_set_from_error (simple, error); + g_simple_async_result_take_error (simple, error); + else if (error) + g_error_free (error); if (nread > 0) data->bytes_read += nread; - if (error) - g_error_free (error); - /* Complete immediately, not in idle, since we're already * in a mainloop callout */ @@ -1087,8 +1085,9 @@ read_fill_buffer_callback (GObject *source_object, result, &error); if (nread < 0 && data->bytes_read == 0) - g_simple_async_result_set_from_error (simple, error); - + g_simple_async_result_take_error (simple, error); + else if (error) + g_error_free (error); if (nread > 0) { @@ -1100,9 +1099,6 @@ read_fill_buffer_callback (GObject *source_object, priv->pos += data->count; } - if (error) - g_error_free (error); - /* Complete immediately, not in idle, since we're already * in a mainloop callout */ @@ -1234,14 +1230,13 @@ large_skip_callback (GObject *source_object, /* Only report the error if we've not already read some data */ if (nread < 0 && data->bytes_skipped == 0) - g_simple_async_result_set_from_error (simple, error); + g_simple_async_result_take_error (simple, error); + else if (error) + g_error_free (error); if (nread > 0) data->bytes_skipped += nread; - if (error) - g_error_free (error); - /* Complete immediately, not in idle, since we're already * in a mainloop callout */ @@ -1272,7 +1267,9 @@ skip_fill_buffer_callback (GObject *source_object, result, &error); if (nread < 0 && data->bytes_skipped == 0) - g_simple_async_result_set_from_error (simple, error); + g_simple_async_result_take_error (simple, error); + else if (error) + g_error_free (error); if (nread > 0) { @@ -1283,9 +1280,6 @@ skip_fill_buffer_callback (GObject *source_object, priv->pos += data->count; } - if (error) - g_error_free (error); - /* Complete immediately, not in idle, since we're already * in a mainloop callout */ |