From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Sat, 8 Dec 2018 20:13:56 +0000 (-0500)
Subject: Packet API: use status
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=486aff8caaa9bec6100c14bd32ce696d54854936;p=deliverable%2Fbabeltrace.git

Packet API: use status

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
---

diff --git a/include/babeltrace/trace-ir/packet-const.h b/include/babeltrace/trace-ir/packet-const.h
index 52a0b3059..1f90f0104 100644
--- a/include/babeltrace/trace-ir/packet-const.h
+++ b/include/babeltrace/trace-ir/packet-const.h
@@ -44,6 +44,11 @@
 extern "C" {
 #endif
 
+enum bt_packet_status {
+	BT_PACKET_STATUS_OK = 0,
+	BT_PACKET_STATUS_NOMEM = -12,
+};
+
 extern const bt_stream *bt_packet_borrow_stream_const(
 		const bt_packet *packet);
 
diff --git a/include/babeltrace/trace-ir/packet.h b/include/babeltrace/trace-ir/packet.h
index 2b1d9b06b..3de1edfea 100644
--- a/include/babeltrace/trace-ir/packet.h
+++ b/include/babeltrace/trace-ir/packet.h
@@ -29,6 +29,9 @@
 /* For bt_packet, bt_packet_header_field, bt_packet_context_field, bt_stream */
 #include <babeltrace/types.h>
 
+/* For enum bt_packet_status */
+#include <babeltrace/trace-ir/packet-const.h>
+
 #include <stdint.h>
 
 #ifdef __cplusplus
@@ -43,14 +46,14 @@ extern
 bt_field *bt_packet_borrow_header_field(bt_packet *packet);
 
 extern
-int bt_packet_move_header_field(bt_packet *packet,
+enum bt_packet_status bt_packet_move_header_field(bt_packet *packet,
 		bt_packet_header_field *header);
 
 extern
 bt_field *bt_packet_borrow_context_field(bt_packet *packet);
 
 extern
-int bt_packet_move_context_field(bt_packet *packet,
+enum bt_packet_status bt_packet_move_context_field(bt_packet *packet,
 		bt_packet_context_field *context);
 
 extern
diff --git a/lib/trace-ir/packet.c b/lib/trace-ir/packet.c
index 501a8249c..4909e9523 100644
--- a/lib/trace-ir/packet.c
+++ b/lib/trace-ir/packet.c
@@ -346,7 +346,7 @@ end:
 	return (void *) packet;
 }
 
-int bt_packet_move_header_field(struct bt_packet *packet,
+enum bt_packet_status bt_packet_move_header_field(struct bt_packet *packet,
 		struct bt_packet_header_field *header_field)
 {
 	struct bt_trace_class *tc;
@@ -370,10 +370,10 @@ int bt_packet_move_header_field(struct bt_packet *packet,
 
 	/* Move new field */
 	packet->header_field = field_wrapper;
-	return 0;
+	return BT_PACKET_STATUS_OK;
 }
 
-int bt_packet_move_context_field(struct bt_packet *packet,
+enum bt_packet_status bt_packet_move_context_field(struct bt_packet *packet,
 		struct bt_packet_context_field *context_field)
 {
 	struct bt_stream_class *stream_class;
@@ -398,7 +398,7 @@ int bt_packet_move_context_field(struct bt_packet *packet,
 
 	/* Move new field */
 	packet->context_field = field_wrapper;
-	return 0;
+	return BT_PACKET_STATUS_OK;
 }
 
 void bt_packet_set_default_beginning_clock_snapshot(struct bt_packet *packet,