X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fmessage%2Fmessage.c;h=0f1c807a5c14f6a0ef3b4e5fb0ca33b1e32a9abb;hp=0a65b3be471cfce9fbdb99acc71e963ca09e631b;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d

diff --git a/src/lib/graph/message/message.c b/src/lib/graph/message/message.c
index 0a65b3be..0f1c807a 100644
--- a/src/lib/graph/message/message.c
+++ b/src/lib/graph/message/message.c
@@ -1,32 +1,17 @@
 /*
+ * SPDX-License-Identifier: MIT
+ *
  * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2016 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:
- *
- * 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.
  */
 
-#define BT_LOG_TAG "MSG"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/MSG"
+#include "lib/logging.h"
 
 #include "common/assert.h"
 #include "lib/assert-pre.h"
-#include <babeltrace2/graph/message-const.h>
+#include "lib/assert-post.h"
+#include <babeltrace2/graph/message.h>
 #include "lib/graph/message/message.h"
 #include "lib/graph/graph.h"
 
@@ -36,7 +21,6 @@ void bt_message_init(struct bt_message *message,
 		bt_object_release_func release,
 		struct bt_graph *graph)
 {
-	BT_ASSERT(type >= 0 && type <= BT_MESSAGE_TYPE_DISCARDED_PACKETS);
 	message->type = type;
 	bt_object_init_shared(&message->base, release);
 	message->graph = graph;
@@ -49,7 +33,7 @@ void bt_message_init(struct bt_message *message,
 enum bt_message_type bt_message_get_type(
 		const struct bt_message *message)
 {
-	BT_ASSERT_PRE_NON_NULL(message, "Message");
+	BT_ASSERT_PRE_DEV_NON_NULL(message, "Message");
 	return message->type;
 }