Skip to content
Snippets Groups Projects
Commit 5eb3584e authored by Simon McVittie's avatar Simon McVittie
Browse files

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: default avatarSimon McVittie <smcv@collabora.com>
parent 42124d4f
No related branches found
No related tags found
1 merge request!207Refactoring from Flatpak branch
Pipeline #6924 passed
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment