X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Fcommon%2Fmetadata%2Fctf-meta.h;h=ea6b9260fb47396980c936cff2fe4f1b04113f7e;hb=516bf0a77e025cfccce2fa400b757e94dc0bf1d8;hp=929a39e14c01dfceaf9eddacea643977f5ca63aa;hpb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;p=babeltrace.git

diff --git a/src/plugins/ctf/common/metadata/ctf-meta.h b/src/plugins/ctf/common/metadata/ctf-meta.h
index 929a39e1..ea6b9260 100644
--- a/src/plugins/ctf/common/metadata/ctf-meta.h
+++ b/src/plugins/ctf/common/metadata/ctf-meta.h
@@ -1,25 +1,18 @@
-#ifndef _CTF_META_H
-#define _CTF_META_H
-
 /*
- * Copyright 2018 - Philippe Proulx <pproulx@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.
+ * Copyright 2018 Philippe Proulx <pproulx@efficios.com>
  */
 
+#ifndef _CTF_META_H
+#define _CTF_META_H
+
 #include <babeltrace2/babeltrace.h>
 #include "common/common.h"
 #include "common/uuid.h"
 #include "common/assert.h"
 #include <glib.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -683,7 +676,7 @@ void ctf_field_class_destroy(struct ctf_field_class *fc)
 		_ctf_field_class_variant_destroy((void *) fc);
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 }
 
@@ -1055,7 +1048,7 @@ uint64_t ctf_field_class_compound_get_field_class_count(struct ctf_field_class *
 		field_count = 1;
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	return field_count;
@@ -1151,7 +1144,7 @@ const char *ctf_scope_string(enum ctf_scope scope)
 	case CTF_SCOPE_EVENT_PAYLOAD:
 		return "EVENT_PAYLOAD";
 	default:
-		abort();
+		bt_common_abort();
 	}
 }
 
@@ -1210,7 +1203,7 @@ struct ctf_field_class *ctf_field_path_borrow_field_class(
 		fc = ec->payload_fc;
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	BT_ASSERT_DBG(fc);
@@ -1473,7 +1466,7 @@ struct ctf_field_class *ctf_field_class_copy(struct ctf_field_class *fc)
 		copy_fc = (void *) _ctf_field_class_variant_copy((void *) fc);
 		break;
 	default:
-		abort();
+		bt_common_abort();
 	}
 
 	copy_fc->type = fc->type;