diff --git a/libglnx b/libglnx index 627d4e2f..e627524a 160000 --- a/libglnx +++ b/libglnx @@ -1 +1 @@ -Subproject commit 627d4e2f15572e853279d4bb9511ef2618bef6b5 +Subproject commit e627524af9ae499c1edd04795442f8bdb05b5223 diff --git a/src/app/rpmostree-compose-builtin-tree.c b/src/app/rpmostree-compose-builtin-tree.c index 801b7f3a..ba977e70 100644 --- a/src/app/rpmostree-compose-builtin-tree.c +++ b/src/app/rpmostree-compose-builtin-tree.c @@ -124,7 +124,7 @@ rpm_ostree_tree_compose_context_free (RpmOstreeTreeComposeContext *ctx) /* Only close workdir_dfd if it's not owned by the tmpdir */ if (!ctx->workdir_tmp.initialized && ctx->workdir_dfd != -1) (void) close (ctx->workdir_dfd); - glnx_tmpdir_clear (&ctx->workdir_tmp); + (void)glnx_tmpdir_delete (&ctx->workdir_tmp, NULL, NULL); if (ctx->rootfs_dfd != -1) (void) close (ctx->rootfs_dfd); if (ctx->cachedir_dfd != -1) diff --git a/src/daemon/rpmostree-sysroot-upgrader.c b/src/daemon/rpmostree-sysroot-upgrader.c index cdaeed89..9cc1ad9c 100644 --- a/src/daemon/rpmostree-sysroot-upgrader.c +++ b/src/daemon/rpmostree-sysroot-upgrader.c @@ -200,7 +200,7 @@ rpmostree_sysroot_upgrader_finalize (GObject *object) if (self->tmprootfs_dfd != -1) (void)close (self->tmprootfs_dfd); - glnx_tmpdir_clear (&self->metatmpdir); + (void)glnx_tmpdir_delete (&self->metatmpdir, NULL, NULL); g_clear_pointer (&self->devino_cache, (GDestroyNotify)ostree_repo_devino_cache_unref); diff --git a/src/libpriv/rpmostree-bwrap.c b/src/libpriv/rpmostree-bwrap.c index 05ff2b4b..c8b1c547 100644 --- a/src/libpriv/rpmostree-bwrap.c +++ b/src/libpriv/rpmostree-bwrap.c @@ -96,7 +96,7 @@ rpmostree_bwrap_unref (RpmOstreeBwrap *bwrap) if (tmp_error) sd_journal_print (LOG_WARNING, "%s", tmp_error->message); } - glnx_tmpdir_clear (&bwrap->rofiles_mnt); + (void)glnx_tmpdir_delete (&bwrap->rofiles_mnt, NULL, NULL); g_ptr_array_unref (bwrap->argv); g_free (bwrap); diff --git a/src/libpriv/rpmostree-core.c b/src/libpriv/rpmostree-core.c index f0119716..9a4eff38 100644 --- a/src/libpriv/rpmostree-core.c +++ b/src/libpriv/rpmostree-core.c @@ -284,7 +284,7 @@ rpmostree_context_finalize (GObject *object) g_clear_pointer (&rctx->pkgs_to_remove, g_hash_table_unref); g_clear_pointer (&rctx->pkgs_to_replace, g_hash_table_unref); - glnx_tmpdir_clear (&rctx->tmpdir); + (void)glnx_tmpdir_delete (&rctx->tmpdir, NULL, NULL); G_OBJECT_CLASS (rpmostree_context_parent_class)->finalize (object); } diff --git a/src/libpriv/rpmostree-refsack.c b/src/libpriv/rpmostree-refsack.c index 06fec088..d5370679 100644 --- a/src/libpriv/rpmostree-refsack.c +++ b/src/libpriv/rpmostree-refsack.c @@ -55,6 +55,6 @@ rpmostree_refsack_unref (RpmOstreeRefSack *rsack) /* The sack might point to a temporarily allocated rpmdb copy, if so, * prune it now. */ - glnx_tmpdir_clear (&rsack->tmpdir); + (void)glnx_tmpdir_delete (&rsack->tmpdir, NULL, NULL); g_free (rsack); } diff --git a/src/libpriv/rpmostree-refts.c b/src/libpriv/rpmostree-refts.c index 67472b41..26288ae7 100644 --- a/src/libpriv/rpmostree-refts.c +++ b/src/libpriv/rpmostree-refts.c @@ -58,6 +58,6 @@ rpmostree_refts_unref (RpmOstreeRefTs *rts) if (!g_atomic_int_dec_and_test (&rts->refcount)) return; rpmtsFree (rts->ts); - glnx_tmpdir_clear (&rts->tmpdir); + (void)glnx_tmpdir_delete (&rts->tmpdir, NULL, NULL); g_free (rts); }