merged, thanks! Mathieu
* Jérémie Galarneau ([email protected]) wrote: > > Signed-off-by: Jérémie Galarneau <[email protected]> > --- > converter/babeltrace.c | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/converter/babeltrace.c b/converter/babeltrace.c > index 2fd371c..1008351 100644 > --- a/converter/babeltrace.c > +++ b/converter/babeltrace.c > @@ -490,15 +490,11 @@ int bt_context_add_traces_recursive(struct bt_context > *ctx, const char *path, > void (*packet_seek)(struct bt_stream_pos *pos, > size_t offset, int whence)) > { > - > - GArray *trace_ids; > - int ret = 0; > + int ret = 0, trace_ids = 0; > > /* Should lock traversed_paths mutex here if used in multithread */ > > traversed_paths = g_ptr_array_new(); > - trace_ids = g_array_new(FALSE, TRUE, sizeof(int)); > - > ret = nftw(path, traverse_trace_dir, 10, 0); > > /* Process the array if ntfw did not return a fatal error */ > @@ -520,7 +516,7 @@ int bt_context_add_traces_recursive(struct bt_context > *ctx, const char *path, > /* Allow to skip erroneous traces. */ > ret = 1; /* partial error */ > } else { > - g_array_append_val(trace_ids, trace_id); > + trace_ids++; > } > g_string_free(trace_path, TRUE); > } > @@ -534,11 +530,10 @@ int bt_context_add_traces_recursive(struct bt_context > *ctx, const char *path, > /* > * Return an error if no trace can be opened. > */ > - if (trace_ids->len == 0) { > + if (trace_ids == 0) { > fprintf(stderr, "[error] Cannot open any trace for > reading.\n\n"); > ret = -ENOENT; /* failure */ > } > - g_array_free(trace_ids, TRUE); > return ret; > } > > -- > 1.8.2.2 > > > _______________________________________________ > lttng-dev mailing list > [email protected] > http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
