GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cbfstool: Fix shadowed global index 

Change-Id: Ic8bccea1f2ddef874d8e440fa4fa05de1d4f9550
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/10210
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2015-05-15 09:14:09 +03:00
parent 2f7e56f2d6
commit 2e0425986f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/cbfstool/cbfstool.c
View File

@ -500,8 +500,8 @@ static int cbfs_layout(void)
printf("This image contains the following sections that can be %s with this tool:\n", printf("This image contains the following sections that can be %s with this tool:\n",
param.show_immutable ? "accessed" : "manipulated"); param.show_immutable ? "accessed" : "manipulated");
puts(""); puts("");
for (unsigned index = 0; index < fmap->nareas; ++index) { for (unsigned i = 0; i < fmap->nareas; ++i) {
const struct fmap_area *current = fmap->areas + index; const struct fmap_area *current = fmap->areas + i;
bool readonly = partitioned_file_fmap_count(param.image_file, bool readonly = partitioned_file_fmap_count(param.image_file,
partitioned_file_fmap_select_children_of, current) || 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, // of tree that had duplicate lists in addition to child lists,
// which would allow covering that weird, unlikely case as well. // which would allow covering that weird, unlikely case as well.
unsigned lookahead; unsigned lookahead;
for (lookahead = 1; index + lookahead < fmap->nareas; for (lookahead = 1; i + lookahead < fmap->nareas;
++lookahead) { ++lookahead) {
const struct fmap_area *consecutive = const struct fmap_area *consecutive =
fmap->areas + index + lookahead; fmap->areas + i + lookahead;
if (consecutive->offset != current->offset || if (consecutive->offset != current->offset ||
consecutive->size != current->size) consecutive->size != current->size)
break; break;
@ -539,7 +539,7 @@ static int cbfs_layout(void)
qualifier = "CBFS, "; qualifier = "CBFS, ";
printf(" (%ssize %u)\n", qualifier, current->size); printf(" (%ssize %u)\n", qualifier, current->size);
index += lookahead - 1; i += lookahead - 1;
} }
puts(""); puts("");

4
util/cbfstool/partitioned_file.c
View File

@ -46,8 +46,8 @@ static unsigned count_selected_fmap_entries(const struct fmap *fmap,
assert(callback); assert(callback);
unsigned count = 0; unsigned count = 0;
for (unsigned index = 0; index < fmap->nareas; ++index) { for (unsigned i = 0; i < fmap->nareas; ++i) {
if (callback(fmap->areas + index, arg)) if (callback(fmap->areas + i, arg))
++count; ++count;
} }
return count; return count;