[ostree] Use g_autoptr(GVariant) instead of gs_unref_variant
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] Use g_autoptr(GVariant) instead of gs_unref_variant
- Date: Thu, 7 May 2015 02:17:43 +0000 (UTC)
commit c2c322efa93ed4acc7a7e95248b48627f10bfcfc
Author: Matthew Barnes <mbarnes redhat com>
Date: Tue May 5 11:45:46 2015 -0400
Use g_autoptr(GVariant) instead of gs_unref_variant
src/libostree/ostree-core.c | 34 +++++-----
src/libostree/ostree-diff.c | 2 +-
src/libostree/ostree-repo-checkout.c | 4 +-
src/libostree/ostree-repo-commit.c | 32 +++++-----
src/libostree/ostree-repo-file.c | 34 +++++-----
src/libostree/ostree-repo-prune.c | 2 +-
src/libostree/ostree-repo-pull.c | 66 ++++++++++----------
src/libostree/ostree-repo-refs.c | 2 +-
...ostree-repo-static-delta-compilation-analysis.c | 2 +-
.../ostree-repo-static-delta-compilation.c | 28 ++++----
src/libostree/ostree-repo-static-delta-core.c | 16 +++---
.../ostree-repo-static-delta-processing.c | 16 +++---
src/libostree/ostree-repo-traverse.c | 20 +++---
src/libostree/ostree-repo.c | 40 ++++++------
src/libostree/ostree-sysroot-deploy.c | 6 +-
src/libostree/ostree-sysroot-upgrader.c | 4 +-
src/libotutil/ot-variant-utils.c | 4 +-
src/ostree/ot-admin-builtin-status.c | 2 +-
src/ostree/ot-builtin-commit.c | 4 +-
src/ostree/ot-builtin-fsck.c | 4 +-
src/ostree/ot-builtin-gpg-sign.c | 6 +-
src/ostree/ot-builtin-log.c | 2 +-
src/ostree/ot-builtin-show.c | 18 +++---
src/ostree/ot-dump.c | 2 +-
tests/test-gpg-verify-result.c | 12 ++--
tests/test-varint.c | 2 +-
26 files changed, 182 insertions(+), 182 deletions(-)
---
diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index 84924c6..96c9eab 100644
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -250,7 +250,7 @@ _ostree_zlib_file_header_new (GFileInfo *file_info,
guint32 mode;
const char *symlink_target;
GVariant *ret;
- gs_unref_variant GVariant *tmp_xattrs = NULL;
+ g_autoptr(GVariant) tmp_xattrs = NULL;
size = g_file_info_get_size (file_info);
uid = g_file_info_get_attribute_uint32 (file_info, "unix::uid");
@@ -427,7 +427,7 @@ ostree_raw_file_to_content_stream (GInputStream *input,
gpointer header_data;
gsize header_size;
g_autoptr(GInputStream) ret_input = NULL;
- gs_unref_variant GVariant *file_header = NULL;
+ g_autoptr(GVariant) file_header = NULL;
g_autoptr(GPtrArray) streams = NULL;
g_autoptr(GOutputStream) header_out_stream = NULL;
g_autoptr(GInputStream) header_in_stream = NULL;
@@ -495,8 +495,8 @@ ostree_content_stream_parse (gboolean compressed,
gsize bytes_read;
g_autoptr(GInputStream) ret_input = NULL;
g_autoptr(GFileInfo) ret_file_info = NULL;
- gs_unref_variant GVariant *ret_xattrs = NULL;
- gs_unref_variant GVariant *file_header = NULL;
+ g_autoptr(GVariant) ret_xattrs = NULL;
+ g_autoptr(GVariant) file_header = NULL;
g_autofree guchar *buf = NULL;
if (!g_input_stream_read_all (input,
@@ -607,7 +607,7 @@ ostree_content_file_parse_at (gboolean compressed,
g_autoptr(GInputStream) file_input = NULL;
g_autoptr(GInputStream) ret_input = NULL;
g_autoptr(GFileInfo) ret_file_info = NULL;
- gs_unref_variant GVariant *ret_xattrs = NULL;
+ g_autoptr(GVariant) ret_xattrs = NULL;
if (!ot_openat_read_stream (parent_dfd, path, TRUE, &file_input,
cancellable, error))
@@ -695,14 +695,14 @@ ostree_checksum_file_from_input (GFileInfo *file_info,
}
else if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY)
{
- gs_unref_variant GVariant *dirmeta = ostree_create_directory_metadata (file_info, xattrs);
+ g_autoptr(GVariant) dirmeta = ostree_create_directory_metadata (file_info, xattrs);
g_checksum_update (checksum, g_variant_get_data (dirmeta),
g_variant_get_size (dirmeta));
}
else
{
- gs_unref_variant GVariant *file_header = NULL;
+ g_autoptr(GVariant) file_header = NULL;
file_header = file_header_new (file_info, xattrs);
@@ -746,7 +746,7 @@ ostree_checksum_file (GFile *f,
gboolean ret = FALSE;
g_autoptr(GFileInfo) file_info = NULL;
g_autoptr(GInputStream) in = NULL;
- gs_unref_variant GVariant *xattrs = NULL;
+ g_autoptr(GVariant) xattrs = NULL;
g_autofree guchar *ret_csum = NULL;
if (g_cancellable_set_error_if_cancelled (cancellable, error))
@@ -1517,7 +1517,7 @@ file_header_parse (GVariant *metadata,
guint32 uid, gid, mode, rdev;
const char *symlink_target;
g_autoptr(GFileInfo) ret_file_info = NULL;
- gs_unref_variant GVariant *ret_xattrs = NULL;
+ g_autoptr(GVariant) ret_xattrs = NULL;
g_variant_get (metadata, "(uuuu&s a(ayay))",
&uid, &gid, &mode, &rdev,
@@ -1578,7 +1578,7 @@ zlib_file_header_parse (GVariant *metadata,
guint32 uid, gid, mode, rdev;
const char *symlink_target;
g_autoptr(GFileInfo) ret_file_info = NULL;
- gs_unref_variant GVariant *ret_xattrs = NULL;
+ g_autoptr(GVariant) ret_xattrs = NULL;
g_variant_get (metadata, "(tuuuu&s a(ayay))", &size,
&uid, &gid, &mode, &rdev,
@@ -1728,9 +1728,9 @@ ostree_validate_structureof_commit (GVariant *commit,
GError **error)
{
gboolean ret = FALSE;
- gs_unref_variant GVariant *parent_csum_v = NULL;
- gs_unref_variant GVariant *content_csum_v = NULL;
- gs_unref_variant GVariant *metadata_csum_v = NULL;
+ g_autoptr(GVariant) parent_csum_v = NULL;
+ g_autoptr(GVariant) content_csum_v = NULL;
+ g_autoptr(GVariant) metadata_csum_v = NULL;
gsize n_elts;
if (!validate_variant (commit, OSTREE_COMMIT_GVARIANT_FORMAT, error))
@@ -1773,8 +1773,8 @@ ostree_validate_structureof_dirtree (GVariant *dirtree,
{
gboolean ret = FALSE;
const char *filename;
- gs_unref_variant GVariant *content_csum_v = NULL;
- gs_unref_variant GVariant *meta_csum_v = NULL;
+ g_autoptr(GVariant) content_csum_v = NULL;
+ g_autoptr(GVariant) meta_csum_v = NULL;
GVariantIter *contents_iter = NULL;
if (!validate_variant (dirtree, OSTREE_TREE_GVARIANT_FORMAT, error))
@@ -1909,7 +1909,7 @@ ostree_validate_structureof_dirmeta (GVariant *dirmeta,
gchar *
ostree_commit_get_parent (GVariant *commit_variant)
{
- gs_unref_variant GVariant *bytes = NULL;
+ g_autoptr(GVariant) bytes = NULL;
bytes = g_variant_get_child_value (commit_variant, 1);
if (g_variant_n_children (bytes) == 0)
return NULL;
@@ -1929,7 +1929,7 @@ _ostree_detached_metadata_append_gpg_sig (GVariant *existing_metadata,
GBytes *signature_bytes)
{
GVariantDict metadata_dict;
- gs_unref_variant GVariant *signature_data = NULL;
+ g_autoptr(GVariant) signature_data = NULL;
gs_unref_variant_builder GVariantBuilder *signature_builder = NULL;
g_variant_dict_init (&metadata_dict, existing_metadata);
diff --git a/src/libostree/ostree-diff.c b/src/libostree/ostree-diff.c
index 940e693..71c5882 100644
--- a/src/libostree/ostree-diff.c
+++ b/src/libostree/ostree-diff.c
@@ -44,7 +44,7 @@ get_file_checksum (OstreeDiffFlags flags,
}
else
{
- gs_unref_variant GVariant *xattrs = NULL;
+ g_autoptr(GVariant) xattrs = NULL;
g_autoptr(GInputStream) in = NULL;
if (!(flags & OSTREE_DIFF_FLAGS_IGNORE_XATTRS))
diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c
index 1aeae13..836008d 100644
--- a/src/libostree/ostree-repo-checkout.c
+++ b/src/libostree/ostree-repo-checkout.c
@@ -391,7 +391,7 @@ checkout_one_file_at (OstreeRepo *repo,
gboolean did_hardlink = FALSE;
char loose_path_buf[_OSTREE_LOOSE_PATH_MAX];
g_autoptr(GInputStream) input = NULL;
- gs_unref_variant GVariant *xattrs = NULL;
+ g_autoptr(GVariant) xattrs = NULL;
is_symlink = g_file_info_get_file_type (source_info) == G_FILE_TYPE_SYMBOLIC_LINK;
@@ -571,7 +571,7 @@ checkout_tree_at (OstreeRepo *self,
gboolean did_exist = FALSE;
int destination_dfd = -1;
int res;
- gs_unref_variant GVariant *xattrs = NULL;
+ g_autoptr(GVariant) xattrs = NULL;
g_autoptr(GFileEnumerator) dir_enum = NULL;
/* Create initially with mode 0700, then chown/chmod only when we're
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index afd854e..d13ea43 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -67,7 +67,7 @@ create_file_metadata (guint32 uid,
GVariant *xattrs)
{
GVariant *ret_metadata = NULL;
- gs_unref_variant GVariant *tmp_xattrs = NULL;
+ g_autoptr(GVariant) tmp_xattrs = NULL;
if (xattrs == NULL)
tmp_xattrs = g_variant_ref_sink (g_variant_new_array (G_VARIANT_TYPE ("(ayay)"), NULL, 0));
@@ -90,7 +90,7 @@ write_file_metadata_to_xattr (int fd,
GVariant *xattrs,
GError **error)
{
- gs_unref_variant GVariant *filemeta = NULL;
+ g_autoptr(GVariant) filemeta = NULL;
int res;
filemeta = create_file_metadata (uid, gid, mode, xattrs);
@@ -542,7 +542,7 @@ write_object (OstreeRepo *self,
glnx_unref_object OstreeChecksumInputStream *checksum_input = NULL;
g_autoptr(GInputStream) file_input = NULL;
g_autoptr(GFileInfo) file_info = NULL;
- gs_unref_variant GVariant *xattrs = NULL;
+ g_autoptr(GVariant) xattrs = NULL;
g_autoptr(GOutputStream) temp_out = NULL;
gboolean have_obj;
GChecksum *checksum = NULL;
@@ -651,7 +651,7 @@ write_object (OstreeRepo *self,
}
else if (repo_mode == OSTREE_REPO_MODE_ARCHIVE_Z2)
{
- gs_unref_variant GVariant *file_meta = NULL;
+ g_autoptr(GVariant) file_meta = NULL;
g_autoptr(GConverter) zlib_compressor = NULL;
g_autoptr(GOutputStream) compressed_out_stream = NULL;
@@ -1444,7 +1444,7 @@ ostree_repo_write_metadata (OstreeRepo *self,
{
gboolean ret = FALSE;
g_autoptr(GInputStream) input = NULL;
- gs_unref_variant GVariant *normalized = NULL;
+ g_autoptr(GVariant) normalized = NULL;
normalized = g_variant_get_normal_form (object);
@@ -1520,7 +1520,7 @@ ostree_repo_write_metadata_trusted (OstreeRepo *self,
GError **error)
{
g_autoptr(GInputStream) input = NULL;
- gs_unref_variant GVariant *normalized = NULL;
+ g_autoptr(GVariant) normalized = NULL;
normalized = g_variant_get_normal_form (variant);
input = ot_variant_read (normalized);
@@ -1641,7 +1641,7 @@ _ostree_repo_write_directory_meta (OstreeRepo *self,
GCancellable *cancellable,
GError **error)
{
- gs_unref_variant GVariant *dirmeta = NULL;
+ g_autoptr(GVariant) dirmeta = NULL;
if (g_cancellable_set_error_if_cancelled (cancellable, error))
return FALSE;
@@ -1853,8 +1853,8 @@ ostree_repo_write_commit (OstreeRepo *self,
{
gboolean ret = FALSE;
g_autofree char *ret_commit = NULL;
- gs_unref_variant GVariant *commit = NULL;
- gs_unref_variant GVariant *new_metadata = NULL;
+ g_autoptr(GVariant) commit = NULL;
+ g_autoptr(GVariant) new_metadata = NULL;
g_autofree guchar *commit_csum = NULL;
GDateTime *now = NULL;
OstreeRepoFile *repo_root = OSTREE_REPO_FILE (root);
@@ -1923,7 +1923,7 @@ ostree_repo_read_commit_detached_metadata (OstreeRepo *self,
gboolean ret = FALSE;
g_autoptr(GFile) metadata_path =
_ostree_repo_get_commit_metadata_loose_path (self, checksum);
- gs_unref_variant GVariant *ret_metadata = NULL;
+ g_autoptr(GVariant) ret_metadata = NULL;
GError *temp_error = NULL;
if (!ot_util_variant_map (metadata_path, G_VARIANT_TYPE ("a{sv}"),
@@ -1969,7 +1969,7 @@ ostree_repo_write_commit_detached_metadata (OstreeRepo *self,
gboolean ret = FALSE;
g_autoptr(GFile) metadata_path =
_ostree_repo_get_commit_metadata_loose_path (self, checksum);
- gs_unref_variant GVariant *normalized = NULL;
+ g_autoptr(GVariant) normalized = NULL;
gsize normalized_size = 0;
if (!_ostree_repo_ensure_loose_objdir_at (self->objects_dir_fd, checksum,
@@ -2181,7 +2181,7 @@ get_modified_xattrs (OstreeRepo *self,
GError **error)
{
gboolean ret = FALSE;
- gs_unref_variant GVariant *ret_xattrs = NULL;
+ g_autoptr(GVariant) ret_xattrs = NULL;
if (modifier && modifier->xattr_callback)
{
@@ -2357,7 +2357,7 @@ write_directory_content_to_mtree_internal (OstreeRepo *self,
guint64 file_obj_length;
const char *loose_checksum;
g_autoptr(GInputStream) file_input = NULL;
- gs_unref_variant GVariant *xattrs = NULL;
+ g_autoptr(GVariant) xattrs = NULL;
g_autoptr(GInputStream) file_object_input = NULL;
g_autofree guchar *child_file_csum = NULL;
g_autofree char *tmp_checksum = NULL;
@@ -2465,7 +2465,7 @@ write_directory_to_mtree_internal (OstreeRepo *self,
else
{
g_autoptr(GFileInfo) modified_info = NULL;
- gs_unref_variant GVariant *xattrs = NULL;
+ g_autoptr(GVariant) xattrs = NULL;
g_autofree guchar *child_file_csum = NULL;
g_autofree char *tmp_checksum = NULL;
g_autofree char *relpath = NULL;
@@ -2547,7 +2547,7 @@ write_dfd_iter_to_mtree_internal (OstreeRepo *self,
gboolean ret = FALSE;
g_autoptr(GFileInfo) child_info = NULL;
g_autoptr(GFileInfo) modified_info = NULL;
- gs_unref_variant GVariant *xattrs = NULL;
+ g_autoptr(GVariant) xattrs = NULL;
g_autofree guchar *child_file_csum = NULL;
g_autofree char *tmp_checksum = NULL;
g_autofree char *relpath = NULL;
@@ -2758,7 +2758,7 @@ ostree_repo_write_mtree (OstreeRepo *self,
{
g_autoptr(GHashTable) dir_metadata_checksums = NULL;
g_autoptr(GHashTable) dir_contents_checksums = NULL;
- gs_unref_variant GVariant *serialized_tree = NULL;
+ g_autoptr(GVariant) serialized_tree = NULL;
g_autofree guchar *contents_csum = NULL;
char contents_checksum_buf[65];
diff --git a/src/libostree/ostree-repo-file.c b/src/libostree/ostree-repo-file.c
index 84d8a76..b382dbf 100644
--- a/src/libostree/ostree-repo-file.c
+++ b/src/libostree/ostree-repo-file.c
@@ -149,9 +149,9 @@ _ostree_repo_file_new_for_commit (OstreeRepo *repo,
GError **error)
{
OstreeRepoFile *ret = NULL;
- gs_unref_variant GVariant *commit_v = NULL;
- gs_unref_variant GVariant *tree_contents_csum_v = NULL;
- gs_unref_variant GVariant *tree_metadata_csum_v = NULL;
+ g_autoptr(GVariant) commit_v = NULL;
+ g_autoptr(GVariant) tree_contents_csum_v = NULL;
+ g_autoptr(GVariant) tree_metadata_csum_v = NULL;
char tree_contents_csum[65];
char tree_metadata_csum[65];
@@ -183,8 +183,8 @@ do_resolve (OstreeRepoFile *self,
GError **error)
{
gboolean ret = FALSE;
- gs_unref_variant GVariant *root_contents = NULL;
- gs_unref_variant GVariant *root_metadata = NULL;
+ g_autoptr(GVariant) root_contents = NULL;
+ g_autoptr(GVariant) root_metadata = NULL;
g_assert (self->parent == NULL);
@@ -213,11 +213,11 @@ do_resolve_nonroot (OstreeRepoFile *self,
gboolean ret = FALSE;
gboolean is_dir;
int i;
- gs_unref_variant GVariant *container = NULL;
- gs_unref_variant GVariant *tree_contents = NULL;
- gs_unref_variant GVariant *tree_metadata = NULL;
- gs_unref_variant GVariant *contents_csum_v = NULL;
- gs_unref_variant GVariant *metadata_csum_v = NULL;
+ g_autoptr(GVariant) container = NULL;
+ g_autoptr(GVariant) tree_contents = NULL;
+ g_autoptr(GVariant) tree_metadata = NULL;
+ g_autoptr(GVariant) contents_csum_v = NULL;
+ g_autoptr(GVariant) metadata_csum_v = NULL;
g_autofree char *tmp_checksum = NULL;
if (!ostree_repo_file_ensure_resolved (self->parent, error))
@@ -312,7 +312,7 @@ ostree_repo_file_get_xattrs (OstreeRepoFile *self,
GError **error)
{
gboolean ret = FALSE;
- gs_unref_variant GVariant *ret_xattrs = NULL;
+ g_autoptr(GVariant) ret_xattrs = NULL;
if (!ostree_repo_file_ensure_resolved (self, error))
goto out;
@@ -723,7 +723,7 @@ query_child_info_dir (OstreeRepo *repo,
{
gboolean ret = FALSE;
g_autoptr(GFileInfo) ret_info = NULL;
- gs_unref_variant GVariant *metadata = NULL;
+ g_autoptr(GVariant) metadata = NULL;
ret_info = g_file_info_new ();
@@ -762,7 +762,7 @@ bsearch_in_file_variant (GVariant *variant,
imin = 0;
while (imax >= imin)
{
- gs_unref_variant GVariant *child = NULL;
+ g_autoptr(GVariant) child = NULL;
const char *cur;
int cmp;
@@ -849,10 +849,10 @@ ostree_repo_file_tree_query_child (OstreeRepoFile *self,
const char *name = NULL;
int c;
g_autoptr(GFileInfo) ret_info = NULL;
- gs_unref_variant GVariant *files_variant = NULL;
- gs_unref_variant GVariant *dirs_variant = NULL;
- gs_unref_variant GVariant *content_csum_v = NULL;
- gs_unref_variant GVariant *meta_csum_v = NULL;
+ g_autoptr(GVariant) files_variant = NULL;
+ g_autoptr(GVariant) dirs_variant = NULL;
+ g_autoptr(GVariant) content_csum_v = NULL;
+ g_autoptr(GVariant) meta_csum_v = NULL;
char tmp_checksum[65];
GFileAttributeMatcher *matcher = NULL;
diff --git a/src/libostree/ostree-repo-prune.c b/src/libostree/ostree-repo-prune.c
index d9d0b52..86949f3 100644
--- a/src/libostree/ostree-repo-prune.c
+++ b/src/libostree/ostree-repo-prune.c
@@ -68,7 +68,7 @@ maybe_prune_loose_object (OtPruneData *data,
GError **error)
{
gboolean ret = FALSE;
- gs_unref_variant GVariant *key = NULL;
+ g_autoptr(GVariant) key = NULL;
key = ostree_object_name_serialize (checksum, objtype);
diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index 18b2f27..f8810b9 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -363,9 +363,9 @@ scan_dirtree_object (OtPullData *pull_data,
{
gboolean ret = FALSE;
int i, n;
- gs_unref_variant GVariant *tree = NULL;
- gs_unref_variant GVariant *files_variant = NULL;
- gs_unref_variant GVariant *dirs_variant = NULL;
+ g_autoptr(GVariant) tree = NULL;
+ g_autoptr(GVariant) files_variant = NULL;
+ g_autoptr(GVariant) dirs_variant = NULL;
char *subdir_target = NULL;
const char *dirname = NULL;
@@ -394,7 +394,7 @@ scan_dirtree_object (OtPullData *pull_data,
{
const char *filename;
gboolean file_is_stored;
- gs_unref_variant GVariant *csum = NULL;
+ g_autoptr(GVariant) csum = NULL;
g_autofree char *file_checksum = NULL;
g_variant_get_child (files_variant, i, "(&s ay)", &filename, &csum);
@@ -448,8 +448,8 @@ scan_dirtree_object (OtPullData *pull_data,
for (i = 0; i < n; i++)
{
- gs_unref_variant GVariant *tree_csum = NULL;
- gs_unref_variant GVariant *meta_csum = NULL;
+ g_autoptr(GVariant) tree_csum = NULL;
+ g_autoptr(GVariant) meta_csum = NULL;
g_variant_get_child (dirs_variant, i, "(&s ay@ay)",
&dirname, &tree_csum, &meta_csum);
@@ -513,12 +513,12 @@ lookup_commit_checksum_from_summary (OtPullData *pull_data,
GError **error)
{
gboolean ret = FALSE;
- gs_unref_variant GVariant *refs = g_variant_get_child_value (pull_data->summary, 0);
- gs_unref_variant GVariant *refdata = NULL;
- gs_unref_variant GVariant *reftargetdata = NULL;
- gs_unref_variant GVariant *commit_data = NULL;
+ g_autoptr(GVariant) refs = g_variant_get_child_value (pull_data->summary, 0);
+ g_autoptr(GVariant) refdata = NULL;
+ g_autoptr(GVariant) reftargetdata = NULL;
+ g_autoptr(GVariant) commit_data = NULL;
guint64 commit_size;
- gs_unref_variant GVariant *commit_csum_v = NULL;
+ g_autoptr(GVariant) commit_csum_v = NULL;
g_autoptr(GBytes) commit_bytes = NULL;
int i;
@@ -597,7 +597,7 @@ content_fetch_on_complete (GObject *object,
GCancellable *cancellable = NULL;
guint64 length;
g_autoptr(GFileInfo) file_info = NULL;
- gs_unref_variant GVariant *xattrs = NULL;
+ g_autoptr(GVariant) xattrs = NULL;
g_autoptr(GInputStream) file_in = NULL;
g_autoptr(GInputStream) object_input = NULL;
g_autofree char *temp_path = NULL;
@@ -720,7 +720,7 @@ meta_fetch_on_complete (GObject *object,
{
FetchObjectData *fetch_data = user_data;
OtPullData *pull_data = fetch_data->pull_data;
- gs_unref_variant GVariant *metadata = NULL;
+ g_autoptr(GVariant) metadata = NULL;
g_autofree char *temp_path = NULL;
const char *checksum;
OstreeObjectType objtype;
@@ -853,7 +853,7 @@ static_deltapart_fetch_on_complete (GObject *object,
{
FetchStaticDeltaData *fetch_data = user_data;
OtPullData *pull_data = fetch_data->pull_data;
- gs_unref_variant GVariant *metadata = NULL;
+ g_autoptr(GVariant) metadata = NULL;
g_autofree char *temp_path = NULL;
g_autoptr(GInputStream) in = NULL;
g_autofree char *actual_checksum = NULL;
@@ -936,10 +936,10 @@ scan_commit_object (OtPullData *pull_data,
{
gboolean ret = FALSE;
gboolean have_parent;
- gs_unref_variant GVariant *commit = NULL;
- gs_unref_variant GVariant *parent_csum = NULL;
- gs_unref_variant GVariant *tree_contents_csum = NULL;
- gs_unref_variant GVariant *tree_meta_csum = NULL;
+ g_autoptr(GVariant) commit = NULL;
+ g_autoptr(GVariant) parent_csum = NULL;
+ g_autoptr(GVariant) tree_contents_csum = NULL;
+ g_autoptr(GVariant) tree_meta_csum = NULL;
gpointer depthp;
gint depth;
@@ -1079,7 +1079,7 @@ scan_one_metadata_object_c (OtPullData *pull_data,
GError **error)
{
gboolean ret = FALSE;
- gs_unref_variant GVariant *object = NULL;
+ g_autoptr(GVariant) object = NULL;
g_autofree char *tmp_checksum = NULL;
gboolean is_requested;
gboolean is_stored;
@@ -1313,7 +1313,7 @@ fetch_metadata_to_verify_delta_superblock (OtPullData *pull_data,
g_autofree char *meta_path = _ostree_get_relative_static_delta_detachedmeta_path (from_revision, checksum);
g_autoptr(GBytes) detached_meta_data = NULL;
SoupURI *target_uri = NULL;
- gs_unref_variant GVariant *metadata = NULL;
+ g_autoptr(GVariant) metadata = NULL;
target_uri = suburi_new (pull_data->base_uri, meta_path, NULL);
@@ -1348,12 +1348,12 @@ request_static_delta_superblock_sync (OtPullData *pull_data,
GError **error)
{
gboolean ret = FALSE;
- gs_unref_variant GVariant *ret_delta_superblock = NULL;
+ g_autoptr(GVariant) ret_delta_superblock = NULL;
g_autofree char *delta_name =
_ostree_get_relative_static_delta_superblock_path (from_revision, to_revision);
g_autoptr(GBytes) delta_superblock_data = NULL;
g_autoptr(GBytes) delta_meta_data = NULL;
- gs_unref_variant GVariant *delta_superblock = NULL;
+ g_autoptr(GVariant) delta_superblock = NULL;
SoupURI *target_uri = NULL;
target_uri = suburi_new (pull_data->base_uri, delta_name, NULL);
@@ -1392,7 +1392,7 @@ process_one_static_delta_fallback (OtPullData *pull_data,
GError **error)
{
gboolean ret = FALSE;
- gs_unref_variant GVariant *csum_v = NULL;
+ g_autoptr(GVariant) csum_v = NULL;
g_autofree char *checksum = NULL;
guint8 objtype_y;
OstreeObjectType objtype;
@@ -1455,8 +1455,8 @@ process_one_static_delta (OtPullData *pull_data,
GError **error)
{
gboolean ret = FALSE;
- gs_unref_variant GVariant *headers = NULL;
- gs_unref_variant GVariant *fallback_objects = NULL;
+ g_autoptr(GVariant) headers = NULL;
+ g_autoptr(GVariant) fallback_objects = NULL;
guint i, n;
/* Parsing OSTREE_STATIC_DELTA_SUPERBLOCK_FORMAT */
@@ -1467,7 +1467,7 @@ process_one_static_delta (OtPullData *pull_data,
n = g_variant_n_children (fallback_objects);
for (i = 0; i < n; i++)
{
- gs_unref_variant GVariant *fallback_object =
+ g_autoptr(GVariant) fallback_object =
g_variant_get_child_value (fallback_objects, i);
if (!process_one_static_delta_fallback (pull_data,
@@ -1478,9 +1478,9 @@ process_one_static_delta (OtPullData *pull_data,
/* Write the to-commit object */
{
- gs_unref_variant GVariant *to_csum_v = NULL;
+ g_autoptr(GVariant) to_csum_v = NULL;
g_autofree char *to_checksum = NULL;
- gs_unref_variant GVariant *to_commit = NULL;
+ g_autoptr(GVariant) to_commit = NULL;
gboolean have_to_commit;
to_csum_v = g_variant_get_child_value (delta_superblock, 3);
@@ -1516,13 +1516,13 @@ process_one_static_delta (OtPullData *pull_data,
for (i = 0; i < n; i++)
{
const guchar *csum;
- gs_unref_variant GVariant *header = NULL;
+ g_autoptr(GVariant) header = NULL;
gboolean have_all = FALSE;
SoupURI *target_uri = NULL;
g_autofree char *deltapart_path = NULL;
FetchStaticDeltaData *fetch_data;
- gs_unref_variant GVariant *csum_v = NULL;
- gs_unref_variant GVariant *objects = NULL;
+ g_autoptr(GVariant) csum_v = NULL;
+ g_autoptr(GVariant) objects = NULL;
guint64 size, usize;
guint32 version;
@@ -1918,7 +1918,7 @@ ostree_repo_pull_with_options (OstreeRepo *self,
if (bytes)
{
- gs_unref_variant GVariant *refs = NULL;
+ g_autoptr(GVariant) refs = NULL;
gsize i, n;
pull_data->summary_data = g_bytes_ref (bytes);
@@ -1928,7 +1928,7 @@ ostree_repo_pull_with_options (OstreeRepo *self,
for (i = 0; i < n; i++)
{
const char *refname;
- gs_unref_variant GVariant *ref = g_variant_get_child_value (refs, i);
+ g_autoptr(GVariant) ref = g_variant_get_child_value (refs, i);
g_variant_get_child (ref, 0, "&s", &refname);
diff --git a/src/libostree/ostree-repo-refs.c b/src/libostree/ostree-repo-refs.c
index 4bb6e0a..bd0b760 100644
--- a/src/libostree/ostree-repo-refs.c
+++ b/src/libostree/ostree-repo-refs.c
@@ -391,7 +391,7 @@ ostree_repo_resolve_rev (OstreeRepo *self,
{
g_autofree char *parent_refspec = NULL;
g_autofree char *parent_rev = NULL;
- gs_unref_variant GVariant *commit = NULL;
+ g_autoptr(GVariant) commit = NULL;
parent_refspec = g_strdup (refspec);
parent_refspec[strlen(parent_refspec) - 1] = '\0';
diff --git a/src/libostree/ostree-repo-static-delta-compilation-analysis.c
b/src/libostree/ostree-repo-static-delta-compilation-analysis.c
index a8f24b4..3364787 100644
--- a/src/libostree/ostree-repo-static-delta-compilation-analysis.c
+++ b/src/libostree/ostree-repo-static-delta-compilation-analysis.c
@@ -101,7 +101,7 @@ build_content_sizenames_recurse (OstreeRepo *repo,
char *name;
char *content_checksum;
char *meta_checksum;
- gs_unref_variant GVariant *dirtree = NULL;
+ g_autoptr(GVariant) dirtree = NULL;
ostree_cleanup_repo_commit_traverse_iter
OstreeRepoCommitTraverseIter subiter = { 0, };
diff --git a/src/libostree/ostree-repo-static-delta-compilation.c
b/src/libostree/ostree-repo-static-delta-compilation.c
index d56440c..40aff12 100644
--- a/src/libostree/ostree-repo-static-delta-compilation.c
+++ b/src/libostree/ostree-repo-static-delta-compilation.c
@@ -286,7 +286,7 @@ write_content_mode_xattrs (OstreeRepo *repo,
g_file_info_get_attribute_uint32 (content_finfo, "unix::gid");
guint32 mode =
g_file_info_get_attribute_uint32 (content_finfo, "unix::mode");
- gs_unref_variant GVariant *modev
+ g_autoptr(GVariant) modev
= g_variant_ref_sink (g_variant_new ("(uuu)",
GUINT32_TO_BE (uid),
GUINT32_TO_BE (gid),
@@ -315,7 +315,7 @@ process_one_object (OstreeRepo *repo,
guint64 content_size;
g_autoptr(GInputStream) content_stream = NULL;
g_autoptr(GFileInfo) content_finfo = NULL;
- gs_unref_variant GVariant *content_xattrs = NULL;
+ g_autoptr(GVariant) content_xattrs = NULL;
guint64 compressed_size;
OstreeStaticDeltaPartBuilder *current_part = *current_part_val;
@@ -658,7 +658,7 @@ process_one_rollsum (OstreeRepo *repo,
guint64 content_size;
g_autoptr(GInputStream) content_stream = NULL;
g_autoptr(GFileInfo) content_finfo = NULL;
- gs_unref_variant GVariant *content_xattrs = NULL;
+ g_autoptr(GVariant) content_xattrs = NULL;
OstreeStaticDeltaPartBuilder *current_part = *current_part_val;
const guint8 *tmp_to_buf;
gsize tmp_to_len;
@@ -777,7 +777,7 @@ process_one_bsdiff (OstreeRepo *repo,
guint64 content_size;
g_autoptr(GInputStream) content_stream = NULL;
g_autoptr(GFileInfo) content_finfo = NULL;
- gs_unref_variant GVariant *content_xattrs = NULL;
+ g_autoptr(GVariant) content_xattrs = NULL;
OstreeStaticDeltaPartBuilder *current_part = *current_part_val;
const guint8 *tmp_to_buf;
gsize tmp_to_len;
@@ -872,9 +872,9 @@ generate_delta_lowlatency (OstreeRepo *repo,
gpointer key, value;
OstreeStaticDeltaPartBuilder *current_part = NULL;
g_autoptr(GFile) root_from = NULL;
- gs_unref_variant GVariant *from_commit = NULL;
+ g_autoptr(GVariant) from_commit = NULL;
g_autoptr(GFile) root_to = NULL;
- gs_unref_variant GVariant *to_commit = NULL;
+ g_autoptr(GVariant) to_commit = NULL;
g_autoptr(GHashTable) to_reachable_objects = NULL;
g_autoptr(GHashTable) from_reachable_objects = NULL;
g_autoptr(GHashTable) from_regfile_content = NULL;
@@ -1149,7 +1149,7 @@ get_fallback_headers (OstreeRepo *self,
{
gboolean ret = FALSE;
guint i;
- gs_unref_variant GVariant *ret_headers = NULL;
+ g_autoptr(GVariant) ret_headers = NULL;
gs_unref_variant_builder GVariantBuilder *fallback_builder = NULL;
fallback_builder = g_variant_builder_new (G_VARIANT_TYPE ("a" OSTREE_STATIC_DELTA_FALLBACK_FORMAT));
@@ -1250,13 +1250,13 @@ ostree_repo_static_delta_generate (OstreeRepo *self,
guint64 total_uncompressed_size = 0;
gs_unref_variant_builder GVariantBuilder *part_headers = NULL;
g_autoptr(GPtrArray) part_tempfiles = NULL;
- gs_unref_variant GVariant *delta_descriptor = NULL;
- gs_unref_variant GVariant *to_commit = NULL;
+ g_autoptr(GVariant) delta_descriptor = NULL;
+ g_autoptr(GVariant) to_commit = NULL;
g_autofree char *descriptor_relpath = NULL;
g_autoptr(GFile) descriptor_path = NULL;
g_autoptr(GFile) descriptor_dir = NULL;
- gs_unref_variant GVariant *tmp_metadata = NULL;
- gs_unref_variant GVariant *fallback_headers = NULL;
+ g_autoptr(GVariant) tmp_metadata = NULL;
+ g_autoptr(GVariant) fallback_headers = NULL;
builder.parts = g_ptr_array_new_with_free_func ((GDestroyNotify)ostree_static_delta_part_builder_unref);
builder.fallback_objects = g_ptr_array_new_with_free_func ((GDestroyNotify)g_variant_unref);
@@ -1310,9 +1310,9 @@ ostree_repo_static_delta_generate (OstreeRepo *self,
g_autoptr(GMemoryOutputStream) part_payload_out = NULL;
g_autoptr(GConverterOutputStream) part_payload_compressor = NULL;
g_autoptr(GConverter) compressor = NULL;
- gs_unref_variant GVariant *delta_part_content = NULL;
- gs_unref_variant GVariant *delta_part = NULL;
- gs_unref_variant GVariant *delta_part_header = NULL;
+ g_autoptr(GVariant) delta_part_content = NULL;
+ g_autoptr(GVariant) delta_part = NULL;
+ g_autoptr(GVariant) delta_part_header = NULL;
GVariantBuilder *mode_builder = g_variant_builder_new (G_VARIANT_TYPE ("a(uuu)"));
GVariantBuilder *xattr_builder = g_variant_builder_new (G_VARIANT_TYPE ("aa(ayay)"));
guint8 compression_type_char;
diff --git a/src/libostree/ostree-repo-static-delta-core.c b/src/libostree/ostree-repo-static-delta-core.c
index 9129544..f695026 100644
--- a/src/libostree/ostree-repo-static-delta-core.c
+++ b/src/libostree/ostree-repo-static-delta-core.c
@@ -225,9 +225,9 @@ ostree_repo_static_delta_execute_offline (OstreeRepo *self,
gboolean ret = FALSE;
guint i, n;
g_autoptr(GFile) meta_file = g_file_get_child (dir, "superblock");
- gs_unref_variant GVariant *meta = NULL;
- gs_unref_variant GVariant *headers = NULL;
- gs_unref_variant GVariant *fallback = NULL;
+ g_autoptr(GVariant) meta = NULL;
+ g_autoptr(GVariant) headers = NULL;
+ g_autoptr(GVariant) fallback = NULL;
if (!ot_util_variant_map (meta_file, G_VARIANT_TYPE (OSTREE_STATIC_DELTA_SUPERBLOCK_FORMAT),
FALSE, &meta, error))
@@ -237,9 +237,9 @@ ostree_repo_static_delta_execute_offline (OstreeRepo *self,
/* Write the to-commit object */
{
- gs_unref_variant GVariant *to_csum_v = NULL;
+ g_autoptr(GVariant) to_csum_v = NULL;
g_autofree char *to_checksum = NULL;
- gs_unref_variant GVariant *to_commit = NULL;
+ g_autoptr(GVariant) to_commit = NULL;
gboolean have_to_commit;
to_csum_v = g_variant_get_child_value (meta, 3);
@@ -277,9 +277,9 @@ ostree_repo_static_delta_execute_offline (OstreeRepo *self,
guint64 usize;
const guchar *csum;
gboolean have_all;
- gs_unref_variant GVariant *header = NULL;
- gs_unref_variant GVariant *csum_v = NULL;
- gs_unref_variant GVariant *objects = NULL;
+ g_autoptr(GVariant) header = NULL;
+ g_autoptr(GVariant) csum_v = NULL;
+ g_autoptr(GVariant) objects = NULL;
g_autoptr(GFile) part_path = NULL;
g_autoptr(GInputStream) raw_in = NULL;
g_autoptr(GInputStream) in = NULL;
diff --git a/src/libostree/ostree-repo-static-delta-processing.c
b/src/libostree/ostree-repo-static-delta-processing.c
index 8c62757..1f2b326 100644
--- a/src/libostree/ostree-repo-static-delta-processing.c
+++ b/src/libostree/ostree-repo-static-delta-processing.c
@@ -192,11 +192,11 @@ _ostree_static_delta_part_execute_raw (OstreeRepo *repo,
{
gboolean ret = FALSE;
guint8 *checksums_data;
- gs_unref_variant GVariant *checksums = NULL;
- gs_unref_variant GVariant *mode_dict = NULL;
- gs_unref_variant GVariant *xattr_dict = NULL;
- gs_unref_variant GVariant *payload = NULL;
- gs_unref_variant GVariant *ops = NULL;
+ g_autoptr(GVariant) checksums = NULL;
+ g_autoptr(GVariant) mode_dict = NULL;
+ g_autoptr(GVariant) xattr_dict = NULL;
+ g_autoptr(GVariant) payload = NULL;
+ g_autoptr(GVariant) ops = NULL;
StaticDeltaExecutionState statedata = { 0, };
StaticDeltaExecutionState *state = &statedata;
guint n_executed = 0;
@@ -321,7 +321,7 @@ _ostree_static_delta_part_execute (OstreeRepo *repo,
const guint8*partdata;
g_autoptr(GBytes) part_payload_bytes = NULL;
g_autoptr(GBytes) payload_data = NULL;
- gs_unref_variant GVariant *payload = NULL;
+ g_autoptr(GVariant) payload = NULL;
guint8 comptype;
partdata = g_bytes_get_data (part_bytes, &partlen);
@@ -470,7 +470,7 @@ do_content_open_generic (OstreeRepo *repo,
GError **error)
{
gboolean ret = FALSE;
- gs_unref_variant GVariant *modev = NULL;
+ g_autoptr(GVariant) modev = NULL;
guint64 mode_offset;
guint64 xattr_offset;
guint32 uid, gid, mode;
@@ -580,7 +580,7 @@ dispatch_open_splice_and_close (OstreeRepo *repo,
if (OSTREE_OBJECT_TYPE_IS_META (state->output_objtype))
{
- gs_unref_variant GVariant *metadata = NULL;
+ g_autoptr(GVariant) metadata = NULL;
guint64 offset;
guint64 length;
diff --git a/src/libostree/ostree-repo-traverse.c b/src/libostree/ostree-repo-traverse.c
index c0d51fe..e18d340 100644
--- a/src/libostree/ostree-repo-traverse.c
+++ b/src/libostree/ostree-repo-traverse.c
@@ -59,8 +59,8 @@ ostree_repo_commit_traverse_iter_init_commit (OstreeRepoCommitTraverseIter *it
(struct _OstreeRepoRealCommitTraverseIter*)iter;
gboolean ret = FALSE;
const guchar *csum;
- gs_unref_variant GVariant *meta_csum_bytes = NULL;
- gs_unref_variant GVariant *content_csum_bytes = NULL;
+ g_autoptr(GVariant) meta_csum_bytes = NULL;
+ g_autoptr(GVariant) content_csum_bytes = NULL;
memset (real, 0, sizeof (*real));
real->initialized = TRUE;
@@ -158,10 +158,10 @@ ostree_repo_commit_traverse_iter_next (OstreeRepoCommitTraverseIter *iter,
guint ndirs;
guint idx;
const guchar *csum;
- gs_unref_variant GVariant *content_csum_v = NULL;
- gs_unref_variant GVariant *meta_csum_v = NULL;
- gs_unref_variant GVariant *files_variant = NULL;
- gs_unref_variant GVariant *dirs_variant = NULL;
+ g_autoptr(GVariant) content_csum_v = NULL;
+ g_autoptr(GVariant) meta_csum_v = NULL;
+ g_autoptr(GVariant) files_variant = NULL;
+ g_autoptr(GVariant) dirs_variant = NULL;
files_variant = g_variant_get_child_value (real->current_dir, 0);
dirs_variant = g_variant_get_child_value (real->current_dir, 1);
@@ -314,7 +314,7 @@ traverse_iter (OstreeRepo *repo,
while (TRUE)
{
- gs_unref_variant GVariant *key = NULL;
+ g_autoptr(GVariant) key = NULL;
OstreeRepoCommitIterResult iterres =
ostree_repo_commit_traverse_iter_next (iter, cancellable, error);
@@ -374,7 +374,7 @@ traverse_dirtree (OstreeRepo *repo,
GError **error)
{
gboolean ret = FALSE;
- gs_unref_variant GVariant *dirtree = NULL;
+ g_autoptr(GVariant) dirtree = NULL;
ostree_cleanup_repo_commit_traverse_iter
OstreeRepoCommitTraverseIter iter = { 0, };
@@ -422,8 +422,8 @@ ostree_repo_traverse_commit_union (OstreeRepo *repo,
while (TRUE)
{
gboolean recurse = FALSE;
- gs_unref_variant GVariant *key = NULL;
- gs_unref_variant GVariant *commit = NULL;
+ g_autoptr(GVariant) key = NULL;
+ g_autoptr(GVariant) commit = NULL;
ostree_cleanup_repo_commit_traverse_iter
OstreeRepoCommitTraverseIter iter = { 0, };
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 225a5b5..71f0ca3 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -703,7 +703,7 @@ keyfile_set_from_vardict (GKeyFile *keyfile,
g_variant_iter_init (&viter, vardict);
while (g_variant_iter_loop (&viter, "{&s v}", &key, &val))
{
- gs_unref_variant GVariant *child = g_variant_get_variant (val);
+ g_autoptr(GVariant) child = g_variant_get_variant (val);
if (g_variant_is_of_type (child, G_VARIANT_TYPE_STRING))
g_key_file_set_string (keyfile, section, key, g_variant_get_string (child, NULL));
else if (g_variant_is_of_type (child, G_VARIANT_TYPE_BOOLEAN))
@@ -1788,7 +1788,7 @@ load_metadata_internal (OstreeRepo *self,
char loose_path_buf[_OSTREE_LOOSE_PATH_MAX];
int fd = -1;
g_autoptr(GInputStream) ret_stream = NULL;
- gs_unref_variant GVariant *ret_variant = NULL;
+ g_autoptr(GVariant) ret_variant = NULL;
g_return_val_if_fail (OSTREE_OBJECT_TYPE_IS_META (objtype), FALSE);
@@ -1982,7 +1982,7 @@ ostree_repo_load_file (OstreeRepo *self,
OstreeRepoMode repo_mode;
g_autoptr(GInputStream) ret_input = NULL;
g_autoptr(GFileInfo) ret_file_info = NULL;
- gs_unref_variant GVariant *ret_xattrs = NULL;
+ g_autoptr(GVariant) ret_xattrs = NULL;
char loose_path_buf[_OSTREE_LOOSE_PATH_MAX];
repo_mode = ostree_repo_get_mode (self);
@@ -2031,7 +2031,7 @@ ostree_repo_load_file (OstreeRepo *self,
if (repo_mode == OSTREE_REPO_MODE_BARE_USER)
{
guint32 mode;
- gs_unref_variant GVariant *metadata = NULL;
+ g_autoptr(GVariant) metadata = NULL;
g_autoptr(GBytes) bytes = NULL;
gs_fd_close int fd = -1;
@@ -2187,7 +2187,7 @@ ostree_repo_load_object_stream (OstreeRepo *self,
{
g_autoptr(GInputStream) input = NULL;
g_autoptr(GFileInfo) finfo = NULL;
- gs_unref_variant GVariant *xattrs = NULL;
+ g_autoptr(GVariant) xattrs = NULL;
if (!ostree_repo_load_file (self, checksum, &input, &finfo, &xattrs,
cancellable, error))
@@ -2397,7 +2397,7 @@ copy_detached_metadata (OstreeRepo *self,
GError **error)
{
gboolean ret = FALSE;
- gs_unref_variant GVariant *detached_meta = NULL;
+ g_autoptr(GVariant) detached_meta = NULL;
if (!ostree_repo_read_commit_detached_metadata (source,
checksum, &detached_meta,
@@ -3065,8 +3065,8 @@ ostree_repo_append_gpg_signature (OstreeRepo *self,
GError **error)
{
gboolean ret = FALSE;
- gs_unref_variant GVariant *metadata = NULL;
- gs_unref_variant GVariant *new_metadata = NULL;
+ g_autoptr(GVariant) metadata = NULL;
+ g_autoptr(GVariant) new_metadata = NULL;
gs_unref_variant_builder GVariantBuilder *builder = NULL;
if (!ostree_repo_read_commit_detached_metadata (self,
@@ -3250,9 +3250,9 @@ ostree_repo_sign_commit (OstreeRepo *self,
gboolean ret = FALSE;
g_autoptr(GBytes) commit_data = NULL;
g_autoptr(GBytes) signature = NULL;
- gs_unref_variant GVariant *commit_variant = NULL;
- gs_unref_variant GVariant *old_metadata = NULL;
- gs_unref_variant GVariant *new_metadata = NULL;
+ g_autoptr(GVariant) commit_variant = NULL;
+ g_autoptr(GVariant) old_metadata = NULL;
+ g_autoptr(GVariant) new_metadata = NULL;
glnx_unref_object OstreeGpgVerifyResult *result = NULL;
GError *local_error = NULL;
@@ -3344,14 +3344,14 @@ ostree_repo_sign_delta (OstreeRepo *self,
gboolean ret = FALSE;
g_autoptr(GBytes) delta_data = NULL;
g_autoptr(GBytes) signature_data = NULL;
- gs_unref_variant GVariant *commit_variant = NULL;
+ g_autoptr(GVariant) commit_variant = NULL;
g_autofree char *delta_path = NULL;
g_autoptr(GFile) delta_file = NULL;
g_autofree char *detached_metadata_relpath = NULL;
g_autoptr(GFile) detached_metadata_path = NULL;
- gs_unref_variant GVariant *existing_detached_metadata = NULL;
- gs_unref_variant GVariant *normalized = NULL;
- gs_unref_variant GVariant *new_metadata = NULL;
+ g_autoptr(GVariant) existing_detached_metadata = NULL;
+ g_autoptr(GVariant) normalized = NULL;
+ g_autoptr(GVariant) new_metadata = NULL;
GError *temp_error = NULL;
detached_metadata_relpath =
@@ -3410,7 +3410,7 @@ _ostree_repo_gpg_verify_with_metadata (OstreeRepo *self,
{
OstreeGpgVerifyResult *result = NULL;
glnx_unref_object OstreeGpgVerifier *verifier = NULL;
- gs_unref_variant GVariant *signaturedata = NULL;
+ g_autoptr(GVariant) signaturedata = NULL;
GByteArray *buffer;
GVariantIter iter;
GVariant *child;
@@ -3534,9 +3534,9 @@ ostree_repo_verify_commit_ext (OstreeRepo *self,
GError **error)
{
OstreeGpgVerifyResult *result = NULL;
- gs_unref_variant GVariant *commit_variant = NULL;
+ g_autoptr(GVariant) commit_variant = NULL;
g_autoptr(GFile) keyringdir_ref = NULL;
- gs_unref_variant GVariant *metadata = NULL;
+ g_autoptr(GVariant) metadata = NULL;
g_autoptr(GBytes) signed_data = NULL;
g_autofree char *commit_filename = NULL;
@@ -3593,7 +3593,7 @@ ostree_repo_regenerate_summary (OstreeRepo *self,
gboolean ret = FALSE;
g_autoptr(GHashTable) refs = NULL;
gs_unref_variant_builder GVariantBuilder *refs_builder = NULL;
- gs_unref_variant GVariant *summary = NULL;
+ g_autoptr(GVariant) summary = NULL;
GList *ordered_keys = NULL;
GList *iter = NULL;
@@ -3609,7 +3609,7 @@ ostree_repo_regenerate_summary (OstreeRepo *self,
{
const char *ref = iter->data;
const char *commit = g_hash_table_lookup (refs, ref);
- gs_unref_variant GVariant *commit_obj = NULL;
+ g_autoptr(GVariant) commit_obj = NULL;
g_assert (commit);
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index b409a53..23ff169 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -44,7 +44,7 @@ dirfd_copy_attributes_and_xattrs (int src_parent_dfd,
{
gboolean ret = FALSE;
struct stat src_stbuf;
- gs_unref_variant GVariant *xattrs = NULL;
+ g_autoptr(GVariant) xattrs = NULL;
/* Clone all xattrs first, so we get the SELinux security context
* right. This will allow other users access if they have ACLs, but
@@ -1295,8 +1295,8 @@ install_deployment_kernel (OstreeSysroot *sysroot,
{
/* Try extracting a version for this deployment. */
const char *csum = ostree_deployment_get_csum (deployment);
- gs_unref_variant GVariant *variant = NULL;
- gs_unref_variant GVariant *metadata = NULL;
+ g_autoptr(GVariant) variant = NULL;
+ g_autoptr(GVariant) metadata = NULL;
/* XXX Copying ot_admin_checksum_version() + bits from
* ot-admin-builtin-status.c. Maybe this should be
diff --git a/src/libostree/ostree-sysroot-upgrader.c b/src/libostree/ostree-sysroot-upgrader.c
index eed779c..b3dcae2 100644
--- a/src/libostree/ostree-sysroot-upgrader.c
+++ b/src/libostree/ostree-sysroot-upgrader.c
@@ -404,8 +404,8 @@ ostree_sysroot_upgrader_check_timestamps (OstreeRepo *repo,
GError **error)
{
gboolean ret = FALSE;
- gs_unref_variant GVariant *old_commit = NULL;
- gs_unref_variant GVariant *new_commit = NULL;
+ g_autoptr(GVariant) old_commit = NULL;
+ g_autoptr(GVariant) new_commit = NULL;
if (!ostree_repo_load_variant (repo,
OSTREE_OBJECT_TYPE_COMMIT,
diff --git a/src/libotutil/ot-variant-utils.c b/src/libotutil/ot-variant-utils.c
index 52d95f3..1210a78 100644
--- a/src/libotutil/ot-variant-utils.c
+++ b/src/libotutil/ot-variant-utils.c
@@ -221,7 +221,7 @@ ot_util_variant_from_stream (GInputStream *src,
{
gboolean ret = FALSE;
g_autoptr(GMemoryOutputStream) data_stream = NULL;
- gs_unref_variant GVariant *ret_variant = NULL;
+ g_autoptr(GVariant) ret_variant = NULL;
data_stream = (GMemoryOutputStream*)g_memory_output_stream_new (NULL, 0, g_realloc, g_free);
@@ -308,7 +308,7 @@ ot_variant_bsearch_str (GVariant *array,
imin = 0;
while (imax >= imin)
{
- gs_unref_variant GVariant *child = NULL;
+ g_autoptr(GVariant) child = NULL;
const char *cur;
int cmp;
diff --git a/src/ostree/ot-admin-builtin-status.c b/src/ostree/ot-admin-builtin-status.c
index ce9263b..a4493f1 100644
--- a/src/ostree/ot-admin-builtin-status.c
+++ b/src/ostree/ot-admin-builtin-status.c
@@ -37,7 +37,7 @@ static GOptionEntry options[] = {
static char *
version_of_commit (OstreeRepo *repo, const char *checksum)
{
- gs_unref_variant GVariant *variant = NULL;
+ g_autoptr(GVariant) variant = NULL;
/* Shouldn't fail, but if it does, we ignore it */
if (!ostree_repo_load_variant (repo, OSTREE_OBJECT_TYPE_COMMIT, checksum,
diff --git a/src/ostree/ot-builtin-commit.c b/src/ostree/ot-builtin-commit.c
index 233da0f..0e68113 100644
--- a/src/ostree/ot-builtin-commit.c
+++ b/src/ostree/ot-builtin-commit.c
@@ -299,8 +299,8 @@ ostree_builtin_commit (int argc, char **argv, GCancellable *cancellable, GError
g_autofree char *parent = NULL;
g_autofree char *commit_checksum = NULL;
g_autoptr(GFile) root = NULL;
- gs_unref_variant GVariant *metadata = NULL;
- gs_unref_variant GVariant *detached_metadata = NULL;
+ g_autoptr(GVariant) metadata = NULL;
+ g_autoptr(GVariant) detached_metadata = NULL;
glnx_unref_object OstreeMutableTree *mtree = NULL;
g_autofree char *tree_type = NULL;
g_autoptr(GHashTable) mode_adds = NULL;
diff --git a/src/ostree/ot-builtin-fsck.c b/src/ostree/ot-builtin-fsck.c
index 86ca393..69bb2e4 100644
--- a/src/ostree/ot-builtin-fsck.c
+++ b/src/ostree/ot-builtin-fsck.c
@@ -47,10 +47,10 @@ load_and_fsck_one_object (OstreeRepo *repo,
{
gboolean ret = FALSE;
gboolean missing = FALSE;
- gs_unref_variant GVariant *metadata = NULL;
+ g_autoptr(GVariant) metadata = NULL;
g_autoptr(GInputStream) input = NULL;
g_autoptr(GFileInfo) file_info = NULL;
- gs_unref_variant GVariant *xattrs = NULL;
+ g_autoptr(GVariant) xattrs = NULL;
GError *temp_error = NULL;
if (OSTREE_OBJECT_TYPE_IS_META (objtype))
diff --git a/src/ostree/ot-builtin-gpg-sign.c b/src/ostree/ot-builtin-gpg-sign.c
index d1f016d..221e200 100644
--- a/src/ostree/ot-builtin-gpg-sign.c
+++ b/src/ostree/ot-builtin-gpg-sign.c
@@ -55,9 +55,9 @@ delete_signatures (OstreeRepo *repo,
{
GVariantDict metadata_dict;
glnx_unref_object OstreeGpgVerifyResult *result = NULL;
- gs_unref_variant GVariant *old_metadata = NULL;
- gs_unref_variant GVariant *new_metadata = NULL;
- gs_unref_variant GVariant *signature_data = NULL;
+ g_autoptr(GVariant) old_metadata = NULL;
+ g_autoptr(GVariant) new_metadata = NULL;
+ g_autoptr(GVariant) signature_data = NULL;
GVariantIter iter;
GVariant *child;
GQueue signatures = G_QUEUE_INIT;
diff --git a/src/ostree/ot-builtin-log.c b/src/ostree/ot-builtin-log.c
index e00ddd6..ab0f1f0 100644
--- a/src/ostree/ot-builtin-log.c
+++ b/src/ostree/ot-builtin-log.c
@@ -42,7 +42,7 @@ log_commit (OstreeRepo *repo,
OstreeDumpFlags flags,
GError **error)
{
- gs_unref_variant GVariant *variant = NULL;
+ g_autoptr(GVariant) variant = NULL;
g_autofree char *parent = NULL;
gboolean ret = FALSE;
GError *local_error = NULL;
diff --git a/src/ostree/ot-builtin-show.c b/src/ostree/ot-builtin-show.c
index 421d770..a1b4db5 100644
--- a/src/ostree/ot-builtin-show.c
+++ b/src/ostree/ot-builtin-show.c
@@ -52,7 +52,7 @@ do_print_variant_generic (const GVariantType *type,
{
gboolean ret = FALSE;
g_autoptr(GFile) f = NULL;
- gs_unref_variant GVariant *variant = NULL;
+ g_autoptr(GVariant) variant = NULL;
f = g_file_new_for_path (filename);
@@ -74,9 +74,9 @@ do_print_related (OstreeRepo *repo,
{
gboolean ret = FALSE;
const char *name;
- gs_unref_variant GVariant *csum_v = NULL;
- gs_unref_variant GVariant *variant = NULL;
- gs_unref_variant GVariant *related = NULL;
+ g_autoptr(GVariant) csum_v = NULL;
+ g_autoptr(GVariant) variant = NULL;
+ g_autoptr(GVariant) related = NULL;
GVariantIter *viter = NULL;
if (!ostree_repo_load_variant (repo, OSTREE_OBJECT_TYPE_COMMIT,
@@ -110,9 +110,9 @@ do_print_metadata_key (OstreeRepo *repo,
GError **error)
{
gboolean ret = FALSE;
- gs_unref_variant GVariant *value = NULL;
- gs_unref_variant GVariant *commit = NULL;
- gs_unref_variant GVariant *metadata = NULL;
+ g_autoptr(GVariant) value = NULL;
+ g_autoptr(GVariant) commit = NULL;
+ g_autoptr(GVariant) metadata = NULL;
if (!detached)
{
@@ -156,7 +156,7 @@ print_object (OstreeRepo *repo,
const char *checksum,
GError **error)
{
- gs_unref_variant GVariant *variant = NULL;
+ g_autoptr(GVariant) variant = NULL;
OstreeDumpFlags flags = OSTREE_DUMP_NONE;
gboolean ret = FALSE;
@@ -310,7 +310,7 @@ ostree_builtin_show (int argc, char **argv, GCancellable *cancellable, GError **
if (!found)
{
g_autoptr(GFileInfo) finfo = NULL;
- gs_unref_variant GVariant *xattrs = NULL;
+ g_autoptr(GVariant) xattrs = NULL;
GFileType filetype;
if (!ostree_repo_load_file (repo, rev, NULL, &finfo, &xattrs,
diff --git a/src/ostree/ot-dump.c b/src/ostree/ot-dump.c
index c76ea0a..dc2b3a0 100644
--- a/src/ostree/ot-dump.c
+++ b/src/ostree/ot-dump.c
@@ -32,7 +32,7 @@ void
ot_dump_variant (GVariant *variant)
{
g_autofree char *formatted_variant = NULL;
- gs_unref_variant GVariant *byteswapped = NULL;
+ g_autoptr(GVariant) byteswapped = NULL;
if (G_BYTE_ORDER != G_BIG_ENDIAN)
{
diff --git a/tests/test-gpg-verify-result.c b/tests/test-gpg-verify-result.c
index 19b23b8..fe22dc3 100644
--- a/tests/test-gpg-verify-result.c
+++ b/tests/test-gpg-verify-result.c
@@ -166,7 +166,7 @@ test_attribute_basics (TestFixture *fixture,
for (ii = 0; ii < n_signatures; ii++)
{
- gs_unref_variant GVariant *tuple = NULL;
+ g_autoptr(GVariant) tuple = NULL;
const char *attr_string;
const char *type_string;
gboolean key_missing;
@@ -215,7 +215,7 @@ test_valid_signature (TestFixture *fixture,
gconstpointer user_data)
{
guint signature_index = GPOINTER_TO_UINT (user_data);
- gs_unref_variant GVariant *tuple = NULL;
+ g_autoptr(GVariant) tuple = NULL;
gboolean valid;
gboolean sig_expired;
gboolean key_expired;
@@ -246,7 +246,7 @@ test_expired_key (TestFixture *fixture,
gconstpointer user_data)
{
guint signature_index = GPOINTER_TO_UINT (user_data);
- gs_unref_variant GVariant *tuple = NULL;
+ g_autoptr(GVariant) tuple = NULL;
gboolean valid;
gboolean sig_expired;
gboolean key_expired;
@@ -277,7 +277,7 @@ test_revoked_key (TestFixture *fixture,
gconstpointer user_data)
{
guint signature_index = GPOINTER_TO_UINT (user_data);
- gs_unref_variant GVariant *tuple = NULL;
+ g_autoptr(GVariant) tuple = NULL;
gboolean valid;
gboolean sig_expired;
gboolean key_expired;
@@ -308,7 +308,7 @@ test_missing_key (TestFixture *fixture,
gconstpointer user_data)
{
guint signature_index = GPOINTER_TO_UINT (user_data);
- gs_unref_variant GVariant *tuple = NULL;
+ g_autoptr(GVariant) tuple = NULL;
gboolean valid;
gboolean sig_expired;
gboolean key_expired;
@@ -339,7 +339,7 @@ test_expired_signature (TestFixture *fixture,
gconstpointer user_data)
{
guint signature_index = GPOINTER_TO_UINT (user_data);
- gs_unref_variant GVariant *tuple = NULL;
+ g_autoptr(GVariant) tuple = NULL;
gboolean valid;
gboolean sig_expired;
gboolean key_expired;
diff --git a/tests/test-varint.c b/tests/test-varint.c
index c62b397..2393113 100644
--- a/tests/test-varint.c
+++ b/tests/test-varint.c
@@ -35,7 +35,7 @@ check_one_roundtrip (guint64 val)
_ostree_write_varuint64 (buf, val);
if (g_test_verbose ())
{
- gs_unref_variant GVariant *v = g_variant_new_from_data (G_VARIANT_TYPE ("ay"), buf->str, buf->len,
TRUE, NULL, NULL);
+ g_autoptr(GVariant) v = g_variant_new_from_data (G_VARIANT_TYPE ("ay"), buf->str, buf->len, TRUE,
NULL, NULL);
g_autofree char *data = g_variant_print (v, FALSE);
g_test_message ("%" G_GUINT64_FORMAT " -> %s", val, data);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
