packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Make ostree_write_variant_with_size() private 

More work making the file formats and utilities private.
This commit is contained in:
Colin Walters 2013-09-04 07:49:41 -04:00
parent 0d72168961
commit 2534714501
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/ostree-sections.txt
View File

@ -32,7 +32,6 @@ ostree_get_relative_object_path
ostree_get_xattrs_for_file ostree_get_xattrs_for_file
ostree_set_xattrs ostree_set_xattrs
ostree_map_metadata_file ostree_map_metadata_file
ostree_write_variant_with_size
ostree_content_stream_parse ostree_content_stream_parse
ostree_content_file_parse ostree_content_file_parse
ostree_write_file_header_update_checksum ostree_write_file_header_update_checksum

9
src/libostree/ostree-core-private.h
View File

@ -66,5 +66,14 @@ G_BEGIN_DECLS
GVariant *_ostree_zlib_file_header_new (GFileInfo *file_info, GVariant *_ostree_zlib_file_header_new (GFileInfo *file_info,
GVariant *xattrs); 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 G_END_DECLS

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

@ -453,8 +453,8 @@ write_padding (GOutputStream *output,
return ret; return ret;
} }
/** /*
* ostree_write_variant_with_size: * _ostree_write_variant_with_size:
* @output: Stream * @output: Stream
* @variant: A variant * @variant: A variant
* @alignment_offset: Used to determine whether or not we should write padding bytes * @alignment_offset: Used to determine whether or not we should write padding bytes
@ -469,13 +469,13 @@ write_padding (GOutputStream *output,
* accessed. * accessed.
*/ */
gboolean gboolean
ostree_write_variant_with_size (GOutputStream *output, _ostree_write_variant_with_size (GOutputStream *output,
GVariant *variant, GVariant *variant,
guint64 alignment_offset, guint64 alignment_offset,
gsize *out_bytes_written, gsize *out_bytes_written,
GChecksum *checksum, GChecksum *checksum,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
guint64 variant_size; guint64 variant_size;
@ -538,8 +538,8 @@ ostree_write_file_header_update_checksum (GOutputStream *out,
gboolean ret = FALSE; gboolean ret = FALSE;
gsize bytes_written; 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)) cancellable, error))
goto out; goto out;
ret = TRUE; ret = TRUE;
@ -583,8 +583,8 @@ ostree_raw_file_to_content_stream (GInputStream *input,
header_out_stream = g_memory_output_stream_new (NULL, 0, g_realloc, g_free); 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)) cancellable, error))
goto out; goto out;
if (!g_output_stream_close (header_out_stream, cancellable, error)) if (!g_output_stream_close (header_out_stream, cancellable, error))

8
src/libostree/ostree-core.h
View File

@ -171,14 +171,6 @@ gboolean ostree_map_metadata_file (GFile *file,
GVariant **out_variant, GVariant **out_variant,
GError **error); 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 *ostree_file_header_new (GFileInfo *file_info,
GVariant *xattrs); GVariant *xattrs);

4
src/libostree/ostree-repo.c
View File

@ -710,8 +710,8 @@ stage_object (OstreeRepo *self,
file_meta = _ostree_zlib_file_header_new (file_info, xattrs); 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)) cancellable, error))
goto out; goto out;
if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_REGULAR) if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_REGULAR)