core: Make ostree_write_variant_with_size() private
More work making the file formats and utilities private.
This commit is contained in:
parent
0d72168961
commit
2534714501
|
|
@ -32,7 +32,6 @@ ostree_get_relative_object_path
|
|||
ostree_get_xattrs_for_file
|
||||
ostree_set_xattrs
|
||||
ostree_map_metadata_file
|
||||
ostree_write_variant_with_size
|
||||
ostree_content_stream_parse
|
||||
ostree_content_file_parse
|
||||
ostree_write_file_header_update_checksum
|
||||
|
|
|
|||
|
|
@ -66,5 +66,14 @@ G_BEGIN_DECLS
|
|||
GVariant *_ostree_zlib_file_header_new (GFileInfo *file_info,
|
||||
GVariant *xattrs);
|
||||
|
||||
gboolean _ostree_write_variant_with_size (GOutputStream *output,
|
||||
GVariant *variant,
|
||||
guint64 alignment_offset,
|
||||
gsize *out_bytes_written,
|
||||
GChecksum *checksum,
|
||||
GCancellable *cancellable,
|
||||
GError **error);
|
||||
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
|
|
|
|||
|
|
@ -453,8 +453,8 @@ write_padding (GOutputStream *output,
|
|||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* ostree_write_variant_with_size:
|
||||
/*
|
||||
* _ostree_write_variant_with_size:
|
||||
* @output: Stream
|
||||
* @variant: A variant
|
||||
* @alignment_offset: Used to determine whether or not we should write padding bytes
|
||||
|
|
@ -469,7 +469,7 @@ write_padding (GOutputStream *output,
|
|||
* accessed.
|
||||
*/
|
||||
gboolean
|
||||
ostree_write_variant_with_size (GOutputStream *output,
|
||||
_ostree_write_variant_with_size (GOutputStream *output,
|
||||
GVariant *variant,
|
||||
guint64 alignment_offset,
|
||||
gsize *out_bytes_written,
|
||||
|
|
@ -538,7 +538,7 @@ ostree_write_file_header_update_checksum (GOutputStream *out,
|
|||
gboolean ret = FALSE;
|
||||
gsize bytes_written;
|
||||
|
||||
if (!ostree_write_variant_with_size (out, header, 0, &bytes_written, checksum,
|
||||
if (!_ostree_write_variant_with_size (out, header, 0, &bytes_written, checksum,
|
||||
cancellable, error))
|
||||
goto out;
|
||||
|
||||
|
|
@ -583,7 +583,7 @@ ostree_raw_file_to_content_stream (GInputStream *input,
|
|||
|
||||
header_out_stream = g_memory_output_stream_new (NULL, 0, g_realloc, g_free);
|
||||
|
||||
if (!ostree_write_variant_with_size (header_out_stream, file_header, 0, NULL, NULL,
|
||||
if (!_ostree_write_variant_with_size (header_out_stream, file_header, 0, NULL, NULL,
|
||||
cancellable, error))
|
||||
goto out;
|
||||
|
||||
|
|
|
|||
|
|
@ -171,14 +171,6 @@ gboolean ostree_map_metadata_file (GFile *file,
|
|||
GVariant **out_variant,
|
||||
GError **error);
|
||||
|
||||
gboolean ostree_write_variant_with_size (GOutputStream *output,
|
||||
GVariant *variant,
|
||||
guint64 alignment_offset,
|
||||
gsize *out_bytes_written,
|
||||
GChecksum *checksum,
|
||||
GCancellable *cancellable,
|
||||
GError **error);
|
||||
|
||||
GVariant *ostree_file_header_new (GFileInfo *file_info,
|
||||
GVariant *xattrs);
|
||||
|
||||
|
|
|
|||
|
|
@ -710,7 +710,7 @@ stage_object (OstreeRepo *self,
|
|||
|
||||
file_meta = _ostree_zlib_file_header_new (file_info, xattrs);
|
||||
|
||||
if (!ostree_write_variant_with_size (temp_out, file_meta, 0, NULL, NULL,
|
||||
if (!_ostree_write_variant_with_size (temp_out, file_meta, 0, NULL, NULL,
|
||||
cancellable, error))
|
||||
goto out;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue