aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/bfd.c13
2 files changed, 13 insertions, 6 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 52ff647..82bcbf2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-11 Pedro Alves <palves@redhat.com>
+
+ * bfd.c (_doprnt): Rename to ...
+ (_bfd_doprnt): ... this.
+ (error_handler_internal): Adjust.
+
2017-10-10 H.J. Lu <hongjiu.lu@intel.com>
* elf32-i386.c (elf_i386_check_relocs): Set GOT refcount to 1
diff --git a/bfd/bfd.c b/bfd/bfd.c
index f21c97a..7d6185f 100644
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -626,10 +626,11 @@ CODE_FRAGMENT
static const char *_bfd_error_program_name;
-/* This macro and _doprnt taken from libiberty _doprnt.c, tidied a
- little and extended to handle '%A' and '%B'. 'L' as a modifer for
- integer formats is used for bfd_vma and bfd_size_type args, which
- vary in size depending on BFD configuration. */
+/* This macro and _bfd_doprnt (originally _doprint) taken from
+ libiberty _doprnt.c, tidied a little and extended to handle '%A'
+ and '%B'. 'L' as a modifer for integer formats is used for bfd_vma
+ and bfd_size_type args, which vary in size depending on BFD
+ configuration. */
#define PRINT_TYPE(TYPE) \
do \
@@ -639,7 +640,7 @@ static const char *_bfd_error_program_name;
} while (0)
static int
-_doprnt (FILE *stream, const char *format, va_list ap)
+_bfd_doprnt (FILE *stream, const char *format, va_list ap)
{
const char *ptr = format;
char specifier[128];
@@ -883,7 +884,7 @@ error_handler_internal (const char *fmt, va_list ap)
else
fprintf (stderr, "BFD: ");
- _doprnt (stderr, fmt, ap);
+ _bfd_doprnt (stderr, fmt, ap);
/* On AIX, putc is implemented as a macro that triggers a -Wunused-value
warning, so use the fputc function to avoid it. */