tap-driver.sh: flush stdout after each test result

[babeltrace.git] / plugins / lttng-utils / debug-info / bin-info.c

diff --git a/plugins/lttng-utils/debug-info/bin-info.c b/plugins/lttng-utils/debug-info/bin-info.c
index 6dfbc6a439750560e396f6cd5bb9dde3827a19e5..bad796d225dd7aa43921ca0e49bd3865f857b986 100644 (file)
--- a/plugins/lttng-utils/debug-info/bin-info.c
+++ b/plugins/lttng-utils/debug-info/bin-info.c
@@ -42,7 +42,7 @@
 
 #include <glib.h>
 
-#include <babeltrace/common-internal.h>
+#include <babeltrace2/common-internal.h>
 
 #include "bin-info.h"
 #include "crc32.h"
@@ -1396,7 +1396,7 @@ int bin_info_lookup_cu_src_loc_no_inl(struct bt_dwarf_cu *cu, uint64_t addr,
        const char *filename = NULL;
        Dwarf_Line *line = NULL;
        Dwarf_Addr line_addr;
-       int ret, line_no;
+       int ret = 0, line_no;
 
        if (!cu || !src_loc) {
                goto error;
@@ -1438,19 +1438,18 @@ int bin_info_lookup_cu_src_loc_no_inl(struct bt_dwarf_cu *cu, uint64_t addr,
                _src_loc->filename = g_strdup(filename);
        }
 
-       bt_dwarf_die_destroy(die);
-
        if (_src_loc) {
                *src_loc = _src_loc;
        }
 
-end:
-       return 0;
+       goto end;
 
 error:
        source_location_destroy(_src_loc);
+       ret = -1;
+end:
        bt_dwarf_die_destroy(die);
-       return -1;
+       return ret;
 }
 
 /**