lib: rename "begin" to "beginning" when used as a noun

[babeltrace.git] / include / babeltrace / graph / notification-internal.h

diff --git a/include/babeltrace/graph/notification-internal.h b/include/babeltrace/graph/notification-internal.h
index 206c110b791f4d656182fd3737c7b6e454490913..cdd2146957bec76116ed125d798f4d90b96e00b8 100644 (file)
--- a/include/babeltrace/graph/notification-internal.h
+++ b/include/babeltrace/graph/notification-internal.h
@@ -2,8 +2,6 @@
 #define BABELTRACE_GRAPH_NOTIFICATION_NOTIFICATION_INTERNAL_H
 
 /*
- * BabelTrace - Plug-in Notification internal
- *
  * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
@@ -31,8 +29,8 @@
 #include <babeltrace/object-internal.h>
 #include <babeltrace/assert-internal.h>
 #include <babeltrace/graph/graph.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/ctf-ir/stream.h>
+#include <babeltrace/graph/notification-const.h>
+#include <babeltrace/trace-ir/stream.h>
 #include <babeltrace/object-pool-internal.h>
 #include <babeltrace/types.h>
 
@@ -50,7 +48,7 @@ struct bt_notification {
 };
 
 #define BT_ASSERT_PRE_NOTIF_IS_TYPE(_notif, _type)                     \
-       BT_ASSERT_PRE((_notif)->type == (_type),                        \
+       BT_ASSERT_PRE(((struct bt_notification *) (_notif))->type == (_type), \
                "Notification has the wrong type: expected-type=%s, "   \
                "%![notif-]+n", bt_notification_type_string(_type),     \
                (_notif))
@@ -117,18 +115,16 @@ static inline
 const char *bt_notification_type_string(enum bt_notification_type type)
 {
        switch (type) {
-       case BT_NOTIFICATION_TYPE_UNKNOWN:
-               return "BT_NOTIFICATION_TYPE_UNKNOWN";
        case BT_NOTIFICATION_TYPE_EVENT:
                return "BT_NOTIFICATION_TYPE_EVENT";
        case BT_NOTIFICATION_TYPE_INACTIVITY:
                return "BT_NOTIFICATION_TYPE_INACTIVITY";
-       case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
-               return "BT_NOTIFICATION_TYPE_STREAM_BEGIN";
+       case BT_NOTIFICATION_TYPE_STREAM_BEGINNING:
+               return "BT_NOTIFICATION_TYPE_STREAM_BEGINNING";
        case BT_NOTIFICATION_TYPE_STREAM_END:
                return "BT_NOTIFICATION_TYPE_STREAM_END";
-       case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
-               return "BT_NOTIFICATION_TYPE_PACKET_BEGIN";
+       case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
+               return "BT_NOTIFICATION_TYPE_PACKET_BEGINNING";
        case BT_NOTIFICATION_TYPE_PACKET_END:
                return "BT_NOTIFICATION_TYPE_PACKET_END";
        default: