From f9be8c0fcf59eb66ece264b1bc33cefef6a9c64f Mon Sep 17 00:00:00 2001 From: Grzegorz Antoniak Date: Mon, 2 Jul 2018 08:25:22 +0200 Subject: [PATCH] Fixed a 'maybe uninitialized' warning and a code style change. Closes: #1851 Approved by: alexlarsson --- common/flatpak-run.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/flatpak-run.c b/common/flatpak-run.c index e70ed2a2..14bc2816 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c @@ -2296,7 +2296,7 @@ flatpak_run_setup_base_argv (FlatpakBwrap *bwrap, FlatpakRunFlags flags, GError **error) { - g_autofree char *run_dir; + g_autofree char *run_dir = NULL; g_autofree char *passwd_contents = NULL; g_autofree char *group_contents = NULL; const char *pkcs11_conf_contents = NULL; @@ -2304,14 +2304,14 @@ flatpak_run_setup_base_argv (FlatpakBwrap *bwrap, gulong pers; gid_t gid = getgid (); + g_autoptr(GFile) etc = NULL; + g = getgrgid (gid); if(g == NULL) return flatpak_fail (error, "Invalid gid: %d", gid); run_dir = g_strdup_printf ("/run/user/%d", getuid ()); - g_autoptr(GFile) etc = NULL; - passwd_contents = g_strdup_printf ("%s:x:%d:%d:%s:%s:%s\n" "nfsnobody:x:65534:65534:Unmapped user:/:/sbin/nologin\n", g_get_user_name (),