aboutsummaryrefslogtreecommitdiffstats
path: root/wsutil/filesystem.c
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2017-07-18 00:22:25 +0100
committerMichael Mann <mmann78@netscape.net>2017-08-01 21:20:37 +0000
commitfb052a637fe41ab87af98753593a8cd5a07735de (patch)
tree9de099f1966f9ea35037fdfb0a7fe91811c60100 /wsutil/filesystem.c
parenteeab5f48fe6da19f1519149a5ea57b1ab7466e0d (diff)
Use g_build_filename() instead, fix indentation
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>
Diffstat (limited to 'wsutil/filesystem.c')
-rw-r--r--wsutil/filesystem.c9
1 files 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;