From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 6 Feb 2009 06:10:39 +0000 (-0800)
Subject: Minor code cleanups in objdump.
X-Git-Tag: elfutils-0.140~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51b3f473b60bfface7ca37912ebc2858d1970cd9;p=thirdparty%2Felfutils.git

Minor code cleanups in objdump.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 287ead386..e05aac10e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2009-02-05  Ulrich Drepper  <drepper@redhat.com>
 
+	* objdump.c (show_relocs_x): Minor cleanups.
+
 	* readelf.c (print_cfa_program): Correct a few labels.
 
 2009-02-01  Ulrich Drepper  <drepper@redhat.com>
diff --git a/src/objdump.c b/src/objdump.c
index 99e42d2b7..af8abf78a 100644
--- a/src/objdump.c
+++ b/src/objdump.c
@@ -364,16 +364,15 @@ show_relocs_x (Ebl *ebl, GElf_Shdr *shdr, Elf_Data *symdata,
 {
   int elfclass = gelf_getclass (ebl->elf);
   char buf[128];
-  GElf_Sym symmem;
-  GElf_Sym *sym;
-  Elf32_Word xndx;
 
   printf ("%0*" PRIx64 " %-20s ",
 	  elfclass == ELFCLASS32 ? 8 : 16, r_offset,
 	  ebl_reloc_type_name (ebl, GELF_R_TYPE (r_info), buf, sizeof (buf)));
 
-  sym = gelf_getsymshndx (symdata, xndxdata, GELF_R_SYM (r_info),
-			  &symmem, &xndx);
+  Elf32_Word xndx;
+  GElf_Sym symmem;
+  GElf_Sym *sym = gelf_getsymshndx (symdata, xndxdata, GELF_R_SYM (r_info),
+				    &symmem, &xndx);
 
   if (sym == NULL)
     printf ("<%s %ld>",
@@ -549,7 +548,7 @@ show_relocs (Ebl *ebl, const char *fname, uint32_t shstrndx)
 	    show_relocs_rela (ebl, shdr, data, symdata, xndxdata,
 			      symshdr->sh_link, shstrndx);
 
-	  fputs ("\n", stdout);
+	  putchar ('\n');
 	}
     }