Use g_autoptr(GVariantBuilder) instead of gs_unref_variant_builder

This commit is contained in:
Matthew Barnes committed 2015-05-06 22:07:11 -04:00
1 parent c69347b622
commit cca69b3f55
7 files changed
+10 -10

No files matched your search

+1 -1
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);
+1 -1
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}"));
@@ -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;
+3 -3
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));