shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-01-12 13:18:27 +03:00
Code Issues Projects Releases Wiki Activity

g_output_stream_splice: check correctly the error code

Browse Source 
While at it, change the style of other two occurrences.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2015-04-24 12:37:49 +02:00
parent 8ab2e60edc
commit cf30f8717a
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libostree/ostree-repo-static-delta-compilation.c
View File

@ -1344,10 +1344,13 @@ ostree_repo_static_delta_generate (OstreeRepo *self,
part_payload_out = (GMemoryOutputStream*)g_memory_output_stream_new (NULL, 0, g_realloc, g_free); part_payload_out = (GMemoryOutputStream*)g_memory_output_stream_new (NULL, 0, g_realloc, g_free);
part_payload_compressor = (GConverterOutputStream*)g_converter_output_stream_new ((GOutputStream*)part_payload_out, compressor); part_payload_compressor = (GConverterOutputStream*)g_converter_output_stream_new ((GOutputStream*)part_payload_out, compressor);
if (0 > g_output_stream_splice ((GOutputStream*)part_payload_compressor, part_payload_in, {
G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET | G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE, gssize n_bytes_written = g_output_stream_splice ((GOutputStream*)part_payload_compressor, part_payload_in,
cancellable, error)) G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET | G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
goto out; cancellable, error);
if (n_bytes_written < 0)
goto out;
}
/* FIXME - avoid duplicating memory here */ /* FIXME - avoid duplicating memory here */
delta_part = g_variant_new ("(y@ay)", delta_part = g_variant_new ("(y@ay)",

13
src/libostree/ostree-repo-static-delta-processing.c
View File

@ -294,11 +294,14 @@ decompress_all (GConverter *converter,
gs_unref_object GMemoryOutputStream *memout = (GMemoryOutputStream*)g_memory_output_stream_new (NULL, 0, g_realloc, g_free); gs_unref_object GMemoryOutputStream *memout = (GMemoryOutputStream*)g_memory_output_stream_new (NULL, 0, g_realloc, g_free);
gs_unref_object GInputStream *convin = g_converter_input_stream_new ((GInputStream*)memin, converter); gs_unref_object GInputStream *convin = g_converter_input_stream_new ((GInputStream*)memin, converter);
if (0 > g_output_stream_splice ((GOutputStream*)memout, convin, {
G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | gssize n_bytes_written = g_output_stream_splice ((GOutputStream*)memout, convin,
G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE |
cancellable, error)) G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
goto out; cancellable, error);
if (n_bytes_written < 0)
goto out;
}
ret = TRUE; ret = TRUE;
*out_uncompressed = g_memory_output_stream_steal_as_bytes (memout); *out_uncompressed = g_memory_output_stream_steal_as_bytes (memout);

9
src/ostree/ot-builtin-cat.c
View File

@ -46,9 +46,12 @@ cat_one_file (GFile *f,
if (!in) if (!in)
goto out; goto out;
if (!g_output_stream_splice (stdout_stream, in, G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE, {
cancellable, error)) gssize n_bytes_written = g_output_stream_splice (stdout_stream, in, G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
goto out; cancellable, error);
if (n_bytes_written < 0)
goto out;
}
ret = TRUE; ret = TRUE;
out: out: