From: Francis Deslauriers <francis.deslauriers@efficios.com>
Date: Wed, 20 Mar 2019 13:05:14 +0000 (-0400)
Subject: flt.lttng-utils.debug-info: fix: set but not used warnings
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=3b40fbf920d1549bc85ef7e9eac478800c830ca2;hp=38cda5da795de933c79e8c79b6dcec930c2ce042;p=babeltrace.git

flt.lttng-utils.debug-info: fix: set but not used warnings

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
---

diff --git a/plugins/lttng-utils/debug-info.c b/plugins/lttng-utils/debug-info.c
index fbffff2f..c15f473d 100644
--- a/plugins/lttng-utils/debug-info.c
+++ b/plugins/lttng-utils/debug-info.c
@@ -557,6 +557,9 @@ void debug_info_destroy(struct debug_info *debug_info)
 
 	status = bt_trace_remove_destruction_listener(debug_info->input_trace,
 			debug_info->destruction_listener_id);
+	if (status != BT_TRACE_STATUS_OK) {
+		BT_LOGD("Trace destruction listener removal failed.");
+	}
 
 	g_free(debug_info);
 end:
diff --git a/plugins/lttng-utils/trace-ir-data-copy.c b/plugins/lttng-utils/trace-ir-data-copy.c
index 36d8db9f..0d69b4cf 100644
--- a/plugins/lttng-utils/trace-ir-data-copy.c
+++ b/plugins/lttng-utils/trace-ir-data-copy.c
@@ -62,17 +62,12 @@ end:
 BT_HIDDEN
 void copy_stream_content(const bt_stream *in_stream, bt_stream *out_stream)
 {
-	const bt_trace *in_trace;
-	const bt_stream_class *in_stream_class;
 	const char *stream_name;
 	bt_stream_status status;
 
 	BT_LOGD("Copying content of stream: in-s-addr=%p, out-s-addr=%p",
 			in_stream, out_stream);
 
-	in_stream_class = bt_stream_borrow_class_const(in_stream);
-	in_trace = bt_stream_borrow_trace_const(in_stream);
-
 	stream_name = bt_stream_get_name(in_stream);
 	if (stream_name) {
 		status = bt_stream_set_name(out_stream, stream_name);
diff --git a/plugins/lttng-utils/trace-ir-mapping.c b/plugins/lttng-utils/trace-ir-mapping.c
index 0b3defc0..3ed687c6 100644
--- a/plugins/lttng-utils/trace-ir-mapping.c
+++ b/plugins/lttng-utils/trace-ir-mapping.c
@@ -569,6 +569,9 @@ void trace_ir_data_maps_destroy(struct trace_ir_data_maps *maps)
 
 	status = bt_trace_remove_destruction_listener(maps->input_trace,
 			maps->destruction_listener_id);
+	if (status != BT_TRACE_STATUS_OK) {
+		BT_LOGD("Trace destruction listener removal failed.");
+	}
 
 	g_free(maps);
 }
@@ -607,6 +610,9 @@ void trace_ir_metadata_maps_destroy(struct trace_ir_metadata_maps *maps)
 
 	status = bt_trace_class_remove_destruction_listener(maps->input_trace_class,
 			maps->destruction_listener_id);
+	if (status != BT_TRACE_CLASS_STATUS_OK) {
+		BT_LOGD("Trace destruction listener removal failed.");
+	}
 
 	g_free(maps);
 }
diff --git a/plugins/lttng-utils/trace-ir-metadata-field-class-copy.c b/plugins/lttng-utils/trace-ir-metadata-field-class-copy.c
index b56ba959..b6326e96 100644
--- a/plugins/lttng-utils/trace-ir-metadata-field-class-copy.c
+++ b/plugins/lttng-utils/trace-ir-metadata-field-class-copy.c
@@ -470,7 +470,7 @@ int field_class_dynamic_array_copy(
 		const bt_field_class *in_field_class,
 		bt_field_class *out_field_class)
 {
-	const bt_field_class *element_fc, *len_fc;
+	const bt_field_class *len_fc;
 	const bt_field_path *len_fp;
 	bt_field_class_status status;
 	bt_field_class *out_len_field_class;
@@ -480,8 +480,6 @@ int field_class_dynamic_array_copy(
 			"in-fc-addr=%p, out-fc-addr=%p",
 			in_field_class, out_field_class);
 
-	element_fc = bt_field_class_array_borrow_element_field_class_const(
-			in_field_class);
 	len_fp = bt_field_class_dynamic_array_borrow_length_field_path_const(
 			in_field_class);