From 5eb3584e3d9dea572c0ce8c33082978288c77fb6 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Mon, 14 Dec 2020 17:31:15 +0000 Subject: [PATCH] pressure-vessel: Narrow the scope of a variable It's easier to be sure that we are not using this variable outside the expected range of lines if it's only declared within those lines. Signed-off-by: Simon McVittie <smcv@collabora.com> --- pressure-vessel/wrap.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pressure-vessel/wrap.c b/pressure-vessel/wrap.c index 9baa01c3d..cec7d2e26 100644 --- a/pressure-vessel/wrap.c +++ b/pressure-vessel/wrap.c @@ -1212,7 +1212,6 @@ main (int argc, int original_argc = argc; gboolean is_flatpak_env = g_file_test ("/.flatpak-info", G_FILE_TEST_IS_REGULAR); g_autoptr(FlatpakBwrap) bwrap = NULL; - g_autoptr(FlatpakBwrap) exports_bwrap = NULL; g_autoptr(FlatpakExports) exports = NULL; g_autoptr(FlatpakBwrap) adverb_args = NULL; g_autofree gchar *adverb_in_container = NULL; @@ -1973,10 +1972,15 @@ main (int argc, } /* Convert the exported directories into extra bubblewrap arguments */ - exports_bwrap = flatpak_bwrap_new (flatpak_bwrap_empty_env); - flatpak_exports_append_bwrap_args (exports, exports_bwrap); - adjust_exports (exports_bwrap, home); - flatpak_bwrap_append_bwrap (bwrap, exports_bwrap); + { + g_autoptr(FlatpakBwrap) exports_bwrap = + flatpak_bwrap_new (flatpak_bwrap_empty_env); + + flatpak_exports_append_bwrap_args (exports, exports_bwrap); + adjust_exports (exports_bwrap, home); + g_warn_if_fail (g_strv_length (exports_bwrap->envp) == 0); + flatpak_bwrap_append_bwrap (bwrap, exports_bwrap); + } flatpak_run_add_font_path_args (bwrap); -- GitLab