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

Use g_autoptr(GVariantBuilder) instead of gs_unref_variant_builder

This commit is contained in:
Matthew Barnes 2015-05-05 11:48:15 -04:00
parent c69347b622
commit cca69b3f55
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1930,7 +1930,7 @@ _ostree_detached_metadata_append_gpg_sig (GVariant *existing_metadata,
{
GVariantDict metadata_dict;
g_autoptr(GVariant) signature_data = NULL;
gs_unref_variant_builder GVariantBuilder *signature_builder = NULL;
g_autoptr(GVariantBuilder) signature_builder = NULL;
g_variant_dict_init (&metadata_dict, existing_metadata);

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

@ -367,7 +367,7 @@ add_size_index_to_metadata (OstreeRepo *self,
GError **error)
{
gboolean ret = FALSE;
gs_unref_variant_builder GVariantBuilder *builder = NULL;
g_autoptr(GVariantBuilder) builder = NULL;
/* original_metadata may be NULL */
builder = ot_util_variant_builder_from_variant (original_metadata, G_VARIANT_TYPE ("a{sv}"));

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

@ -1150,7 +1150,7 @@ get_fallback_headers (OstreeRepo *self,
gboolean ret = FALSE;
guint i;
g_autoptr(GVariant) ret_headers = NULL;
gs_unref_variant_builder GVariantBuilder *fallback_builder = NULL;
g_autoptr(GVariantBuilder) fallback_builder = NULL;
fallback_builder = g_variant_builder_new (G_VARIANT_TYPE ("a" OSTREE_STATIC_DELTA_FALLBACK_FORMAT));
@ -1248,7 +1248,7 @@ ostree_repo_static_delta_generate (OstreeRepo *self,
DeltaOpts delta_opts = DELTAOPT_FLAG_NONE;
guint64 total_compressed_size = 0;
guint64 total_uncompressed_size = 0;
gs_unref_variant_builder GVariantBuilder *part_headers = NULL;
g_autoptr(GVariantBuilder) part_headers = NULL;
g_autoptr(GPtrArray) part_tempfiles = NULL;
g_autoptr(GVariant) delta_descriptor = NULL;
g_autoptr(GVariant) to_commit = NULL;

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

@ -3067,7 +3067,7 @@ ostree_repo_append_gpg_signature (OstreeRepo *self,
gboolean ret = FALSE;
g_autoptr(GVariant) metadata = NULL;
g_autoptr(GVariant) new_metadata = NULL;
gs_unref_variant_builder GVariantBuilder *builder = NULL;
g_autoptr(GVariantBuilder) builder = NULL;
if (!ostree_repo_read_commit_detached_metadata (self,
commit_checksum,
@ -3592,7 +3592,7 @@ ostree_repo_regenerate_summary (OstreeRepo *self,
{
gboolean ret = FALSE;
g_autoptr(GHashTable) refs = NULL;
gs_unref_variant_builder GVariantBuilder *refs_builder = NULL;
g_autoptr(GVariantBuilder) refs_builder = NULL;
g_autoptr(GVariant) summary = NULL;
GList *ordered_keys = NULL;
GList *iter = NULL;
@ -3624,7 +3624,7 @@ ostree_repo_regenerate_summary (OstreeRepo *self,
}
{
gs_unref_variant_builder GVariantBuilder *summary_builder =
g_autoptr(GVariantBuilder) summary_builder =
g_variant_builder_new (OSTREE_SUMMARY_GVARIANT_FORMAT);
g_variant_builder_add_value (summary_builder, g_variant_builder_end (refs_builder));

2
src/ostree/ot-admin-builtin-set-origin.c
View File

@ -95,7 +95,7 @@ ot_admin_builtin_set_origin (int argc, char **argv, GCancellable *cancellable, G
}
{ char **iter;
gs_unref_variant_builder GVariantBuilder *optbuilder =
g_autoptr(GVariantBuilder) optbuilder =
g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));
for (iter = opt_set; iter && *iter; iter++)

2
src/ostree/ot-builtin-commit.c
View File

@ -256,7 +256,7 @@ parse_keyvalue_strings (char **strings,
{
gboolean ret = FALSE;
char **iter;
gs_unref_variant_builder GVariantBuilder *builder = NULL;
g_autoptr(GVariantBuilder) builder = NULL;
builder = g_variant_builder_new (G_VARIANT_TYPE ("a{sv}"));

2
src/ostree/ot-builtin-static-delta.c
View File

@ -158,7 +158,7 @@ ot_static_delta_builtin_generate (int argc, char **argv, GCancellable *cancellab
g_autofree char *from_resolved = NULL;
g_autofree char *to_resolved = NULL;
g_autofree char *from_parent_str = NULL;
gs_unref_variant_builder GVariantBuilder *parambuilder = NULL;
g_autoptr(GVariantBuilder) parambuilder = NULL;
g_assert (opt_to_rev);