forked from osmocom/wireshark
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>
This commit is contained in:
parent
eeab5f48fe
commit
fb052a637f
|
@ -1849,14 +1849,11 @@ get_persconffile_path(const char *filename, gboolean from_profile)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (from_profile) {
|
if (from_profile) {
|
||||||
dir = get_persconffile_dir(persconfprofile);
|
dir = get_persconffile_dir(persconfprofile);
|
||||||
path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s",
|
|
||||||
dir, filename);
|
|
||||||
} else {
|
} else {
|
||||||
dir = get_persconffile_dir(NULL);
|
dir = get_persconffile_dir(NULL);
|
||||||
path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s",
|
|
||||||
dir, filename);
|
|
||||||
}
|
}
|
||||||
|
path = g_build_filename(dir, filename, NULL);
|
||||||
|
|
||||||
g_free(dir);
|
g_free(dir);
|
||||||
return path;
|
return path;
|
||||||
|
|
Loading…
Reference in New Issue