lib: use common precond. assert. macros from `assert-cond.h` thru lib

[babeltrace.git] / src / lib / trace-ir / packet.c

diff --git a/src/lib/trace-ir/packet.c b/src/lib/trace-ir/packet.c
index a5c3fc7a196e61878b88fe3da34040446120ae83..18ed8fede87d3552217424b8e42af893c14b7370 100644 (file)
--- a/src/lib/trace-ir/packet.c
+++ b/src/lib/trace-ir/packet.c
@@ -1,30 +1,13 @@
 /*
- * Copyright 2016-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.
- *
- * 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 2016-2018 Philippe Proulx <pproulx@efficios.com>
  */
 
 #define BT_LOG_TAG "LIB/PACKET"
 #include "lib/logging.h"
 
-#include "lib/assert-pre.h"
-#include <babeltrace2/trace-ir/packet-const.h>
+#include "lib/assert-cond.h"
 #include <babeltrace2/trace-ir/packet.h>
 #include <babeltrace2/trace-ir/trace.h>
 #include <babeltrace2/trace-ir/stream-class.h>
@@ -44,7 +27,7 @@
 
 struct bt_stream *bt_packet_borrow_stream(struct bt_packet *packet)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(packet, "Packet");
+       BT_ASSERT_PRE_DEV_PACKET_NON_NULL(packet);
        return packet->stream;
 }
 
@@ -56,7 +39,7 @@ const struct bt_stream *bt_packet_borrow_stream_const(
 
 struct bt_field *bt_packet_borrow_context_field(struct bt_packet *packet)
 {
-       BT_ASSERT_PRE_DEV_NON_NULL(packet, "Packet");
+       BT_ASSERT_PRE_DEV_PACKET_NON_NULL(packet);
        return packet->context_field ? packet->context_field->field : NULL;
 }
 
@@ -219,7 +202,8 @@ struct bt_packet *bt_packet_create(const struct bt_stream *c_stream)
        struct bt_packet *packet = NULL;
        struct bt_stream *stream = (void *) c_stream;
 
-       BT_ASSERT_PRE_NON_NULL(stream, "Stream");
+       BT_ASSERT_PRE_NO_ERROR();
+       BT_ASSERT_PRE_STREAM_NON_NULL(stream);
        BT_ASSERT_PRE(stream->class->supports_packets,
                "Stream class does not support packets: %![sc-]+S",
                stream->class);
@@ -241,35 +225,6 @@ end:
        return (void *) packet;
 }
 
-enum bt_packet_move_context_field_status bt_packet_move_context_field(
-               struct bt_packet *packet,
-               struct bt_packet_context_field *context_field)
-{
-       struct bt_stream_class *stream_class;
-       struct bt_field_wrapper *field_wrapper = (void *) context_field;
-
-       BT_ASSERT_PRE_DEV_NON_NULL(packet, "Packet");
-       BT_ASSERT_PRE_DEV_NON_NULL(field_wrapper, "Context field");
-       BT_ASSERT_PRE_DEV_HOT(packet, "Packet", ": %!+a", packet);
-       stream_class = packet->stream->class;
-       BT_ASSERT_PRE_DEV(stream_class->packet_context_fc,
-               "Stream class has no packet context field class: %!+S",
-               stream_class);
-       BT_ASSERT_PRE_DEV(field_wrapper->field->class ==
-               stream_class->packet_context_fc,
-               "Unexpected packet context field's class: "
-               "%![fc-]+F, %![expected-fc-]+F", field_wrapper->field->class,
-               stream_class->packet_context_fc);
-
-       /* Recycle current context field: always exists */
-       BT_ASSERT(packet->context_field);
-       recycle_context_field(packet->context_field, stream_class);
-
-       /* Move new field */
-       packet->context_field = field_wrapper;
-       return BT_FUNC_STATUS_OK;
-}
-
 void bt_packet_get_ref(const struct bt_packet *packet)
 {
        bt_object_get_ref(packet);