diff options
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/bfd.c | 43 |
2 files changed, 11 insertions, 38 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 9984482d01b..8f6cf6c4e47 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2001-09-26 Alan Modra <amodra@bigpond.net.au> + + * bfd.c (_bfd_default_error_handlerl): Define using VPARAMS, + VA_OPEN, VA_FIXEDARG, VA_CLOSE. + (bfd_archive_filename): Cast bfd_malloc arg to the correct size. + 2001-09-25 Jakub Jelinek <jakub@redhat.com> * elf64-sparc.c (sparc64_elf_build_plt): Fix .plt[32768+] slot diff --git a/bfd/bfd.c b/bfd/bfd.c index 8ffc7c342a5..0dd42893fb5 100644 --- a/bfd/bfd.c +++ b/bfd/bfd.c @@ -410,57 +410,24 @@ static const char *_bfd_error_program_name; /* This is the default routine to handle BFD error messages. */ -#ifdef ANSI_PROTOTYPES - static void _bfd_default_error_handler PARAMS ((const char *s, ...)); static void -_bfd_default_error_handler (const char *s, ...) +_bfd_default_error_handler VPARAMS ((const char *s, ...)) { - va_list p; - if (_bfd_error_program_name != NULL) fprintf (stderr, "%s: ", _bfd_error_program_name); else fprintf (stderr, "BFD: "); - va_start (p, s); - + VA_OPEN (p, s); + VA_FIXEDARG (p, const char *, s); vfprintf (stderr, s, p); - - va_end (p); + VA_CLOSE (p); fprintf (stderr, "\n"); } -#else /* ! defined (ANSI_PROTOTYPES) */ - -static void _bfd_default_error_handler (); - -static void -_bfd_default_error_handler (va_alist) - va_dcl -{ - va_list p; - const char *s; - - if (_bfd_error_program_name != NULL) - fprintf (stderr, "%s: ", _bfd_error_program_name); - else - fprintf (stderr, "BFD: "); - - va_start (p); - - s = va_arg (p, const char *); - vfprintf (stderr, s, p); - - va_end (p); - - fprintf (stderr, "\n"); -} - -#endif /* ! defined (ANSI_PROTOTYPES) */ - /* This is a function pointer to the routine which should handle BFD error messages. It is called when a BFD routine encounters an error for which it wants to print a message. Going through a @@ -560,7 +527,7 @@ bfd_archive_filename (abfd) if (curr) free (buf); curr = needed + (needed >> 1); - buf = bfd_malloc (curr); + buf = bfd_malloc ((bfd_size_type) curr); /* If we can't malloc, fail safe by returning just the file name. This function is only used when building error messages. */ |