* readelf.c (process_file_header): Handle e_phnum extension.

[deliverable/binutils-gdb.git] / binutils / bucomm.c

diff --git a/binutils/bucomm.c b/binutils/bucomm.c
index 9bbdafb9061b6ac159802710d41047af6966c5d4..e568b031ab953e0de0ded5ee195dff970a7cddcf 100644 (file)
--- a/binutils/bucomm.c
+++ b/binutils/bucomm.c
@@ -1,6 +1,6 @@
 /* bucomm.c -- Bin Utils COMmon code.
    Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1998, 2000, 2001, 2002,
-   2003, 2006, 2007, 2008, 2009
+   2003, 2005, 2006, 2007, 2008, 2009
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -70,12 +70,12 @@ bfd_nonfatal (const char *string)
    PROGRAM:file: bfd-error-message
    PROGRAM:file[section]: bfd-error-message
    PROGRAM:file: printf-message: bfd-error-message
-   PROGRAM:file[section]: printf-message: bfd-error-message
-*/
+   PROGRAM:file[section]: printf-message: bfd-error-message.  */
 
 void
 bfd_nonfatal_message (const char *filename,
-                     const bfd *bfd, const asection *section,
+                     const bfd *abfd,
+                     const asection *section,
                      const char *format, ...)
 {
   const char *errmsg = bfd_errmsg (bfd_get_error ());
@@ -85,12 +85,12 @@ bfd_nonfatal_message (const char *filename,
   va_start (args, format);
   fprintf (stderr, "%s", program_name);
   
-  if (bfd)
+  if (abfd)
     {
       if (!filename)
-       filename = bfd_get_archive_filename (bfd);
+       filename = bfd_get_archive_filename (abfd);
       if (section)
-       section_name = bfd_get_section_name (bfd, section);
+       section_name = bfd_get_section_name (abfd, section);
     }
   if (section_name)
     fprintf (stderr, ":%s[%s]", filename, section_name);
@@ -238,7 +238,7 @@ display_target_list (void)
     {
       const bfd_target *p = bfd_target_vector[t];
       bfd *abfd = bfd_openw (dummy_name, p->name);
-      enum bfd_architecture a;
+      int a;
 
       printf ("%s\n (header %s, data %s)\n", p->name,
              endian_string (p->header_byteorder),
@@ -284,7 +284,7 @@ display_info_table (int first, int last)
   int t;
   int ret = 1;
   char *dummy_name;
-  enum bfd_architecture a;
+  int a;
 
   /* Print heading of target names.  */
   printf ("\n%*s", (int) LONGEST_ARCH, " ");
@@ -294,10 +294,11 @@ display_info_table (int first, int last)
 
   dummy_name = make_temp_file (NULL);
   for (a = bfd_arch_obscure + 1; a < bfd_arch_last; a++)
-    if (strcmp (bfd_printable_arch_mach (a, 0), "UNKNOWN!") != 0)
+    if (strcmp (bfd_printable_arch_mach ((enum bfd_architecture) a, 0),
+                "UNKNOWN!") != 0)
       {
        printf ("%*s ", (int) LONGEST_ARCH - 1,
-               bfd_printable_arch_mach (a, 0));
+               bfd_printable_arch_mach ((enum bfd_architecture) a, 0));
        for (t = first; t < last && bfd_target_vector[t]; t++)
          {
            const bfd_target *p = bfd_target_vector[t];
@@ -326,7 +327,7 @@ display_info_table (int first, int last)
 
            if (ok)
              {
-               if (! bfd_set_arch_mach (abfd, a, 0))
+               if (! bfd_set_arch_mach (abfd, (enum bfd_architecture) a, 0))
                  ok = FALSE;
              }
 
@@ -461,7 +462,7 @@ template_in_dir (const char *path)
   if (slash != (char *) NULL)
     {
       len = slash - path;
-      tmpname = xmalloc (len + sizeof (template) + 2);
+      tmpname = (char *) xmalloc (len + sizeof (template) + 2);
       memcpy (tmpname, path, len);
 
 #ifdef HAVE_DOS_BASED_FILE_SYSTEM
@@ -475,7 +476,7 @@ template_in_dir (const char *path)
     }
   else
     {
-      tmpname = xmalloc (sizeof (template));
+      tmpname = (char *) xmalloc (sizeof (template));
       len = 0;
     }
 
@@ -551,7 +552,7 @@ parse_vma (const char *s, const char *arg)
 
 /* Returns the size of the named file.  If the file does not
    exist, or if it is not a real file, then a suitable non-fatal
-   error message is printed and zero is returned.  */
+   error message is printed and (off_t) -1 is returned.  */
 
 off_t
 get_file_size (const char * file_name)
@@ -571,7 +572,7 @@ get_file_size (const char * file_name)
   else
     return statbuf.st_size;
 
-  return 0;
+  return (off_t) -1;
 }
 
 /* Return the filename in a static buffer.  */
@@ -595,7 +596,7 @@ bfd_get_archive_filename (const bfd *abfd)
       if (curr)
        free (buf);
       curr = needed + (needed >> 1);
-      buf = bfd_malloc (curr);
+      buf = (char *) bfd_malloc (curr);
       /* If we can't malloc, fail safe by returning just the file name.
         This function is only used when building error messages.  */
       if (!buf)