New patch to review for coreboot: cbfstool: avoid naming variables "index"

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/12279

-gerrit

commit 1a172f4f5a3eb95fccffb1ede44bfc8a2ef809d6
Author: Patrick Georgi 
Date:   Sat Oct 31 01:35:20 2015 +0100

cbfstool: avoid naming variables "index"

Those may collide with strings.h's index(), included transitively
    through system headers.

Change-Id: I6b03236844509ea85cfcdc0a37acf1df97d4c5f3
    Signed-off-by: Patrick Georgi 
---
 util/cbfstool/elfheaders.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/util/cbfstool/elfheaders.c b/util/cbfstool/elfheaders.c
index 45e96fd..dbce121 100644
--- a/util/cbfstool/elfheaders.c
+++ b/util/cbfstool/elfheaders.c
@@ -1287,7 +1287,7 @@ int elf_writer_add_symbol(struct elf_writer *ew, const char *name,
    			Elf64_Addr value, Elf64_Word size,
    			int binding, int type)
 {
-	int index;
+	int i;
    Elf64_Sym sym = {
    	.st_value = value,
    	.st_size = size,
@@ -1299,15 +1299,15 @@ int elf_writer_add_symbol(struct elf_writer *ew, const char *name,
    	return -1;
    }

-	index = elf_writer_add_string(ew, name);
-	if (index < 0)
+	i = elf_writer_add_string(ew, name);
+	if (i < 0)
    	return -1;
-	sym.st_name = index;
+	sym.st_name = i;

-	index = elf_writer_section_index(ew, section_name);
-	if (index < 0)
+	i = elf_writer_section_index(ew, section_name);
+	if (i < 0)
    	return -1;
-	sym.st_shndx = index;
+	sym.st_shndx = i;

ew->symtab.syms[ew->symtab.num_entries++] = sym;

@@ -1316,16 +1316,16 @@ int elf_writer_add_symbol(struct elf_writer *ew, const char *name,

static int elf_sym_index(struct elf_writer *ew, const char *sym)
 {
-	int index;
+	int j;
    size_t i;
    Elf64_Word st_name;

/* Determine index of symbol in the string table. */
-	index = elf_writer_add_string(ew, sym);
-	if (index < 0)
+	j = elf_writer_add_string(ew, sym);
+	if (j < 0)
    	return -1;

-	st_name = index;
+	st_name = j;

for (i = 0; i < ew->symtab.num_entries; i++)
    	if (ew->symtab.syms[i].st_name == st_name)