diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2010-08-10 12:08:18 +0200 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2010-08-10 12:08:18 +0200 |
| commit | 9deca32ad5d45d7c712e737c4d9c74a3391c0be8 (patch) | |
| tree | 3a12ed61b4fe18c815d7f47c59467324c9591762 | |
| parent | 7ae33f004470b32d64143bfa63ea1000e53de81a (diff) | |
Simplify a bit _g_io_stream_splice
| -rw-r--r-- | src/common.c | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/src/common.c b/src/common.c index 401b098..e50ab98 100644 --- a/src/common.c +++ b/src/common.c @@ -25,7 +25,6 @@ typedef struct { guint ref_count; - gboolean closed; GError *error; GIOStream *stream1; @@ -60,20 +59,6 @@ splice_context_unref (SpliceContext *self) } static void -splice_context_close (SpliceContext *self, const GError *error) -{ - if (self->closed) - return; - self->closed = TRUE; - - if (error != NULL) - self->error = g_error_copy (error); - - g_io_stream_close (self->stream1, NULL, NULL); - g_io_stream_close (self->stream2, NULL, NULL); -} - -static void splice_cb (GObject *ostream, GAsyncResult *res, gpointer user_data) @@ -83,10 +68,15 @@ splice_cb (GObject *ostream, g_output_stream_splice_finish (G_OUTPUT_STREAM (ostream), res, &error); - splice_context_close (ctx, error); - splice_context_unref (ctx); + if (ctx->error == NULL && error != NULL) + ctx->error = error; + else + g_clear_error (&error); - g_clear_error (&error); + g_io_stream_close (ctx->stream1, NULL, NULL); + g_io_stream_close (ctx->stream2, NULL, NULL); + + splice_context_unref (ctx); } void |