From 887d00c37959fab79628f4a63935156b549b0a82 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Tue, 5 Apr 2016 17:24:15 -0400 Subject: [PATCH] Remove useless bt_iter when creating intersection MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- converter/babeltrace.c | 6 ++---- lib/iterator.c | 5 +---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/converter/babeltrace.c b/converter/babeltrace.c index 58f534c8..8921d5ab 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -628,8 +628,6 @@ struct bt_ctf_iter *iter_create_intersect(struct bt_context *ctx, struct bt_iter_pos *inter_end_pos) { uint64_t begin = 0, end = ULLONG_MAX; - /* Useless but needed for bt_iter_create_time_pos. */ - struct bt_iter bt_iter; int ret; ret = ctf_find_packets_intersection(ctx, &begin, &end); @@ -640,11 +638,11 @@ struct bt_ctf_iter *iter_create_intersect(struct bt_context *ctx, } else if (ret != 0) { goto error; } - inter_begin_pos = bt_iter_create_time_pos(&bt_iter, begin); + inter_begin_pos = bt_iter_create_time_pos(NULL, begin); if (!inter_begin_pos) { goto error; } - inter_end_pos = bt_iter_create_time_pos(&bt_iter, end); + inter_end_pos = bt_iter_create_time_pos(NULL, end); if (!inter_end_pos) { goto error; } diff --git a/lib/iterator.c b/lib/iterator.c index 540d5e9b..4ee0d5d2 100644 --- a/lib/iterator.c +++ b/lib/iterator.c @@ -615,14 +615,11 @@ error: return NULL; } -struct bt_iter_pos *bt_iter_create_time_pos(struct bt_iter *iter, +struct bt_iter_pos *bt_iter_create_time_pos(struct bt_iter *unused, uint64_t timestamp) { struct bt_iter_pos *pos; - if (!iter) - return NULL; - pos = g_new0(struct bt_iter_pos, 1); pos->type = BT_SEEK_TIME; pos->u.seek_time = timestamp; -- 2.34.1