X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fplugins%2Flttng-utils%2Fdebug-info%2Ftrace-ir-data-copy.c;h=6cac787f1e60fbd51aa58017f9b0490261294909;hp=19ad1f2f3b8f2cf68bdccdf26749945382520dab;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=3b34b490662585394be7352f3544367d4e50a5bc

diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c b/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c
index 19ad1f2f..6cac787f 100644
--- a/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c
+++ b/src/plugins/lttng-utils/debug-info/trace-ir-data-copy.c
@@ -1,26 +1,10 @@
 /*
- * Babeltrace - Trace IR data object copy
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2015-2019 EfficiOS Inc. and Linux Foundation
  * Copyright (c) 2019 Francis Deslauriers <francis.deslauriers@efficios.com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Babeltrace - Trace IR data object copy
  */
 
 #define BT_COMP_LOG_SELF_COMP self_comp
@@ -32,6 +16,7 @@
 #include <stdint.h>
 
 #include "common/assert.h"
+#include "common/common.h"
 
 #include "trace-ir-data-copy.h"
 
@@ -103,7 +88,7 @@ enum debug_info_trace_ir_mapping_status copy_trace_content(
 				out_trace, value_name,
 				bt_value_string_get(value));
 		} else {
-			abort();
+			bt_common_abort();
 		}
 
 		if (set_env_status != BT_TRACE_SET_ENVIRONMENT_ENTRY_STATUS_OK) {
@@ -422,18 +407,18 @@ enum debug_info_trace_ir_mapping_status copy_field_content(
 		}
 	} else if (bt_field_class_type_is(in_fc_type,
 			BT_FIELD_CLASS_TYPE_VARIANT)) {
-		bt_field_variant_select_option_field_by_index_status sel_opt_status;
+		bt_field_variant_select_option_by_index_status sel_opt_status;
 		uint64_t in_selected_option_idx;
 		const bt_field *in_option_field;
 		bt_field *out_option_field;
 
 		in_selected_option_idx =
-			bt_field_variant_get_selected_option_field_index(
+			bt_field_variant_get_selected_option_index(
 				in_field);
-		sel_opt_status = bt_field_variant_select_option_field_by_index(out_field,
+		sel_opt_status = bt_field_variant_select_option_by_index(out_field,
 			in_selected_option_idx);
 		if (sel_opt_status !=
-				BT_FIELD_VARIANT_SELECT_OPTION_FIELD_STATUS_OK) {
+				BT_FIELD_VARIANT_SELECT_OPTION_STATUS_OK) {
 			BT_COMP_LOGE_APPEND_CAUSE(self_comp,
 				"Cannot select variant field's option field: "
 				"out-var-f-addr=%p, opt-index=%" PRId64,
@@ -455,7 +440,7 @@ enum debug_info_trace_ir_mapping_status copy_field_content(
 			goto end;
 			}
 	} else {
-		abort();
+		bt_common_abort();
 	}
 
 	BT_COMP_LOGT("Copied content of field: in-f-addr=%p, out-f-addr=%p",