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

core: Drop unused error handling from object stream helper

Browse Source 
I was going to add some new API and I noticed that this function
never returns an error; presumably at one point it did, but
not anymore.  It simplifies the code flow noticeably
to remove that.
This commit is contained in:
Colin Walters 2021-04-07 20:01:07 +00:00
parent b5c21defe9
commit dfaf314c42
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/libostree/ostree-core.c
View File

@ -412,18 +412,12 @@ variant_to_lenprefixed_buffer (GVariant *variant)
* header_and_input_to_stream:
* @file_header: A file header
* @input: File raw content stream
* @out_input: (out): Serialized object stream
* @cancellable: Cancellable
* @error: Error
*
* Combines @file_header and @input into a single stream.
*/
static gboolean
static GInputStream *
header_and_input_to_stream (GBytes *file_header,
GInputStream *input,
GInputStream **out_input,
GCancellable *cancellable,
GError **error)
GInputStream *input)
{
/* Our result stream chain */
g_autoptr(GPtrArray) streams = g_ptr_array_new_with_free_func ((GDestroyNotify)g_object_unref);
@ -438,10 +432,7 @@ header_and_input_to_stream (GBytes *file_header,
g_ptr_array_add (streams, g_object_ref (input));
/* Return the result stream */
g_autoptr(GInputStream) ret_input = (GInputStream*)ostree_chain_input_stream_new (streams);
ot_transfer_out_value (out_input, &ret_input);
return TRUE;
return (GInputStream*)ostree_chain_input_stream_new (streams);
}
/* Convert file metadata + file content into an archive-format stream. */
@ -462,11 +453,8 @@ _ostree_raw_file_to_archive_stream (GInputStream *input,
zlib_input = g_converter_input_stream_new (input, zlib_compressor);
}
g_autoptr(GBytes) file_header = _ostree_zlib_file_header_new (file_info, xattrs);
return header_and_input_to_stream (file_header,
zlib_input,
out_input,
cancellable,
error);
*out_input = header_and_input_to_stream (file_header, zlib_input);
return TRUE;
}
/**
@ -560,12 +548,7 @@ ostree_raw_file_to_content_stream (GInputStream *input,
GError **error)
{
g_autoptr(GBytes) file_header = _ostree_file_header_new (file_info, xattrs);
if (!header_and_input_to_stream (file_header,
input,
out_input,
cancellable,
error))
return FALSE;
*out_input = header_and_input_to_stream (file_header, input);
if (out_length)
*out_length = g_bytes_get_size (file_header) + g_file_info_get_size (file_info);
return TRUE;