* ldmisc.c (vfinfo): Reindent.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index f29bf9a75a752fc856ad243868f476ab2774d94a..2d67298282cdb84452e72411d381b9570a53c753 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 26 14:42:27 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+       * ldmisc.c (vfinfo): Reindent.
+

 Mon Apr 22 12:07:32 1996  Ian Lance Taylor  <ian@cygnus.com>
 
        * ldlang.c (lang_size_sections): If _cooked_size is not 0, then
 Mon Apr 22 12:07:32 1996  Ian Lance Taylor  <ian@cygnus.com>
 
        * ldlang.c (lang_size_sections): If _cooked_size is not 0, then

diff --git a/ld/ldmisc.c b/ld/ldmisc.c
index 4f0d2c9a3f2cc9a20bf326c0b9f731fcd5fbb728..4f36290d88df0674ed86f74adb42addce6a8854e 100644 (file)
--- a/ld/ldmisc.c
+++ b/ld/ldmisc.c
@@ -1,6 +1,5 @@
 /* ldmisc.c
 /* ldmisc.c

-   Copyright (C) 1991, 92, 93, 94 Free Software Foundation, Inc.
-
+   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.

    Written by Steve Chamberlain of Cygnus Support.
 
 This file is part of GLD, the Gnu Linker.
    Written by Steve Chamberlain of Cygnus Support.
 
 This file is part of GLD, the Gnu Linker.


@@ -102,263 +101,267 @@ vfinfo (fp, fmt, arg)
 {
   boolean fatal = false;
 
 {
   boolean fatal = false;
 

-  while (*fmt) 
-  {
-    while (*fmt != '%' && *fmt != '\0') 
-    {
-      putc(*fmt, fp);
-      fmt++;
-    }
-
-    if (*fmt == '%') 
+  while (*fmt != '\0')

     {
     {

-      fmt ++;
-      switch (*fmt++) 
-      {
-      default:
-       fprintf(fp,"%%%c", fmt[-1]);
-       break;
-
-      case '%':
-       /* literal % */
-       putc('%', fp);
-       break;
-
-       case 'X':
-       /* no object output, fail return */
-       config.make_executable = false;
-       break;
-
-       case 'V':
-       /* hex bfd_vma */
+      while (*fmt != '%' && *fmt != '\0') 

        {
        {

-         bfd_vma value = va_arg(arg, bfd_vma);
-         fprintf_vma(fp, value);
+         putc (*fmt, fp);
+         fmt++;

        }
        }

-       break;

 
 

