From: Roland McGrath <roland@redhat.com>
Date: Mon, 15 Feb 2010 23:15:50 +0000 (-0800)
Subject: Fix -Wshadow warning in asm-tst9.
X-Git-Tag: elfutils-0.145~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9ca738afcb9cb00d747ef2f072f82a092eaaaff;p=thirdparty%2Felfutils.git

Fix -Wshadow warning in asm-tst9.
---

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 87654d605..29789e2b1 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-15  Roland McGrath  <roland@redhat.com>
+
+	* asm-tst9.c (main): Rename local to avoid shadowing another local.
+
 2009-07-22  Roland McGrath  <roland@redhat.com>
 
 	* addrcfi.c: Update dwarf_frame_{cfa,register} calling convention.
diff --git a/tests/asm-tst9.c b/tests/asm-tst9.c
index 1797e48c1..ad252759c 100644
--- a/tests/asm-tst9.c
+++ b/tests/asm-tst9.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2005 Red Hat, Inc.
+/* Copyright (C) 2002-2010 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <drepper@redhat.com>, 2002.
 
@@ -211,19 +211,19 @@ main (void)
 
   for (cnt = 1; cnt < 3; ++cnt)
     {
-      Elf_Scn *scn;
+      Elf_Scn *escn;
       GElf_Shdr shdr_mem;
       GElf_Shdr *shdr;
 
-      scn = elf_getscn (elf, cnt);
-      if (scn == NULL)
+      escn = elf_getscn (elf, cnt);
+      if (escn == NULL)
 	{
 	  printf ("cannot get section %Zd: %s\n", cnt, elf_errmsg (-1));
 	  result = 1;
 	  continue;
 	}
 
-      shdr = gelf_getshdr (scn, &shdr_mem);
+      shdr = gelf_getshdr (escn, &shdr_mem);
       if (shdr == NULL)
 	{
 	  printf ("cannot get section header for section %Zd: %s\n",
@@ -303,7 +303,7 @@ main (void)
 
       if (cnt == 1)
 	{
-	  Elf_Data *data = elf_getdata (scn, NULL);
+	  Elf_Data *data = elf_getdata (escn, NULL);
 
 	  if (data == NULL)
 	    {