diff options
author | Colin Walters <walters@verbum.org> | 2016-03-17 11:22:25 -0400 |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2016-03-18 12:08:19 -0400 |
commit | c58ad36840da4a23dac49434b19ed4f77c22946f (patch) | |
tree | a859824ba80d44b07b2f3535a434083a3f2d9b67 | |
parent | b67f5364ac5b74e96171ba6683d88c2e5752d8e8 (diff) | |
download | ostree-c58ad36840da4a23dac49434b19ed4f77c22946f.tar.gz |
libglnx porting: gs_transfer_out_value -> g_steal_pointer
It's a bit more verbose but...eh.
-rw-r--r-- | src/libostree/ostree-core.c | 6 | ||||
-rw-r--r-- | src/libostree/ostree-repo-commit.c | 9 | ||||
-rw-r--r-- | src/libostree/ostree-repo-pull.c | 3 | ||||
-rw-r--r-- | src/libostree/ostree-repo-static-delta-compilation-analysis.c | 6 | ||||
-rw-r--r-- | src/libostree/ostree-repo-static-delta-compilation.c | 12 | ||||
-rw-r--r-- | src/libostree/ostree-repo-traverse.c | 3 | ||||
-rw-r--r-- | src/libostree/ostree-repo.c | 9 | ||||
-rw-r--r-- | src/libostree/ostree-sepolicy.c | 3 | ||||
-rw-r--r-- | src/libostree/ostree-sysroot-deploy.c | 3 | ||||
-rw-r--r-- | src/libostree/ostree-sysroot.c | 12 | ||||
-rw-r--r-- | src/ostree/ot-main.c | 6 |
11 files changed, 48 insertions, 24 deletions
diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c index 219eb2b7..ded5e976 100644 --- a/src/libostree/ostree-core.c +++ b/src/libostree/ostree-core.c @@ -155,7 +155,8 @@ ostree_parse_refspec (const char *refspec, ret = TRUE; - gs_transfer_out_value (out_remote, &remote); + if (out_remote) + *out_remote = g_steal_pointer (&remote); if (out_ref != NULL) *out_ref = g_match_info_fetch (match, 2); out: @@ -951,7 +952,8 @@ _ostree_make_temporary_symlink_at (int tmp_dirfd, } ret = TRUE; - gs_transfer_out_value (out_name, &tmpname); + if (out_name) + *out_name = g_steal_pointer (&tmpname); out: return ret; } diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c index 94c9f730..083c0265 100644 --- a/src/libostree/ostree-repo-commit.c +++ b/src/libostree/ostree-repo-commit.c @@ -597,7 +597,8 @@ _ostree_repo_open_trusted_content_bare (OstreeRepo *self, out_state->temp_filename = temp_filename; temp_filename = NULL; out_state->fd = g_file_descriptor_based_get_fd ((GFileDescriptorBased*)ret_stream); - gs_transfer_out_value (out_stream, &ret_stream); + if (out_stream) + *out_stream = g_steal_pointer (&ret_stream); } *out_have_object = have_obj; out: @@ -2372,7 +2373,8 @@ get_modified_xattrs (OstreeRepo *self, } ret = TRUE; - gs_transfer_out_value (out_xattrs, &ret_xattrs); + if (out_xattrs) + *out_xattrs = g_steal_pointer (&ret_xattrs); out: return ret; } @@ -2967,7 +2969,8 @@ ostree_repo_write_mtree (OstreeRepo *self, } ret = TRUE; - ot_transfer_out_value (out_file, &ret_file); + if (out_file) + *out_file = g_steal_pointer (&ret_file); out: return ret; } diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c index 39ddfda8..ad4753ad 100644 --- a/src/libostree/ostree-repo-pull.c +++ b/src/libostree/ostree-repo-pull.c @@ -1437,7 +1437,8 @@ request_static_delta_superblock_sync (OtPullData *pull_data, } ret = TRUE; - gs_transfer_out_value (out_delta_superblock, &ret_delta_superblock); + if (out_delta_superblock) + *out_delta_superblock = g_steal_pointer (&ret_delta_superblock); out: return ret; } diff --git a/src/libostree/ostree-repo-static-delta-compilation-analysis.c b/src/libostree/ostree-repo-static-delta-compilation-analysis.c index 876c041f..ae5b8dec 100644 --- a/src/libostree/ostree-repo-static-delta-compilation-analysis.c +++ b/src/libostree/ostree-repo-static-delta-compilation-analysis.c @@ -181,7 +181,8 @@ build_content_sizenames_filtered (OstreeRepo *repo, g_ptr_array_sort (ret_sizenames, compare_sizenames); ret = TRUE; - gs_transfer_out_value (out_sizenames, &ret_sizenames); + if (out_sizenames) + *out_sizenames = g_steal_pointer (&ret_sizenames); out: return ret; } @@ -296,7 +297,8 @@ _ostree_delta_compute_similar_objects (OstreeRepo *repo, } ret = TRUE; - gs_transfer_out_value (out_modified_regfile_content, &ret_modified_regfile_content); + if (out_modified_regfile_content) + *out_modified_regfile_content = g_steal_pointer (&ret_modified_regfile_content); out: return ret; } diff --git a/src/libostree/ostree-repo-static-delta-compilation.c b/src/libostree/ostree-repo-static-delta-compilation.c index e07d4938..301ef99d 100644 --- a/src/libostree/ostree-repo-static-delta-compilation.c +++ b/src/libostree/ostree-repo-static-delta-compilation.c @@ -488,7 +488,8 @@ get_unpacked_unlinked_content (OstreeRepo *repo, } ret = TRUE; - gs_transfer_out_value (out_content, &ret_content); + if (out_content) + *out_content = g_steal_pointer (&ret_content); out: return ret; } @@ -532,7 +533,8 @@ try_content_bsdiff (OstreeRepo *repo, ret_bsdiff->tmp_to = tmp_to; tmp_to = NULL; ret = TRUE; - gs_transfer_out_value (out_bsdiff, &ret_bsdiff); + if (out_bsdiff) + *out_bsdiff = g_steal_pointer (&ret_bsdiff); out: return ret; } @@ -597,7 +599,8 @@ try_content_rollsum (OstreeRepo *repo, ret_rollsum->tmp_to = tmp_to; tmp_to = NULL; ret = TRUE; - gs_transfer_out_value (out_rollsum, &ret_rollsum); + if (out_rollsum) + *out_rollsum = g_steal_pointer (&ret_rollsum); out: if (matches) _ostree_rollsum_matches_free (matches); @@ -1199,7 +1202,8 @@ get_fallback_headers (OstreeRepo *self, ret_headers = g_variant_ref_sink (g_variant_builder_end (fallback_builder)); ret = TRUE; - gs_transfer_out_value (out_headers, &ret_headers); + if (out_headers) + *out_headers = g_steal_pointer (&ret_headers); out: return ret; } diff --git a/src/libostree/ostree-repo-traverse.c b/src/libostree/ostree-repo-traverse.c index f442343b..85ce317d 100644 --- a/src/libostree/ostree-repo-traverse.c +++ b/src/libostree/ostree-repo-traverse.c @@ -503,7 +503,8 @@ ostree_repo_traverse_commit (OstreeRepo *repo, goto out; ret = TRUE; - gs_transfer_out_value (out_reachable, &ret_reachable); + if (out_reachable) + *out_reachable = g_steal_pointer (&ret_reachable); out: return ret; } diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c index a0e45c36..2d6db1ff 100644 --- a/src/libostree/ostree-repo.c +++ b/src/libostree/ostree-repo.c @@ -2105,7 +2105,8 @@ enumerate_directory_allow_noent (GFile *dirpath, } ret = TRUE; - gs_transfer_out_value (out_direnum, &ret_direnum); + if (out_direnum) + *out_direnum = g_steal_pointer (&ret_direnum); out: return ret; } @@ -2763,7 +2764,8 @@ query_info_for_bare_content_object (OstreeRepo *self, } ret = TRUE; - gs_transfer_out_value (out_info, &ret_info); + if (out_info) + *out_info = g_steal_pointer (&ret_info); out: return ret; } @@ -4078,7 +4080,8 @@ sign_data (OstreeRepo *self, ret_signature = g_mapped_file_get_bytes (signature_file); ret = TRUE; - gs_transfer_out_value (out_signature, &ret_signature); + if (out_signature) + *out_signature = g_steal_pointer (&ret_signature); out: if (commit_buffer) gpgme_data_release (commit_buffer); diff --git a/src/libostree/ostree-sepolicy.c b/src/libostree/ostree-sepolicy.c index 68a184b0..5580ac94 100644 --- a/src/libostree/ostree-sepolicy.c +++ b/src/libostree/ostree-sepolicy.c @@ -450,7 +450,8 @@ ostree_sepolicy_restorecon (OstreeSePolicy *self, } ret = TRUE; - gs_transfer_out_value (out_new_label, &label); + if (out_new_label) + *out_new_label = g_steal_pointer (&label); out: return ret; #else diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c index 5779d7c8..5f8e4231 100644 --- a/src/libostree/ostree-sysroot-deploy.c +++ b/src/libostree/ostree-sysroot-deploy.c @@ -873,7 +873,8 @@ merge_configuration (OstreeSysroot *sysroot, } ret = TRUE; - gs_transfer_out_value (out_sepolicy, &sepolicy); + if (out_sepolicy) + *out_sepolicy = g_steal_pointer (&sepolicy); out: return ret; } diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c index b1220408..aa08838a 100644 --- a/src/libostree/ostree-sysroot.c +++ b/src/libostree/ostree-sysroot.c @@ -498,7 +498,8 @@ _ostree_sysroot_read_boot_loader_configs (OstreeSysroot *self, g_ptr_array_sort (ret_loader_configs, compare_loader_configs_for_sorting); done: - gs_transfer_out_value (out_loader_configs, &ret_loader_configs); + if (out_loader_configs) + *out_loader_configs = g_steal_pointer (&ret_loader_configs); ret = TRUE; out: return ret; @@ -593,7 +594,8 @@ parse_origin (OstreeSysroot *self, } ret = TRUE; - gs_transfer_out_value (out_origin, &ret_origin); + if (out_origin) + *out_origin = g_steal_pointer (&ret_origin); out: if (error) g_prefix_error (error, "Parsing %s: ", origin_path); @@ -703,7 +705,8 @@ parse_deployment (OstreeSysroot *self, ostree_deployment_set_origin (ret_deployment, origin); ret = TRUE; - gs_transfer_out_value (out_deployment, &ret_deployment); + if (out_deployment) + *out_deployment = g_steal_pointer (&ret_deployment); out: if (origin) g_key_file_unref (origin); @@ -1048,7 +1051,8 @@ _ostree_sysroot_query_bootloader (OstreeSysroot *sysroot, g_clear_object (&ret_loader); ret = TRUE; - gs_transfer_out_value (out_bootloader, &ret_loader); + if (out_bootloader) + *out_bootloader = g_steal_pointer (&ret_loader); out: return ret; } diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c index 5b54af4c..51282f92 100644 --- a/src/ostree/ot-main.c +++ b/src/ostree/ot-main.c @@ -294,7 +294,8 @@ ostree_option_context_parse (GOptionContext *context, } } - gs_transfer_out_value (out_repo, &repo); + if (out_repo) + *out_repo = g_steal_pointer (&repo); success = TRUE; @@ -375,7 +376,8 @@ ostree_admin_option_context_parse (GOptionContext *context, goto out; } - gs_transfer_out_value (out_sysroot, &sysroot); + if (out_sysroot) + *out_sysroot = g_steal_pointer (&sysroot); success = TRUE; |