X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2Fdebuginfo.c;h=3d033b9a3b9073d9aaa589ff9bce80b77bd4205f;hp=7d12ebd27da0fa66d38294e9efd53c623896dc8b;hb=ed02dbd550e1e068ae06b1ec5969fe1c49aec357;hpb=306dbb33cef20de141e182869fd8f1dec63ecb00

diff --git a/lib/debuginfo.c b/lib/debuginfo.c
index 7d12ebd2..3d033b9a 100644
--- a/lib/debuginfo.c
+++ b/lib/debuginfo.c
@@ -32,6 +32,7 @@
 #include <babeltrace/debuginfo.h>
 #include <babeltrace/so-info.h>
 #include <babeltrace/babeltrace-internal.h>
+#include <babeltrace/utils.h>
 
 struct proc_debug_info_sources {
 	/*
@@ -89,37 +90,6 @@ void debug_info_source_destroy(struct debug_info_source *debug_info_src)
 	g_free(debug_info_src);
 }
 
-/*
- * Returns the location of a path's file (the last element of the path).
- * Returns the original path on error.
- */
-static
-const char *get_filename_from_path(const char *path)
-{
-	size_t i = strlen(path);
-
-	if (i == 0) {
-		goto end;
-	}
-
-	if (path[i - 1] == '/') {
-		/*
-		 * Path ends with a trailing slash, no filename to return.
-		 * Return the original path.
-		 */
-		goto end;
-	}
-
-	while (i-- > 0) {
-		if (path[i] == '/') {
-			path = &path[i + 1];
-			goto end;
-		}
-	}
-end:
-	return path;
-}
-
 static
 struct debug_info_source *debug_info_source_create_from_so(struct so_info *so,
 		uint64_t ip)
@@ -159,8 +129,7 @@ struct debug_info_source *debug_info_source_create_from_so(struct so_info *so,
 			}
 
 			debug_info_src->short_src_path = get_filename_from_path(
-					src_loc->filename);
-
+					debug_info_src->src_path);
 		}
 
 		source_location_destroy(src_loc);