From 2e0425986fb1b5d4d5b57b2e2b7f5442e9823b0c Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Fri, 15 May 2015 09:14:09 +0300 Subject: cbfstool: Fix shadowed global index MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic8bccea1f2ddef874d8e440fa4fa05de1d4f9550 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/10210 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Marc Jones Reviewed-by: Stefan Reinauer --- util/cbfstool/cbfstool.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'util/cbfstool/cbfstool.c') diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index fd0ff35cf0..68a83e7b40 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -500,8 +500,8 @@ static int cbfs_layout(void) printf("This image contains the following sections that can be %s with this tool:\n", param.show_immutable ? "accessed" : "manipulated"); puts(""); - for (unsigned index = 0; index < fmap->nareas; ++index) { - const struct fmap_area *current = fmap->areas + index; + for (unsigned i = 0; i < fmap->nareas; ++i) { + const struct fmap_area *current = fmap->areas + i; bool readonly = partitioned_file_fmap_count(param.image_file, partitioned_file_fmap_select_children_of, current) || @@ -520,10 +520,10 @@ static int cbfs_layout(void) // of tree that had duplicate lists in addition to child lists, // which would allow covering that weird, unlikely case as well. unsigned lookahead; - for (lookahead = 1; index + lookahead < fmap->nareas; + for (lookahead = 1; i + lookahead < fmap->nareas; ++lookahead) { const struct fmap_area *consecutive = - fmap->areas + index + lookahead; + fmap->areas + i + lookahead; if (consecutive->offset != current->offset || consecutive->size != current->size) break; @@ -539,7 +539,7 @@ static int cbfs_layout(void) qualifier = "CBFS, "; printf(" (%ssize %u)\n", qualifier, current->size); - index += lookahead - 1; + i += lookahead - 1; } puts(""); -- cgit v1.2.3