Fix copytrace: copy packet_context

[babeltrace.git] / plugins / utils / trimmer / copy.c

diff --git a/plugins/utils/trimmer/copy.c b/plugins/utils/trimmer/copy.c
index 9d0d814171e5b6054d0a31098a241e4c854a8cc9..ca0970a06d029b3f1e6887569cc3f89a0629fbe7 100644 (file)
--- a/plugins/utils/trimmer/copy.c
+++ b/plugins/utils/trimmer/copy.c
@@ -164,7 +164,6 @@ struct bt_ctf_packet *trimmer_new_packet(
                struct bt_ctf_packet *packet)
 {
        struct bt_ctf_stream *stream = NULL;
-       struct bt_ctf_field *writer_packet_context = NULL;
        struct bt_ctf_packet *writer_packet = NULL;
        int int_ret;
 
@@ -193,16 +192,9 @@ struct bt_ctf_packet *trimmer_new_packet(
        }
        bt_get(writer_packet);
 
-       writer_packet_context = ctf_copy_packet_context(trim_it->err, packet,
-                       stream);
-       if (!writer_packet_context) {
-               fprintf(trim_it->err, "[error] %s in %s:%d\n",
-                               __func__, __FILE__, __LINE__);
-               goto error;
-       }
-
-       int_ret = bt_ctf_packet_set_context(writer_packet, writer_packet_context);
-       if (int_ret) {
+       int_ret = ctf_packet_copy_context(trim_it->err, packet,
+                       stream, writer_packet);
+       if (int_ret < 0) {
                fprintf(trim_it->err, "[error] %s in %s:%d\n",
                                __func__, __FILE__, __LINE__);
                goto error;
@@ -213,7 +205,6 @@ struct bt_ctf_packet *trimmer_new_packet(
 error:
        BT_PUT(writer_packet);
 end:
-       bt_put(writer_packet_context);
        bt_put(stream);
        return writer_packet;
 }