-      case 'v':
-       /* hex bfd_vma, no leading zeros */
+      if (*fmt == '%') 

        {
        {

-         char buf[100];
-         char *p = buf;
-         bfd_vma value = va_arg (arg, bfd_vma);
-         sprintf_vma (p, value);
-         while (*p == '0')
-           p++;
-         if (!*p)
-           p--;
-         fputs (p, fp);
-       }
-       break;
-
-       case 'T':
-       /* Symbol name.  */
-       {
-         const char *name = va_arg (arg, const char *);
+         fmt ++;
+         switch (*fmt++) 
+           {
+           default:
+             fprintf (fp,"%%%c", fmt[-1]);
+             break;
+
+           case '%':
+             /* literal % */
+             putc ('%', fp);
+             break;
+
+           case 'X':
+             /* no object output, fail return */
+             config.make_executable = false;
+             break;
+
+           case 'V':
+             /* hex bfd_vma */
+             {
+               bfd_vma value = va_arg (arg, bfd_vma);
+               fprintf_vma (fp, value);
+             }
+             break;
+
+           case 'v':
+             /* hex bfd_vma, no leading zeros */
+             {
+               char buf[100];
+               char *p = buf;
+               bfd_vma value = va_arg (arg, bfd_vma);
+               sprintf_vma (p, value);
+               while (*p == '0')
+                 p++;
+               if (!*p)
+                 p--;
+               fputs (p, fp);
+             }
+             break;
+
+           case 'T':
+             /* Symbol name.  */
+             {
+               const char *name = va_arg (arg, const char *);
+
+               if (name != (const char *) NULL)
+                 fprintf (fp, "%s", demangle (name, 1));
+               else
+                 fprintf (fp, "no symbol");
+             }
+             break;
+
+           case 'B':
+             /* filename from a bfd */
+             { 
+               bfd *abfd = va_arg (arg, bfd *);
+               if (abfd->my_archive)
+                 fprintf (fp, "%s(%s)", abfd->my_archive->filename,
+                          abfd->filename);
+               else
+                 fprintf (fp, "%s", abfd->filename);
+             }
+             break;
+
+           case 'F':
+             /* error is fatal */
+             fatal = true;
+             break;
+
+           case 'P':
+             /* print program name */
+             fprintf (fp, "%s", program_name);
+             break;
+
+           case 'E':
+             /* current bfd error or errno */
+             fprintf (fp, bfd_errmsg (bfd_get_error ()));
+             break;
+
+           case 'I':
+             /* filename from a lang_input_statement_type */
+             {
+               lang_input_statement_type *i;
+
+               i = va_arg (arg, lang_input_statement_type *);
+               if (bfd_my_archive (i->the_bfd) != NULL)
+                 fprintf (fp, "(%s)",
+                          bfd_get_filename (bfd_my_archive (i->the_bfd)));
+               fprintf (fp, "%s", i->local_sym_name);
+               if (bfd_my_archive (i->the_bfd) == NULL
+                   && strcmp (i->local_sym_name, i->filename) != 0)
+                 fprintf (fp, " (%s)", i->filename);
+             }
+             break;
+
+           case 'S':
+             /* print script file and linenumber */
+             if (parsing_defsym)
+               fprintf (fp, "--defsym %s", lex_string);
+             else if (ldfile_input_filename != NULL)
+               fprintf (fp, "%s:%u", ldfile_input_filename, lineno);
+             else
+               fprintf (fp, "built in linker script:%u", lineno);
+             break;

 
 

-         if (name != (const char *) NULL)
-           fprintf (fp, "%s", demangle (name, 1));
-         else
-           fprintf (fp, "no symbol");
-       }
-       break;
-
-       case 'B':
-       /* filename from a bfd */
-       { 
-        bfd *abfd = va_arg(arg, bfd *);
-        if (abfd->my_archive) {
-          fprintf(fp,"%s(%s)", abfd->my_archive->filename,
-                  abfd->filename);
-        }
-        else {
-          fprintf(fp,"%s", abfd->filename);
-        }
-       }
-       break;
-
-       case 'F':
-       /* error is fatal */
-       fatal = true;
-       break;
-
-       case 'P':
-       /* print program name */
-       fprintf(fp,"%s", program_name);
-       break;
-
-       case 'E':
-       /* current bfd error or errno */
-       fprintf(fp, bfd_errmsg(bfd_get_error ()));
-       break;
-
-       case 'I':
-       /* filename from a lang_input_statement_type */
-       {
-        lang_input_statement_type *i =
-         va_arg(arg,lang_input_statement_type *);
-
-        if (i->the_bfd->my_archive)
-          fprintf(fp, "(%s)", i->the_bfd->my_archive->filename);
-        fprintf(fp,"%s", i->local_sym_name);
-       }
-       break;
-
-       case 'S':
-       /* print script file and linenumber */
-       if (parsing_defsym)
-         fprintf (fp, "--defsym %s", lex_string);
-       else if (ldfile_input_filename != NULL)
-         fprintf (fp, "%s:%u", ldfile_input_filename, lineno);
-       else
-         fprintf (fp, "built in linker script:%u", lineno);
-       break;
-
-       case 'R':
-       /* Print all that's interesting about a relent */
-       {
-        arelent *relent = va_arg(arg, arelent *);
+           case 'R':
+             /* Print all that's interesting about a relent */
+             {
+               arelent *relent = va_arg (arg, arelent *);

        
        

-        finfo (fp, "%s+0x%v (type %s)",
-               (*(relent->sym_ptr_ptr))->name,
-               relent->addend,
-               relent->howto->name);
-       }
-       break;
+               finfo (fp, "%s+0x%v (type %s)",
+                      (*(relent->sym_ptr_ptr))->name,
+                      relent->addend,
+                      relent->howto->name);
+             }
+             break;

        
        

-       case 'C':
-       case 'D':
-       /* Clever filename:linenumber with function name if possible,
-          or section name as a last resort.  The arguments are a BFD,
-          a section, and an offset.  */
-       {
-         static bfd *last_bfd;
-         static char *last_file = NULL;
-         static char *last_function = NULL;
-         bfd *abfd;
-         asection *section;
-         bfd_vma offset;
-         lang_input_statement_type *entry;
-         asymbol **asymbols;
-         const char *filename;
-         const char *functionname;
-         unsigned int linenumber;
-         boolean discard_last;
-
-         abfd = va_arg (arg, bfd *);
-         section = va_arg (arg, asection *);
-         offset = va_arg (arg, bfd_vma);
-
-         entry = (lang_input_statement_type *) abfd->usrdata;
-         if (entry != (lang_input_statement_type *) NULL
-             && entry->asymbols != (asymbol **) NULL)
-           asymbols = entry->asymbols;
-         else
-           {
-             long symsize;
-             long symbol_count;
-
-             symsize = bfd_get_symtab_upper_bound (abfd);
-             if (symsize < 0)
-               einfo ("%B%F: could not read symbols\n", abfd);
-             asymbols = (asymbol **) xmalloc (symsize);
-             symbol_count = bfd_canonicalize_symtab (abfd, asymbols);
-             if (symbol_count < 0)
-               einfo ("%B%F: could not read symbols\n", abfd);
-             if (entry != (lang_input_statement_type *) NULL)
-               {
-                 entry->asymbols = asymbols;
-                 entry->symbol_count = symbol_count;
-               }
-           }
+           case 'C':
+           case 'D':
+             /* Clever filename:linenumber with function name if possible,
+                or section name as a last resort.  The arguments are a BFD,
+                a section, and an offset.  */
+             {
+               static bfd *last_bfd;
+               static char *last_file = NULL;
+               static char *last_function = NULL;
+               bfd *abfd;
+               asection *section;
+               bfd_vma offset;
+               lang_input_statement_type *entry;
+               asymbol **asymbols;
+               const char *filename;
+               const char *functionname;
+               unsigned int linenumber;
+               boolean discard_last;
+
+               abfd = va_arg (arg, bfd *);
+               section = va_arg (arg, asection *);
+               offset = va_arg (arg, bfd_vma);
+
+               entry = (lang_input_statement_type *) abfd->usrdata;
+               if (entry != (lang_input_statement_type *) NULL
+                   && entry->asymbols != (asymbol **) NULL)
+                 asymbols = entry->asymbols;
+               else
+                 {
+                   long symsize;
+                   long symbol_count;
+
+                   symsize = bfd_get_symtab_upper_bound (abfd);
+                   if (symsize < 0)
+                     einfo ("%B%F: could not read symbols\n", abfd);
+                   asymbols = (asymbol **) xmalloc (symsize);
+                   symbol_count = bfd_canonicalize_symtab (abfd, asymbols);
+                   if (symbol_count < 0)
+                     einfo ("%B%F: could not read symbols\n", abfd);
+                   if (entry != (lang_input_statement_type *) NULL)
+                     {
+                       entry->asymbols = asymbols;
+                       entry->symbol_count = symbol_count;
+                     }
+                 }
+
+               discard_last = true;
+               if (bfd_find_nearest_line (abfd, section, asymbols, offset,
+                                          &filename, &functionname,
+                                          &linenumber))
+                 {
+                   if (functionname != NULL && fmt[-1] == 'C')
+                     {
+                       if (filename == (char *) NULL)
+                         filename = abfd->filename;
+
+                       if (last_bfd == NULL
+                           || last_file == NULL
+                           || last_function == NULL
+                           || last_bfd != abfd
+                           || strcmp (last_file, filename) != 0
+                           || strcmp (last_function, functionname) != 0)
+                         {
+                           /* We use abfd->filename in this initial line,
+                              in case filename is a .h file or something
+                              similarly unhelpful.  */
+                           finfo (fp, "%B: In function `%s':\n",
+                                  abfd, demangle (functionname, 1));
+
+                           last_bfd = abfd;
+                           if (last_file != NULL)
+                             free (last_file);
+                           last_file = buystring (filename);
+                           if (last_function != NULL)
+                             free (last_function);
+                           last_function = buystring (functionname);
+                         }
+                       discard_last = false;
+                       if (linenumber != 0)
+                         fprintf (fp, "%s:%u", filename, linenumber);
+                       else
+                         finfo (fp, "%s(%s+0x%v)", filename, section->name,
+                                offset);
+                     }
+                   else if (filename == NULL
+                            || strcmp (filename, abfd->filename) == 0)
+                     {
+                       finfo (fp, "%B(%s+0x%v)", abfd, section->name, offset);
+                       if (linenumber != 0)
+                         finfo (fp, "%u", linenumber);
+                     }
+                   else if (linenumber != 0) 
+                     finfo (fp, "%B:%s:%u", abfd, filename, linenumber);
+                   else
+                     finfo (fp, "%B(%s+0x%v):%s", abfd, section->name, offset,
+                            filename);
+                 }
+               else
+                 finfo (fp, "%B(%s+0x%v)", abfd, section->name, offset);

 
 

-         discard_last = true;
-         if (bfd_find_nearest_line (abfd, section, asymbols, offset,
-                                    &filename, &functionname, &linenumber))
-           {
-             if (functionname != NULL && fmt[-1] == 'C')
-               {
-                 if (filename == (char *) NULL)
-                   filename = abfd->filename;
-
-                 if (last_bfd == NULL
-                     || last_file == NULL
-                     || last_function == NULL
-                     || last_bfd != abfd
-                     || strcmp (last_file, filename) != 0
-                     || strcmp (last_function, functionname) != 0)
-                   {
-                     /* We use abfd->filename in this initial line,
-                         in case filename is a .h file or something
-                         similarly unhelpful.  */
-                     finfo (fp, "%B: In function `%s':\n",
-                            abfd, demangle (functionname, 1));
-
-                     last_bfd = abfd;
-                     if (last_file != NULL)
+               if (discard_last)
+                 {
+                   last_bfd = NULL;
+                   if (last_file != NULL)
+                     {

                        free (last_file);
                        free (last_file);

-                     last_file = buystring (filename);
-                     if (last_function != NULL)
+                       last_file = NULL;
+                     }
+                   if (last_function != NULL)
+                     {

                        free (last_function);
                        free (last_function);

-                     last_function = buystring (functionname);
-                   }
-                 discard_last = false;
-                 if (linenumber != 0)
-                   fprintf (fp, "%s:%u", filename, linenumber);
-                 else
-                   finfo (fp, "%s(%s+0x%v)", filename, section->name, offset);
-               }
-             else if (filename == NULL
-                      || strcmp (filename, abfd->filename) == 0)
-               {
-                 finfo (fp, "%B(%s+0x%v)", abfd, section->name, offset);
-                 if (linenumber != 0)
-                   finfo (fp, "%u", linenumber);
-               }
-             else if (linenumber != 0) 
-               finfo (fp, "%B:%s:%u", abfd, filename, linenumber);
-             else
-               finfo (fp, "%B(%s+0x%v):%s", abfd, section->name, offset,
-                      filename);
-           }
-         else
-           finfo (fp, "%B(%s+0x%v)", abfd, section->name, offset);
-
-         if (discard_last)
-           {
-             last_bfd = NULL;
-             if (last_file != NULL)
-               {
-                 free (last_file);
-                 last_file = NULL;
-               }
-             if (last_function != NULL)
-               {
-                 free (last_function);
-                 last_function = NULL;
-               }
+                       last_function = NULL;
+                     }
+                 }
+             }
+             break;
+               
+           case 's':
+             /* arbitrary string, like printf */
+             fprintf (fp, "%s", va_arg (arg, char *));
+             break;
+
+           case 'd':
+             /* integer, like printf */
+             fprintf (fp, "%d", va_arg (arg, int));
+             break;
+
+           case 'u':
+             /* unsigned integer, like printf */
+             fprintf (fp,"%u", va_arg (arg, unsigned int));
+             break;

            }
        }
            }
        }

-       break;
-               
-       case 's':
-       /* arbitrary string, like printf */
-       fprintf(fp,"%s", va_arg(arg, char *));
-       break;
-
-       case 'd':
-       /* integer, like printf */
-       fprintf(fp,"%d", va_arg(arg, int));
-       break;
-
-       case 'u':
-       /* unsigned integer, like printf */
-       fprintf(fp,"%u", va_arg(arg, unsigned int));
-       break;
-      }

     }
     }

-  }

 
   if (fatal == true) 
     xexit(1);
 
   if (fatal == true) 
     xexit(1);