* 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 e006e615bbcd76521f32808cd1066bd799fc192d..e568b031ab953e0de0ded5ee195dff970a7cddcf 100644 (file)
--- a/binutils/bucomm.c
+++ b/binutils/bucomm.c
@@ -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);
@@ -552,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)