diff options
Diffstat (limited to 'contrib/binutils/gas/messages.c')
| -rw-r--r-- | contrib/binutils/gas/messages.c | 160 |
1 files changed, 69 insertions, 91 deletions
diff --git a/contrib/binutils/gas/messages.c b/contrib/binutils/gas/messages.c index e4b7ad0..e342673 100644 --- a/contrib/binutils/gas/messages.c +++ b/contrib/binutils/gas/messages.c @@ -1,5 +1,5 @@ /* messages.c - error reporter - - Copyright (C) 1987, 91, 92, 93, 94, 95, 96, 97, 1998 + Copyright (C) 1987, 91, 92, 93, 94, 95, 96, 97, 98, 2000 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + 02111-1307, USA. */ #include "as.h" @@ -47,8 +47,7 @@ static void as_show_where PARAMS ((void)); static void as_warn_internal PARAMS ((char *, unsigned int, char *)); static void as_bad_internal PARAMS ((char *, unsigned int, char *)); -/* - * Despite the rest of the comments in this file, (FIXME-SOON), +/* Despite the rest of the comments in this file, (FIXME-SOON), * here is the current scheme for error messages etc: * * as_fatal() is used when gas is quite confused and @@ -105,26 +104,26 @@ identify (file) fprintf (stderr, _("Assembler messages:\n")); } -static int warning_count; /* Count of number of warnings issued */ +/* The number of warnings issued. */ +static int warning_count; -int +int had_warnings () { return (warning_count); } /* Nonzero if we've hit a 'bad error', and should not write an obj file, - and exit with a nonzero error code */ + and exit with a nonzero error code. */ static int error_count; -int +int had_errors () { return (error_count); } - /* Print the current location to stderr. */ static void @@ -139,15 +138,11 @@ as_show_where () fprintf (stderr, "%s:%u: ", file, line); } -/* - * a s _ p e r r o r - * - * Like perror(3), but with more info. - */ +/* Like perror(3), but with more info. */ -void +void as_perror (gripe, filename) - const char *gripe; /* Unpunctuated error theme. */ + const char *gripe; /* Unpunctuated error theme. */ const char *filename; { const char *errtxt; @@ -166,18 +161,15 @@ as_perror (gripe, filename) #endif } -/* - * a s _ t s k t s k () - * - * Send to stderr a string as a warning, and locate warning - * in input file(s). - * Please only use this for when we have some recovery action. - * Please explain in string (which may have '\n's) what recovery was done. - */ +/* Send to stderr a string as a warning, and locate warning + in input file(s). + Please only use this for when we have some recovery action. + Please explain in string (which may have '\n's) what recovery was + done. */ #ifdef USE_STDARG -void -as_tsktsk (const char *format,...) +void +as_tsktsk (const char *format, ...) { va_list args; @@ -186,9 +178,9 @@ as_tsktsk (const char *format,...) vfprintf (stderr, format, args); va_end (args); (void) putc ('\n', stderr); -} /* as_tsktsk() */ +} #else -void +void as_tsktsk (format, va_alist) const char *format; va_dcl @@ -200,7 +192,7 @@ as_tsktsk (format, va_alist) vfprintf (stderr, format, args); va_end (args); (void) putc ('\n', stderr); -} /* as_tsktsk() */ +} #endif /* not NO_STDARG */ /* The common portion of as_warn and as_warn_where. */ @@ -227,18 +219,15 @@ as_warn_internal (file, line, buffer) #endif } -/* - * a s _ w a r n () - * - * Send to stderr a string as a warning, and locate warning - * in input file(s). - * Please only use this for when we have some recovery action. - * Please explain in string (which may have '\n's) what recovery was done. - */ +/* Send to stderr a string as a warning, and locate warning + in input file(s). + Please only use this for when we have some recovery action. + Please explain in string (which may have '\n's) what recovery was + done. */ #ifdef USE_STDARG -void -as_warn (const char *format,...) +void +as_warn (const char *format, ...) { va_list args; char buffer[2000]; @@ -250,10 +239,9 @@ as_warn (const char *format,...) va_end (args); as_warn_internal ((char *) NULL, 0, buffer); } -} /* as_warn() */ +} #else -/*VARARGS1 */ -void +void as_warn (format, va_alist) const char *format; va_dcl @@ -268,16 +256,16 @@ as_warn (format, va_alist) va_end (args); as_warn_internal ((char *) NULL, 0, buffer); } -} /* as_warn() */ +} #endif /* not NO_STDARG */ -/* as_warn_where, 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. */ +/* 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,...) +void +as_warn_where (char *file, unsigned int line, const char *format, ...) { va_list args; char buffer[2000]; @@ -289,10 +277,9 @@ as_warn_where (char *file, unsigned int line, const char *format,...) va_end (args); as_warn_internal (file, line, buffer); } -} /* as_warn() */ +} #else -/*VARARGS1 */ -void +void as_warn_where (file, line, format, va_alist) char *file; unsigned int line; @@ -309,7 +296,7 @@ as_warn_where (file, line, format, va_alist) va_end (args); as_warn_internal (file, line, buffer); } -} /* as_warn() */ +} #endif /* not NO_STDARG */ /* The common portion of as_bad and as_bad_where. */ @@ -336,18 +323,15 @@ as_bad_internal (file, line, buffer) #endif } -/* - * a s _ b a d () - * - * Send to stderr a string as a warning, and locate warning in input file(s). - * Please us when there is no recovery, but we want to continue processing - * but not produce an object file. - * Please explain in string (which may have '\n's) what recovery was done. - */ +/* Send to stderr a string as a warning, and locate warning in input + file(s). Please us when there is no recovery, but we want to + continue processing but not produce an object file. + Please explain in string (which may have '\n's) what recovery was + done. */ #ifdef USE_STDARG -void -as_bad (const char *format,...) +void +as_bad (const char *format, ...) { va_list args; char buffer[2000]; @@ -360,8 +344,7 @@ as_bad (const char *format,...) } #else -/*VARARGS1 */ -void +void as_bad (format, va_alist) const char *format; va_dcl @@ -377,13 +360,13 @@ as_bad (format, va_alist) } #endif /* not NO_STDARG */ -/* as_bad_where, 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. */ +/* 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,...) +void +as_bad_where (char *file, unsigned int line, const char *format, ...) { va_list args; char buffer[2000]; @@ -396,8 +379,7 @@ as_bad_where (char *file, unsigned int line, const char *format,...) } #else -/*VARARGS1 */ -void +void as_bad_where (file, line, format, va_alist) char *file; unsigned int line; @@ -415,18 +397,14 @@ as_bad_where (file, line, format, va_alist) } #endif /* not NO_STDARG */ -/* - * a s _ f a t a l () - * - * 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. - */ +/* 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,...) +void +as_fatal (const char *format, ...) { va_list args; @@ -436,11 +414,14 @@ as_fatal (const char *format,...) vfprintf (stderr, format, args); (void) putc ('\n', stderr); va_end (args); + /* Delete the output file, if it exists. This will prevent make from + thinking that a file was created and hence does not need rebuilding. */ + if (out_file_name != NULL) + unlink (out_file_name); xexit (EXIT_FAILURE); -} /* as_fatal() */ +} #else -/*VARARGS1*/ -void +void as_fatal (format, va_alist) char *format; va_dcl @@ -454,13 +435,11 @@ as_fatal (format, va_alist) (void) putc ('\n', stderr); va_end (args); xexit (EXIT_FAILURE); -} /* as_fatal() */ +} #endif /* not NO_STDARG */ -/* - * as_assert: Indicate assertion failure. - * Arguments: Filename, line number, optional function name. - */ +/* Indicate assertion failure. + Arguments: Filename, line number, optional function name. */ void as_assert (file, line, fn) @@ -480,6 +459,7 @@ as_assert (file, line, fn) /* as_abort: Print a friendly message saying how totally hosed we are, and exit without producing a core file. */ + void as_abort (file, line, fn) const char *file, *fn; @@ -537,5 +517,3 @@ sprint_value (buf, val) #endif abort (); } - -/* end of messages.c */ |
