espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-12-19 01:19:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

print cached error messages using _bfd_error_handler

Browse Source 
* bfd.c (bfd_print_error): Make static.  Don't print program name.
	(error_handler_fprintf): Print program name here.
	* format.c (print_warnmsg): Use _bfd_error_handler to print
	cached messages.
	* bfd-in2.h: Regenerate.
This commit is contained in:
Alan Modra
2024-03-09 13:26:19 +10:30
parent ed29a346be
commit bd8d76258f
3 changed files with 3 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bfd/bfd-in2.h
View File

@@ -2558,9 +2558,6 @@ void bfd_perror (const char *message);
typedef void (*bfd_error_handler_type) (const char *, va_list);
typedef int (*bfd_print_callback) (void *, const char *, ...);
void bfd_print_error (bfd_print_callback print_func,
void *stream, const char *fmt, va_list ap);
void _bfd_error_handler (const char *fmt, ...) ATTRIBUTE_PRINTF_1;
bfd_error_handler_type bfd_set_error_handler (bfd_error_handler_type);

22
bfd/bfd.c
View File

@@ -1449,31 +1449,12 @@ _bfd_doprnt_scan (const char *format, va_list ap, union _bfd_doprnt_args *args)
return arg_count;
}
/*
FUNCTION
bfd_print_error
SYNOPSIS
void bfd_print_error (bfd_print_callback print_func,
void *stream, const char *fmt, va_list ap);
DESCRIPTION
This formats FMT and AP according to BFD "printf" rules,
sending the output to STREAM by repeated calls to PRINT_FUNC.
PRINT_FUNC is a printf-like function; it does not need to
implement the BFD printf format extensions. This can be used
in a callback that is set via bfd_set_error_handler to turn
the error into ordinary output.
*/
void
static void
bfd_print_error (bfd_print_callback print_func, void *stream,
const char *fmt, va_list ap)
{
union _bfd_doprnt_args args[MAX_ARGS];
print_func (stream, "%s: ", _bfd_get_error_program_name ());
_bfd_doprnt_scan (fmt, ap, args);
_bfd_doprnt (print_func, stream, fmt, args);
}
@@ -1486,6 +1467,7 @@ error_handler_fprintf (const char *fmt, va_list ap)
/* PR 4992: Don't interrupt output being sent to stdout. */
fflush (stdout);
fprintf (stderr, "%s: ", _bfd_get_error_program_name ());
bfd_print_error ((bfd_print_callback) fprintf, stderr, fmt, ap);
/* On AIX, putc is implemented as a macro that triggers a -Wunused-value

9
bfd/format.c
View File

@@ -255,15 +255,8 @@ bfd_preserve_finish (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_preserve *preserve)
static void
print_warnmsg (struct per_xvec_message **list)
{
fflush (stdout);
fprintf (stderr, "%s: ", _bfd_get_error_program_name ());
for (struct per_xvec_message *warn = *list; warn; warn = warn->next)
{
fputs (warn->message, stderr);
fputc ('\n', stderr);
}
fflush (stderr);
_bfd_error_handler ("%s", warn->message);
}
static void