Fix: shadowed variables

[babeltrace.git] / src / cli / babeltrace2.c

diff --git a/src/cli/babeltrace2.c b/src/cli/babeltrace2.c
index ececd63aa9c8cdb86a7a8a69fe33cb649a1af719..80082d07d78e95e25c2e14ab2e839fd92476fc52 100644 (file)
--- a/src/cli/babeltrace2.c
+++ b/src/cli/babeltrace2.c
@@ -335,7 +335,6 @@ void print_value_rec(FILE *fp, const bt_value *value, size_t indent)
        double dbl_val;
        const char *str_val;
        int size;
-       int i;
        GPtrArray *map_keys = NULL;
 
        if (!value) {
@@ -378,6 +377,8 @@ void print_value_rec(FILE *fp, const bt_value *value, size_t indent)
                        bt_common_color_reset());
                break;
        case BT_VALUE_TYPE_ARRAY:
+       {
+               guint i;
                size = bt_value_array_get_length(value);
                if (size < 0) {
                        goto error;
@@ -420,6 +421,7 @@ void print_value_rec(FILE *fp, const bt_value *value, size_t indent)
                        print_value_rec(fp, element, indent + 2);
                }
                break;
+       }
        case BT_VALUE_TYPE_MAP:
        {
                guint i;
@@ -2055,7 +2057,6 @@ int compute_stream_intersection(const bt_value *streams,
                                "range-ns:begin=%" PRId64 ", "
                                "range-ns:end=%" PRId64,
                                begin_ns, end_ns);
-                       ret = -1;
                        goto error;
                }