This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
PATCH: Tidy up code formatting in readelf.c
- From: Nick Clifton <nickc at redhat dot com>
- To: binutils at sourceware dot org
- Date: Mon, 20 Oct 2008 13:39:06 +0100
- Subject: PATCH: Tidy up code formatting in readelf.c
Hi Guys,
I am applying the attached patch to tidy up some code formatting
issues in readelf.c. No code changes are involved.
Cheers
Nick
binutils/ChangeLog
2008-10-20 Nick Clifton <nickc@redhat.com>
* readelf.c: Tidy up code formatting.
Index: binutils/readelf.c
===================================================================
RCS file: /cvs/src/src/binutils/readelf.c,v
retrieving revision 1.428
diff -c -3 -p -r1.428 readelf.c
*** binutils/readelf.c 10 Oct 2008 20:55:36 -0000 1.428
--- binutils/readelf.c 20 Oct 2008 12:37:49 -0000
***************
*** 50,62 ****
#include <zlib.h>
#endif
! /* for PATH_MAX */
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif
#ifndef PATH_MAX
! /* for MAXPATHLEN */
# ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
# endif
--- 50,62 ----
#include <zlib.h>
#endif
! /* For PATH_MAX. */
#ifdef HAVE_LIMITS_H
#include <limits.h>
#endif
#ifndef PATH_MAX
! /* For MAXPATHLEN. */
# ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
# endif
*************** byte_put_little_endian (unsigned char *f
*** 373,378 ****
--- 373,379 ----
}
/* Print a VMA value. */
+
static int
print_vma (bfd_vma vma, print_mode mode)
{
*************** print_symbol (int width, const char *sym
*** 462,468 ****
{
if (len > width)
len = width;
!
printf (format_string, len, symbol);
width -= len;
--- 463,469 ----
{
if (len > width)
len = width;
!
printf (format_string, len, symbol);
width -= len;
*************** print_symbol (int width, const char *sym
*** 486,492 ****
{
if (width < 6)
break;
!
printf ("<0x%.2x>", *c);
width -= 6;
--- 487,493 ----
{
if (width < 6)
break;
!
printf ("<0x%.2x>", *c);
width -= 6;
*************** dump_relocations (FILE *file,
*** 1272,1278 ****
&& psym->st_shndx == SHN_IA_64_ANSI_COMMON)
sec_name = "ANSI_COM";
else if (elf_header.e_machine == EM_IA_64
! && (elf_header.e_ident[EI_OSABI]
== ELFOSABI_OPENVMS)
&& psym->st_shndx == SHN_IA_64_VMS_SYMVEC)
sec_name = "VMS_SYMVEC";
--- 1273,1279 ----
&& psym->st_shndx == SHN_IA_64_ANSI_COMMON)
sec_name = "ANSI_COM";
else if (elf_header.e_machine == EM_IA_64
! && (elf_header.e_ident[EI_OSABI]
== ELFOSABI_OPENVMS)
&& psym->st_shndx == SHN_IA_64_VMS_SYMVEC)
sec_name = "VMS_SYMVEC";
*************** get_machine_name (unsigned e_machine)
*** 1823,1829 ****
case EM_ALTERA_NIOS2: return "Altera Nios II";
case EM_XC16X: return "Infineon Technologies xc16x";
case EM_CYGNUS_MEP: return "Toshiba MeP Media Engine";
! case EM_CR16:
case EM_CR16_OLD: return "National Semiconductor's CR16";
default:
snprintf (buff, sizeof (buff), _("<unknown>: 0x%x"), e_machine);
--- 1824,1830 ----
case EM_ALTERA_NIOS2: return "Altera Nios II";
case EM_XC16X: return "Infineon Technologies xc16x";
case EM_CYGNUS_MEP: return "Toshiba MeP Media Engine";
! case EM_CR16:
case EM_CR16_OLD: return "National Semiconductor's CR16";
default:
snprintf (buff, sizeof (buff), _("<unknown>: 0x%x"), e_machine);
*************** process_section_headers (FILE *file)
*** 4279,4286 ****
else if (section->sh_type == SHT_RELA)
CHECK_ENTSIZE (section, i, Rela);
else if ((do_debugging || do_debug_info || do_debug_abbrevs
! || do_debug_lines || do_debug_lines_decoded || do_debug_pubnames
! || do_debug_aranges || do_debug_frames || do_debug_macinfo
|| do_debug_str || do_debug_loc || do_debug_ranges)
&& (const_strneq (name, ".debug_")
|| const_strneq (name, ".zdebug_")))
--- 4280,4287 ----
else if (section->sh_type == SHT_RELA)
CHECK_ENTSIZE (section, i, Rela);
else if ((do_debugging || do_debug_info || do_debug_abbrevs
! || do_debug_lines || do_debug_lines_decoded || do_debug_pubnames
! || do_debug_aranges || do_debug_frames || do_debug_macinfo
|| do_debug_str || do_debug_loc || do_debug_ranges)
&& (const_strneq (name, ".debug_")
|| const_strneq (name, ".zdebug_")))
*************** process_section_headers (FILE *file)
*** 4293,4299 ****
if (do_debugging
|| (do_debug_info && streq (name, "info"))
|| (do_debug_abbrevs && streq (name, "abbrev"))
! || ((do_debug_lines || do_debug_lines_decoded)
&& streq (name, "line"))
|| (do_debug_pubnames && streq (name, "pubnames"))
|| (do_debug_aranges && streq (name, "aranges"))
--- 4294,4300 ----
if (do_debugging
|| (do_debug_info && streq (name, "info"))
|| (do_debug_abbrevs && streq (name, "abbrev"))
! || ((do_debug_lines || do_debug_lines_decoded)
&& streq (name, "line"))
|| (do_debug_pubnames && streq (name, "pubnames"))
|| (do_debug_aranges && streq (name, "aranges"))
*************** is_32bit_abs_reloc (unsigned int reloc_t
*** 8028,8034 ****
return reloc_type == 1; /* R_ARC_32. */
case EM_ARM:
return reloc_type == 2; /* R_ARM_ABS32 */
! case EM_AVR_OLD:
case EM_AVR:
return reloc_type == 1;
case EM_BLACKFIN:
--- 8029,8035 ----
return reloc_type == 1; /* R_ARC_32. */
case EM_ARM:
return reloc_type == 2; /* R_ARM_ABS32 */
! case EM_AVR_OLD:
case EM_AVR:
return reloc_type == 1;
case EM_BLACKFIN:
*************** is_none_reloc (unsigned int reloc_type)
*** 8293,8339 ****
{
switch (elf_header.e_machine)
{
! case EM_68K:
! return reloc_type == 0; /* R_68K_NONE. */
! case EM_386:
! return reloc_type == 0; /* R_386_NONE. */
case EM_SPARC32PLUS:
case EM_SPARCV9:
! case EM_SPARC:
! return reloc_type == 0; /* R_SPARC_NONE. */
! case EM_MIPS:
! return reloc_type == 0; /* R_MIPS_NONE. */
! case EM_PARISC:
! return reloc_type == 0; /* R_PARISC_NONE. */
! case EM_ALPHA:
! return reloc_type == 0; /* R_ALPHA_NONE. */
! case EM_PPC:
! return reloc_type == 0; /* R_PPC_NONE. */
! case EM_PPC64:
! return reloc_type == 0; /* R_PPC64_NONE. */
! case EM_ARM:
! return reloc_type == 0; /* R_ARM_NONE. */
! case EM_IA_64:
! return reloc_type == 0; /* R_IA64_NONE. */
! case EM_SH:
! return reloc_type == 0; /* R_SH_NONE. */
case EM_S390_OLD:
! case EM_S390:
! return reloc_type == 0; /* R_390_NONE. */
! case EM_CRIS:
! return reloc_type == 0; /* R_CRIS_NONE. */
! case EM_X86_64:
! return reloc_type == 0; /* R_X86_64_NONE. */
! case EM_MN10300:
! return reloc_type == 0; /* R_MN10300_NONE. */
! case EM_M32R:
! return reloc_type == 0; /* R_M32R_NONE. */
}
return FALSE;
}
/* Uncompresses a section that was compressed using zlib, in place.
! * This is a copy of bfd_uncompress_section_contents, in bfd/compress.c */
static int
uncompress_section_contents (unsigned char **buffer, dwarf_size_type *size)
--- 8294,8325 ----
{
switch (elf_header.e_machine)
{
! case EM_68K: /* R_68K_NONE. */
! case EM_386: /* R_386_NONE. */
case EM_SPARC32PLUS:
case EM_SPARCV9:
! case EM_SPARC: /* R_SPARC_NONE. */
! case EM_MIPS: /* R_MIPS_NONE. */
! case EM_PARISC: /* R_PARISC_NONE. */
! case EM_ALPHA: /* R_ALPHA_NONE. */
! case EM_PPC: /* R_PPC_NONE. */
! case EM_PPC64: /* R_PPC64_NONE. */
! case EM_ARM: /* R_ARM_NONE. */
! case EM_IA_64: /* R_IA64_NONE. */
! case EM_SH: /* R_SH_NONE. */
case EM_S390_OLD:
! case EM_S390: /* R_390_NONE. */
! case EM_CRIS: /* R_CRIS_NONE. */
! case EM_X86_64: /* R_X86_64_NONE. */
! case EM_MN10300: /* R_MN10300_NONE. */
! case EM_M32R: /* R_M32R_NONE. */
! return reloc_type == 0;
}
return FALSE;
}
/* Uncompresses a section that was compressed using zlib, in place.
! This is a copy of bfd_uncompress_section_contents, in bfd/compress.c */
static int
uncompress_section_contents (unsigned char **buffer, dwarf_size_type *size)
*************** uncompress_section_contents (unsigned ch
*** 8345,8353 ****
return FALSE;
#else
dwarf_size_type compressed_size = *size;
! unsigned char* compressed_buffer = *buffer;
dwarf_size_type uncompressed_size;
! unsigned char* uncompressed_buffer;
z_stream strm;
int rc;
dwarf_size_type header_size = 12;
--- 8331,8339 ----
return FALSE;
#else
dwarf_size_type compressed_size = *size;
! unsigned char * compressed_buffer = *buffer;
dwarf_size_type uncompressed_size;
! unsigned char * uncompressed_buffer;
z_stream strm;
int rc;
dwarf_size_type header_size = 12;
*************** uncompress_section_contents (unsigned ch
*** 8355,8362 ****
/* Read the zlib header. In this case, it should be "ZLIB" followed
by the uncompressed section size, 8 bytes in big-endian order. */
if (compressed_size < header_size
! || ! streq ((char*) compressed_buffer, "ZLIB"))
return 0;
uncompressed_size = compressed_buffer[4]; uncompressed_size <<= 8;
uncompressed_size += compressed_buffer[5]; uncompressed_size <<= 8;
uncompressed_size += compressed_buffer[6]; uncompressed_size <<= 8;
--- 8341,8349 ----
/* Read the zlib header. In this case, it should be "ZLIB" followed
by the uncompressed section size, 8 bytes in big-endian order. */
if (compressed_size < header_size
! || ! streq ((char *) compressed_buffer, "ZLIB"))
return 0;
+
uncompressed_size = compressed_buffer[4]; uncompressed_size <<= 8;
uncompressed_size += compressed_buffer[5]; uncompressed_size <<= 8;
uncompressed_size += compressed_buffer[6]; uncompressed_size <<= 8;
*************** uncompress_section_contents (unsigned ch
*** 8372,8394 ****
strm.zfree = NULL;
strm.opaque = NULL;
strm.avail_in = compressed_size - header_size;
! strm.next_in = (Bytef*) compressed_buffer + header_size;
strm.avail_out = uncompressed_size;
uncompressed_buffer = xmalloc (uncompressed_size);
! rc = inflateInit (&strm);
while (strm.avail_in > 0)
{
if (rc != Z_OK)
goto fail;
! strm.next_out = ((Bytef*) uncompressed_buffer
+ (uncompressed_size - strm.avail_out));
rc = inflate (&strm, Z_FINISH);
if (rc != Z_STREAM_END)
goto fail;
! rc = inflateReset (&strm);
}
! rc = inflateEnd (&strm);
if (rc != Z_OK
|| strm.avail_out != 0)
goto fail;
--- 8359,8381 ----
strm.zfree = NULL;
strm.opaque = NULL;
strm.avail_in = compressed_size - header_size;
! strm.next_in = (Bytef *) compressed_buffer + header_size;
strm.avail_out = uncompressed_size;
uncompressed_buffer = xmalloc (uncompressed_size);
! rc = inflateInit (& strm);
while (strm.avail_in > 0)
{
if (rc != Z_OK)
goto fail;
! strm.next_out = ((Bytef *) uncompressed_buffer
+ (uncompressed_size - strm.avail_out));
rc = inflate (&strm, Z_FINISH);
if (rc != Z_STREAM_END)
goto fail;
! rc = inflateReset (& strm);
}
! rc = inflateEnd (& strm);
if (rc != Z_OK
|| strm.avail_out != 0)
goto fail;
*************** debug_apply_relocations (void *file,
*** 8517,8523 ****
}
addend = is_rela ? rp->r_addend : byte_get (loc, reloc_size);
!
if (is_32bit_pcrel_reloc (reloc_type)
|| is_64bit_pcrel_reloc (reloc_type))
{
--- 8504,8510 ----
}
addend = is_rela ? rp->r_addend : byte_get (loc, reloc_size);
!
if (is_32bit_pcrel_reloc (reloc_type)
|| is_64bit_pcrel_reloc (reloc_type))
{
*************** process_archive (char *file_name, FILE *
*** 10704,10710 ****
size -= index_num * SIZEOF_AR_INDEX_NUMBERS;
/* Convert the index numbers into the host's numeric format. */
! index_array = malloc (index_num * sizeof (* index_array));
if (index_array == NULL)
{
free (index_buffer);
--- 10691,10697 ----
size -= index_num * SIZEOF_AR_INDEX_NUMBERS;
/* Convert the index numbers into the host's numeric format. */
! index_array = malloc (index_num * sizeof (* index_array));
if (index_array == NULL)
{
free (index_buffer);
*************** process_archive (char *file_name, FILE *
*** 10738,10744 ****
error (_("%s: failed to read archive index symbol table\n"), file_name);
ret = 1;
goto out;
! }
}
else
{
--- 10725,10731 ----
error (_("%s: failed to read archive index symbol table\n"), file_name);
ret = 1;
goto out;
! }
}
else
{
*************** process_archive (char *file_name, FILE *
*** 10860,10866 ****
{
error (_("%s: end of the symbol table reached before the end of the index\n"),
file_name);
! break;
}
printf ("\t%s\n", sym_table + l);
l += strlen (sym_table + l) + 1;
--- 10847,10853 ----
{
error (_("%s: end of the symbol table reached before the end of the index\n"),
file_name);
! break;
}
printf ("\t%s\n", sym_table + l);
l += strlen (sym_table + l) + 1;