From: Antoine Busque <abusque@efficios.com>
Date: Mon, 18 Apr 2016 22:34:11 +0000 (-0400)
Subject: Print bin location first
X-Git-Tag: v1.4.0-rc1~61
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=7fd3113e7081a50aab48adb346005d56a16fadbb

Print bin location first

Signed-off-by: Antoine Busque <abusque@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/include/babeltrace/trace-debuginfo.h b/include/babeltrace/trace-debuginfo.h
index 2733e99a..ed629231 100644
--- a/include/babeltrace/trace-debuginfo.h
+++ b/include/babeltrace/trace-debuginfo.h
@@ -52,10 +52,22 @@ void ctf_text_integer_write_debug_info(struct bt_stream_pos *ppos,
 
 			fprintf(pos->fp, ", debug_info = { ");
 
+			if (debug_info_src->bin_path) {
+				fprintf(pos->fp, "bin = \"%s%s\"",
+						opt_debug_info_full_path ?
+						debug_info_src->bin_path :
+						debug_info_src->short_bin_path,
+						debug_info_src->bin_loc);
+				add_comma = true;
+			}
+
 			if (debug_info_src->func) {
+				if (add_comma) {
+					fprintf(pos->fp, ", ");
+				}
+
 				fprintf(pos->fp, "func = \"%s\"",
 						debug_info_src->func);
-				add_comma = true;
 			}
 
 			if (debug_info_src->src_path) {
@@ -71,18 +83,6 @@ void ctf_text_integer_write_debug_info(struct bt_stream_pos *ppos,
 						debug_info_src->line_no);
 			}
 
-			if (debug_info_src->bin_path) {
-				if (add_comma) {
-					fprintf(pos->fp, ", ");
-				}
-
-				fprintf(pos->fp, "bin = \"%s%s\"",
-						opt_debug_info_full_path ?
-						debug_info_src->bin_path :
-						debug_info_src->short_bin_path,
-						debug_info_src->bin_loc);
-			}
-
 			fprintf(pos->fp, " }");
 		}
 	}