From: Francis Deslauriers Date: Thu, 10 Oct 2019 15:11:06 +0000 (-0400) Subject: Cleanup: ctf: logically dead code X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=2b601d0ca57e5e6edf08a2ee224e6238aab4c711 Cleanup: ctf: logically dead code The `iter_status` variable is guaranteed to be equal to `BT_MSG_ITER_STATUS_OK` when breaking from the `do-while` loop above. Coverity report: CID 1401337 (#1 of 1): Logically dead code (DEADCODE) dead_error_line: Execution cannot reach this statement: goto error; Reported-by: Coverity (1401337) - Logically dead code Signed-off-by: Francis Deslauriers Change-Id: I51448d800b8ed37e80ce64b77df3905c8042b1bf Reviewed-on: https://review.lttng.org/c/babeltrace/+/2166 Reviewed-by: Simon Marchi Tested-by: jenkins --- diff --git a/src/plugins/ctf/fs-src/data-stream-file.c b/src/plugins/ctf/fs-src/data-stream-file.c index 924a2be7..4f2c8375 100644 --- a/src/plugins/ctf/fs-src/data-stream-file.c +++ b/src/plugins/ctf/fs-src/data-stream-file.c @@ -547,7 +547,7 @@ struct ctf_fs_ds_index *build_index_from_stream_file( goto error; } - do { + while (true) { off_t current_packet_size_bytes; struct ctf_fs_ds_index_entry *index_entry; struct bt_msg_iter_packet_properties props; @@ -617,11 +617,6 @@ struct ctf_fs_ds_index *build_index_from_stream_file( "next-packet-offset=%jd", (intmax_t) (current_packet_offset_bytes - current_packet_size_bytes), (intmax_t) current_packet_offset_bytes); - - } while (iter_status == BT_MSG_ITER_STATUS_OK); - - if (iter_status != BT_MSG_ITER_STATUS_OK) { - goto error; } end: