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

lib/commit: Refactor non-failable size indexing function 

It can't throw, so remove the `GError` machinery.

Closes: #973
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-06-28 13:54:00 -04:00 committed by Atomic Bot
parent 6f2ea23e8a
commit ab9fef5279
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libostree/ostree-repo-commit.c
View File

@ -353,14 +353,10 @@ compare_ascii_checksums_for_sorting (gconstpointer a_pp,
/* /*
* Create sizes metadata GVariant and add it to the metadata variant given. * Create sizes metadata GVariant and add it to the metadata variant given.
*/ */
static gboolean static GVariant *
add_size_index_to_metadata (OstreeRepo *self, add_size_index_to_metadata (OstreeRepo *self,
GVariant *original_metadata, GVariant *original_metadata)
GVariant **out_metadata,
GCancellable *cancellable,
GError **error)
{ {
gboolean ret = FALSE;
g_autoptr(GVariantBuilder) builder = NULL; g_autoptr(GVariantBuilder) builder = NULL;
/* original_metadata may be NULL */ /* original_metadata may be NULL */
@ -401,11 +397,7 @@ add_size_index_to_metadata (OstreeRepo *self,
g_variant_builder_end (&index_builder)); g_variant_builder_end (&index_builder));
} }
ret = TRUE; return g_variant_ref_sink (g_variant_builder_end (builder));
*out_metadata = g_variant_builder_end (builder);
g_variant_ref_sink (*out_metadata);
return ret;
} }
/* Combines a check for whether or not we already have the object with /* Combines a check for whether or not we already have the object with
@ -2093,10 +2085,7 @@ ostree_repo_write_commit_with_time (OstreeRepo *self,
OstreeRepoFile *repo_root = OSTREE_REPO_FILE (root); OstreeRepoFile *repo_root = OSTREE_REPO_FILE (root);
/* Add sizes information to our metadata object */ /* Add sizes information to our metadata object */
g_autoptr(GVariant) new_metadata = NULL; g_autoptr(GVariant) new_metadata = add_size_index_to_metadata (self, metadata);
if (!add_size_index_to_metadata (self, metadata, &new_metadata,
cancellable, error))
return FALSE;
g_autoptr(GVariant) commit = g_autoptr(GVariant) commit =
g_variant_new ("(@a{sv}@ay@a(say)sst@ay@ay)", g_variant_new ("(@a{sv}@ay@a(say)sst@ay@ay)",