apply mising piece of previous patch

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

diff --git a/bfd/bfd.c b/bfd/bfd.c
index b842027a66b53426a8be0528f564110912424f88..8ebc81a9953d33f30d24fdeede90874eeb04167f 100644 (file)
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -437,7 +437,7 @@ _bfd_default_error_handler (const char *fmt, ...)
     abort ();
 
   p = fmt;
-  while (*p != '\0')
+  while (1)
     {
       char *q;
       size_t len, extra, trim;
@@ -531,7 +531,9 @@ _bfd_default_error_handler (const char *fmt, ...)
                    }
                  while (--trim != 0);
                  *q = '\0';
+                 avail = extra;
                }
+             avail -= extra;
 
              /* Now double all '%' chars, shuffling the string as we go.  */
              while (extra != 0)
@@ -1216,8 +1218,9 @@ DESCRIPTION
 .#define bfd_canonicalize_dynamic_symtab(abfd, asymbols) \
 .      BFD_SEND (abfd, _bfd_canonicalize_dynamic_symtab, (abfd, asymbols))
 .
-.#define bfd_get_synthetic_symtab(abfd, dynsyms, ret) \
-.      BFD_SEND (abfd, _bfd_get_synthetic_symtab, (abfd, dynsyms, ret))
+.#define bfd_get_synthetic_symtab(abfd, count, syms, dyncount, dynsyms, ret) \
+.      BFD_SEND (abfd, _bfd_get_synthetic_symtab, (abfd, count, syms, \
+.                                                  dyncount, dynsyms, ret))
 .
 .#define bfd_get_dynamic_reloc_upper_bound(abfd) \
 .      BFD_SEND (abfd, _bfd_get_dynamic_reloc_upper_bound, (abfd))