From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 23 May 2019 19:02:38 +0000 (-0400)
Subject: Replace g_build_path with g_build_filename for portability
X-Git-Tag: v2.0.0-rc1~813
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=3948c5c48fd6ba502b0a4cba92562b3ab7d402d0

Replace g_build_path with g_build_filename for portability

g_build_filename will use the correct separator depending on the
platform.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: Iaeeb1a4c30aaea7690ba479ba05108c6fc57dd4e
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1331
Tested-by: jenkins
Reviewed-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/plugins/lttng-utils/debug-info/bin-info.c b/plugins/lttng-utils/debug-info/bin-info.c
index eeac6b4b..f861b2ed 100644
--- a/plugins/lttng-utils/debug-info/bin-info.c
+++ b/plugins/lttng-utils/debug-info/bin-info.c
@@ -90,8 +90,7 @@ struct bin_info *bin_info_create(struct bt_fd_cache *fdc, const char *path,
 	}
 
 	if (target_prefix) {
-		bin->elf_path = g_build_path("/", target_prefix,
-						path, NULL);
+		bin->elf_path = g_build_filename(target_prefix,	path, NULL);
 	} else {
 		bin->elf_path = g_strdup(path);
 	}
@@ -592,7 +591,7 @@ int bin_info_set_dwarf_info_build_id(struct bin_info *bin)
 	g_snprintf(&build_id_file[build_id_char_len], build_id_suffix_char_len,
 		BUILD_ID_SUFFIX);
 
-	path = g_build_path("/", dbg_dir, BUILD_ID_SUBDIR, build_id_file, NULL);
+	path = g_build_filename(dbg_dir, BUILD_ID_SUBDIR, build_id_file, NULL);
 	if (!path) {
 		goto error;
 	}