From 0b0bf6828fd92630e50b6ea7474eacdff9264b5f Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Thu, 5 Oct 2017 16:39:39 -0400 Subject: [PATCH] Fix: variable declaration shadows previously declared variable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- plugins/ctf/common/notif-iter/notif-iter.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/ctf/common/notif-iter/notif-iter.c b/plugins/ctf/common/notif-iter/notif-iter.c index 25d6c94a..a5d9e5c8 100644 --- a/plugins/ctf/common/notif-iter/notif-iter.c +++ b/plugins/ctf/common/notif-iter/notif-iter.c @@ -1422,7 +1422,7 @@ end_v_field_type: if (id_field_type && event_id == -1ULL) { /* Check "id" field */ struct bt_ctf_field *id_field = NULL; - int ret = 0; + int ret_get_value = 0; // TODO: optimalize! id_field = bt_ctf_field_structure_get_field( @@ -1432,7 +1432,7 @@ end_v_field_type: } if (bt_ctf_field_is_integer(id_field)) { - ret = bt_ctf_field_unsigned_integer_get_value( + ret_get_value = bt_ctf_field_unsigned_integer_get_value( id_field, &event_id); } else if (bt_ctf_field_is_enumeration(id_field)) { struct bt_ctf_field *container; @@ -1440,12 +1440,12 @@ end_v_field_type: container = bt_ctf_field_enumeration_get_container( id_field); assert(container); - ret = bt_ctf_field_unsigned_integer_get_value( + ret_get_value = bt_ctf_field_unsigned_integer_get_value( container, &event_id); BT_PUT(container); } - assert(ret == 0); + assert(ret_get_value == 0); BT_PUT(id_field); } -- 2.34.1