Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

2010-06-02 Tristan Gingold <gingold@adacore.com>

Browse Source 
* as.h: Remove conditionnal definition of HAVE_STDARG_H,
	USE_STDARG, va_alist, va_dcl, va_list, va_start, va_end.
	Remove conditionnal inclusion of stdarg.h and varargs.h.
	Assume ISO C.
	* config.in: Regenerate.
	* configure: Regenerate.
	* configure.in: Remove stdarg.h and varargs.h from
	AC_CHECK_HEADERS list.
	* messages.c (as_tsktsk): Remove non ISO C version.
	(as_warn, as_warn_where, as_bad, as_bad_where, as_fatal): Ditto.
This commit is contained in:
Tristan Gingold
2010-06-03 07:36:04 +00:00
parent df17845119
commit aadd803061
6 changed files with 15 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
gas/messages.c
View File

@@ -122,7 +122,6 @@ as_show_where (void)
Please explain in string (which may have '\n's) what recovery was
done. */
#ifdef USE_STDARG
void
as_tsktsk (const char *format, ...)
{
@@ -134,21 +133,6 @@ as_tsktsk (const char *format, ...)
va_end (args);
(void) putc ('\n', stderr);
}
#else
void
as_tsktsk (format, va_alist)
const char *format;
va_dcl
{
va_list args;
as_show_where ();
va_start (args);
vfprintf (stderr, format, args);
va_end (args);
(void) putc ('\n', stderr);
}
#endif /* not NO_STDARG */
/* The common portion of as_warn and as_warn_where. */
@@ -177,7 +161,6 @@ as_warn_internal (char *file, unsigned int line, char *buffer)
Please explain in string (which may have '\n's) what recovery was
done. */
#ifdef USE_STDARG
void
as_warn (const char *format, ...)
{
@@ -192,30 +175,11 @@ as_warn (const char *format, ...)
as_warn_internal ((char *) NULL, 0, buffer);
}
}
#else
void
as_warn (format, va_alist)
const char *format;
va_dcl
{
va_list args;
char buffer[2000];
if (!flag_no_warnings)
{
va_start (args);
vsnprintf (buffer, sizeof (buffer), format, args);
va_end (args);
as_warn_internal ((char *) NULL, 0, buffer);
}
}
#endif /* not NO_STDARG */
/* Like as_bad but the file name and line number are passed in.
Unfortunately, we have to repeat the function in order to handle
the varargs correctly and portably. */
#ifdef USE_STDARG
void
as_warn_where (char *file, unsigned int line, const char *format, ...)
{
@@ -230,26 +194,6 @@ as_warn_where (char *file, unsigned int line, const char *format, ...)
as_warn_internal (file, line, buffer);
}
}
#else
void
as_warn_where (file, line, format, va_alist)
char *file;
unsigned int line;
const char *format;
va_dcl
{
va_list args;
char buffer[2000];
if (!flag_no_warnings)
{
va_start (args);
vsnprintf (buffer, sizeof (buffer), format, args);
va_end (args);
as_warn_internal (file, line, buffer);
}
}
#endif /* not NO_STDARG */
/* The common portion of as_bad and as_bad_where. */
@@ -278,7 +222,6 @@ as_bad_internal (char *file, unsigned int line, char *buffer)
Please explain in string (which may have '\n's) what recovery was
done. */
#ifdef USE_STDARG
void
as_bad (const char *format, ...)
{
@@ -292,28 +235,10 @@ as_bad (const char *format, ...)
as_bad_internal ((char *) NULL, 0, buffer);
}
#else
void
as_bad (format, va_alist)
const char *format;
va_dcl
{
va_list args;
char buffer[2000];
va_start (args);
vsnprintf (buffer, sizeof (buffer), format, args);
va_end (args);
as_bad_internal ((char *) NULL, 0, buffer);
}
#endif /* not NO_STDARG */
/* Like as_bad but the file name and line number are passed in.
Unfortunately, we have to repeat the function in order to handle
the varargs correctly and portably. */
#ifdef USE_STDARG
void
as_bad_where (char *file, unsigned int line, const char *format, ...)
{
@@ -327,31 +252,11 @@ as_bad_where (char *file, unsigned int line, const char *format, ...)
as_bad_internal (file, line, buffer);
}
#else
void
as_bad_where (file, line, format, va_alist)
char *file;
unsigned int line;
const char *format;
va_dcl
{
va_list args;
char buffer[2000];
va_start (args);
vsnprintf (buffer, sizeof (buffer), format, args);
va_end (args);
as_bad_internal (file, line, buffer);
}
#endif /* not NO_STDARG */
/* Send to stderr a string as a fatal message, and print location of
error in input file(s).
Please only use this for when we DON'T have some recovery action.
It xexit()s with a warning status. */
#ifdef USE_STDARG
void
as_fatal (const char *format, ...)
{
@@ -369,25 +274,6 @@ as_fatal (const char *format, ...)
unlink_if_ordinary (out_file_name);
xexit (EXIT_FAILURE);
}
#else
void
as_fatal (format, va_alist)
char *format;
va_dcl
{
va_list args;
as_show_where ();
va_start (args);
fprintf (stderr, _("Fatal error: "));
vfprintf (stderr, format, args);
(void) putc ('\n', stderr);
va_end (args);
if (out_file_name != NULL)
unlink_if_ordinary (out_file_name);
xexit (EXIT_FAILURE);
}
#endif /* not NO_STDARG */
/* Indicate assertion failure.
Arguments: Filename, line number, optional function name. */