X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Flttng-utils%2Fdebug-info%2Ftrace-ir-metadata-field-class-copy.c;h=0b75bb6f3bc9c473b9c1cd166489421df5ff370b;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hp=31c9f71aca91a7298dcced72b837bbee35e9d26e;hpb=3b34b490662585394be7352f3544367d4e50a5bc;p=babeltrace.git

diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c b/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c
index 31c9f71a..0b75bb6f 100644
--- a/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c
+++ b/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c
@@ -1,27 +1,11 @@
 /*
- * Babeltrace - Trace IR field copy
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2015-2019 EfficiOS Inc. and Linux Foundation
  * Copyright (c) 2018 Philippe Proulx <pproulx@efficios.com>
  * 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 field copy
  */
 
 #define BT_COMP_LOG_SELF_COMP (md_maps->self_comp)
@@ -94,7 +78,7 @@ const bt_field_class *walk_field_path(struct trace_ir_metadata_maps *md_maps,
 				curr_fc);
 			break;
 		} else {
-			abort();
+			bt_common_abort();
 		}
 	}
 
@@ -132,7 +116,7 @@ const bt_field_class *resolve_field_path_to_field_class(const bt_field_path *fp,
 			fc_resolving_ctx->event_payload);
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	return fc;
@@ -214,7 +198,7 @@ enum debug_info_trace_ir_mapping_status field_class_signed_integer_copy(
 	return DEBUG_INFO_TRACE_IR_MAPPING_STATUS_OK;
 }
 
-BT_HIDDEN
+static
 enum debug_info_trace_ir_mapping_status field_class_unsigned_enumeration_copy(
 		struct trace_ir_metadata_maps *md_maps,
 		const bt_field_class *in_field_class,
@@ -962,7 +946,7 @@ enum debug_info_trace_ir_mapping_status copy_field_class_content_internal(
 		status = field_class_variant_copy(md_maps,
 			in_field_class, out_field_class);
 	} else {
-		abort();
+		bt_common_abort();
 	}
 
 	return status;