X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Ffield-types.c;h=b97a0ab74c4cbb33291dd7d139864d37bd73845d;hb=768f9bcbf4b5acd09dda85ab32c0ea30d8826136;hp=e5767cfcf7451796165129edfef3cba7410e7331;hpb=c4f23e30bf67d2523163614bc9461d84cbe1ae80;p=babeltrace.git

diff --git a/src/ctf-writer/field-types.c b/src/ctf-writer/field-types.c
index e5767cfc..b97a0ab7 100644
--- a/src/ctf-writer/field-types.c
+++ b/src/ctf-writer/field-types.c
@@ -1,25 +1,7 @@
 /*
- * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
- *
- * Author: Jérémie Galarneau <jeremie.galarneau@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:
+ * SPDX-License-Identifier: MIT
  *
- * 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.
+ * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  */
 
 #define BT_LOG_TAG "CTF-WRITER/FIELD-TYPES"
@@ -740,7 +722,7 @@ int bt_ctf_field_type_enumeration_mapping_iterator_next(
 		default:
 			BT_LOGF("Invalid enumeration field type mapping iterator type: "
 				"type=%d", iter->type);
-			abort();
+			bt_common_abort();
 		}
 	}
 
@@ -3941,7 +3923,7 @@ int bt_ctf_field_type_common_validate_single_clock_class(
 			break;
 		default:
 			BT_LOGF("Unexpected field type ID: id=%d", ft->id);
-			abort();
+			bt_common_abort();
 		}
 
 		BT_ASSERT_DBG(sub_ft);