From fb052a637fe41ab87af98753593a8cd5a07735de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@tecnico.ulisboa.pt>
Date: Tue, 18 Jul 2017 00:22:25 +0100
Subject: [PATCH] Use g_build_filename() instead, fix indentation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I459208eed4a76b104bc28aa44ab05374e57043de
Reviewed-on: https://code.wireshark.org/review/22873
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
---
 wsutil/filesystem.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c
index 4d28db0dc7..7efdf79ec3 100644
--- a/wsutil/filesystem.c
+++ b/wsutil/filesystem.c
@@ -1849,14 +1849,11 @@ get_persconffile_path(const char *filename, gboolean from_profile)
     }
 
     if (from_profile) {
-      dir = get_persconffile_dir(persconfprofile);
-      path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s",
-                 dir, filename);
+        dir = get_persconffile_dir(persconfprofile);
     } else {
-      dir = get_persconffile_dir(NULL);
-      path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s",
-                 dir, filename);
+        dir = get_persconffile_dir(NULL);
     }
+    path = g_build_filename(dir, filename, NULL);
 
     g_free(dir);
     return path;