ir: fields.c: fix public function names to get/set struct. field

[babeltrace.git] / plugins / lttng-utils / copy.c

diff --git a/plugins/lttng-utils/copy.c b/plugins/lttng-utils/copy.c
index 3ac0da0f2985743c139f11be1d87e5feab0b931a..db828c42eab08a64334804281ce1401be6bd52a7 100644 (file)
--- a/plugins/lttng-utils/copy.c
+++ b/plugins/lttng-utils/copy.c
@@ -567,11 +567,13 @@ enum debug_info_stream_state *insert_new_stream_state(
        if (!v) {
                fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
                                __FILE__, __LINE__);
+               goto end;
        }
        *v = DEBUG_INFO_UNKNOWN_STREAM;
 
        g_hash_table_insert(di_trace->stream_states, stream, v);
 
+end:
        return v;
 }
 
@@ -596,7 +598,7 @@ BT_HIDDEN
 void debug_info_close_trace(struct debug_info_iterator *debug_it,
                struct debug_info_trace *di_trace)
 {
-       if (di_trace->static_listener_id > 0) {
+       if (di_trace->static_listener_id >= 0) {
                bt_ctf_trace_remove_is_static_listener(di_trace->trace,
                                di_trace->static_listener_id);
        }
@@ -1058,20 +1060,16 @@ struct bt_ctf_stream_class *copy_stream_class_debug_info(FILE *err,
        BT_PUT(type);
 
        type = bt_ctf_stream_class_get_event_header_type(stream_class);
-       if (!type) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-                               __LINE__);
-               goto error;
-       }
-
-       ret_int = bt_ctf_stream_class_set_event_header_type(
-                       writer_stream_class, type);
-       if (ret_int < 0) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-                               __LINE__);
-               goto error;
+       if (type) {
+               ret_int = bt_ctf_stream_class_set_event_header_type(
+                               writer_stream_class, type);
+               if (ret_int < 0) {
+                       fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+                                       __LINE__);
+                       goto error;
+               }
+               BT_PUT(type);
        }
-       BT_PUT(type);
 
        type = bt_ctf_stream_class_get_event_context_type(stream_class);
        if (type) {
@@ -1507,6 +1505,11 @@ struct bt_ctf_stream *debug_info_stream_begin(
                }
                state = insert_new_stream_state(debug_it, di_trace,
                                stream);
+               if (!state) {
+                       fprintf(debug_it->err, "[error] Adding a new stream "
+                                       "on a static trace\n");
+                       goto error;
+               }
        }
        if (*state != DEBUG_INFO_UNKNOWN_STREAM) {
                fprintf(debug_it->err, "[error] Unexpected stream state %d\n",
@@ -1802,7 +1805,8 @@ int copy_set_debug_info_stream_event_context(FILE *err,
                                goto error;
                        }
 
-                       ret = bt_ctf_field_structure_set_field(writer_event_context,
+                       ret = bt_ctf_field_structure_set_field_by_name(
+                                       writer_event_context,
                                        field_name, copy_field);
                        if (ret) {
                                fprintf(err, "[error] %s in %s:%d\n", __func__,
@@ -1845,6 +1849,11 @@ struct bt_ctf_clock_class *stream_class_get_clock_class(FILE *err,
                goto end;
        }
 
+       if (!bt_ctf_trace_get_clock_class_count(trace)) {
+               /* No clock. */
+               goto end;
+       }
+
        /* FIXME multi-clock? */
        clock_class = bt_ctf_trace_get_clock_class_by_index(trace, 0);
 
@@ -1896,9 +1905,8 @@ int set_event_clock_value(FILE *err, struct bt_ctf_event *event,
 
        clock_class = event_get_clock_class(err, event);
        if (!clock_class) {
-               fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
-                               __LINE__);
-               goto error;
+               /* No clock on input trace. */
+               goto end;
        }
 
        clock_value = bt_ctf_event_get_clock_value(event, clock_class);