X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Fevent-class.h;h=cc2ec9ee25c2d108523ac9b35c099b84300ecaec;hb=a1e3187822e3320ce83e37a0e30bc68e176112d4;hp=35c1de5d244dd6ad89ea46898cf56eaedc6e0e33;hpb=ef267d12284b855bc52ee429a5dc12da1d1e3b95;p=babeltrace.git

diff --git a/src/ctf-writer/event-class.h b/src/ctf-writer/event-class.h
index 35c1de5d..cc2ec9ee 100644
--- a/src/ctf-writer/event-class.h
+++ b/src/ctf-writer/event-class.h
@@ -1,37 +1,19 @@
-#ifndef BABELTRACE_CTF_WRITER_EVENT_CLASS_INTERNAL_H
-#define BABELTRACE_CTF_WRITER_EVENT_CLASS_INTERNAL_H
-
 /*
- * 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>
  */
 
+#ifndef BABELTRACE_CTF_WRITER_EVENT_CLASS_INTERNAL_H
+#define BABELTRACE_CTF_WRITER_EVENT_CLASS_INTERNAL_H
+
 #include "common/assert.h"
 #include "common/macros.h"
-#include <babeltrace2/ctf-writer/event.h>
-#include <babeltrace2/ctf-writer/field-types.h>
-#include <babeltrace2/ctf-writer/fields.h>
-#include <babeltrace2/ctf-writer/stream-class.h>
-#include <babeltrace2/ctf-writer/stream.h>
+#include <babeltrace2-ctf-writer/event.h>
+#include <babeltrace2-ctf-writer/field-types.h>
+#include <babeltrace2-ctf-writer/fields.h>
+#include <babeltrace2-ctf-writer/stream-class.h>
+#include <babeltrace2-ctf-writer/stream.h>
 #include <glib.h>
 
 #include "object.h"
@@ -70,11 +52,12 @@ static inline
 struct bt_ctf_stream_class_common *bt_ctf_event_class_common_borrow_stream_class(
 		struct bt_ctf_event_class_common *event_class)
 {
-	BT_ASSERT(event_class);
+	BT_ASSERT_DBG(event_class);
 	return (void *) bt_ctf_object_borrow_parent(&event_class->base);
 }
 
-typedef struct bt_ctf_field_type_common *(*bt_ctf_field_type_structure_create_func)();
+typedef struct bt_ctf_field_type_common *
+	(*bt_ctf_field_type_structure_create_func)(void);
 
 BT_HIDDEN
 int bt_ctf_event_class_common_initialize(struct bt_ctf_event_class_common *event_class,
@@ -94,7 +77,7 @@ const char *bt_ctf_event_class_common_get_name(
 		struct bt_ctf_event_class_common *event_class)
 {
 	BT_CTF_ASSERT_PRE_NON_NULL(event_class, "Event class");
-	BT_ASSERT(event_class->name);
+	BT_ASSERT_DBG(event_class->name);
 	return event_class->name->str;
 }