/* messages.c - error reporter -
- Copyright 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001,
- 2003, 2004, 2005, 2006, 2007
- Free Software Foundation, Inc.
+ Copyright (C) 1987-2016 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
GAS is free software; you can redistribute it and/or modify
#include "as.h"
-static void identify (char *);
+static void identify (const char *);
static void as_show_where (void);
-static void as_warn_internal (char *, unsigned int, char *);
-static void as_bad_internal (char *, unsigned int, char *);
+static void as_warn_internal (const char *, unsigned int, char *);
+static void as_bad_internal (const char *, unsigned int, char *);
/* Despite the rest of the comments in this file, (FIXME-SOON),
here is the current scheme for error messages etc:
continues as though no error occurred. */
static void
-identify (char *file)
+identify (const char *file)
{
static int identified;
if (!file)
{
unsigned int x;
- as_where (&file, &x);
+ file = as_where (&x);
}
if (file)
static void
as_show_where (void)
{
- char *file;
+ const char *file;
unsigned int line;
- as_where (&file, &line);
+ file = as_where (&line);
identify (file);
if (file)
- fprintf (stderr, "%s:%u: ", file, line);
+ {
+ if (line != 0)
+ fprintf (stderr, "%s:%u: ", file, line);
+ else
+ fprintf (stderr, "%s: ", file);
+ }
}
/* Send to stderr a string as a warning, and locate warning
Please explain in string (which may have '\n's) what recovery was
done. */
-#ifdef USE_STDARG
void
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. */
static void
-as_warn_internal (char *file, unsigned int line, char *buffer)
+as_warn_internal (const char *file, unsigned int line, char *buffer)
{
++warning_count;
if (file == NULL)
- as_where (&file, &line);
+ file = as_where (&line);
identify (file);
if (file)
- fprintf (stderr, "%s:%u: ", file, line);
- fprintf (stderr, _("Warning: "));
- fputs (buffer, stderr);
- (void) putc ('\n', stderr);
+ {
+ if (line != 0)
+ fprintf (stderr, "%s:%u: %s%s\n", file, line, _("Warning: "), buffer);
+ else
+ fprintf (stderr, "%s: %s%s\n", file, _("Warning: "), buffer);
+ }
+ else
+ fprintf (stderr, "%s%s\n", _("Warning: "), buffer);
#ifndef NO_LISTING
listing_warning (buffer);
#endif
Please explain in string (which may have '\n's) what recovery was
done. */
-#ifdef USE_STDARG
void
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, ...)
+as_warn_where (const char *file, unsigned int line, const char *format, ...)
{
va_list args;
char buffer[2000];
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. */
static void
-as_bad_internal (char *file, unsigned int line, char *buffer)
+as_bad_internal (const char *file, unsigned int line, char *buffer)
{
++error_count;
if (file == NULL)
- as_where (&file, &line);
+ file = as_where (&line);
identify (file);
if (file)
- fprintf (stderr, "%s:%u: ", file, line);
- fprintf (stderr, _("Error: "));
- fputs (buffer, stderr);
- (void) putc ('\n', stderr);
+ {
+ if (line != 0)
+ fprintf (stderr, "%s:%u: %s%s\n", file, line, _("Error: "), buffer);
+ else
+ fprintf (stderr, "%s: %s%s\n", file, _("Error: "), buffer);
+ }
+ else
+ fprintf (stderr, "%s%s\n", _("Error: "), buffer);
#ifndef NO_LISTING
listing_error (buffer);
#endif
}
/* 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
+ file(s). Please use 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, ...)
{
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, ...)
+as_bad_where (const char *file, unsigned int line, const char *format, ...)
{
va_list args;
char buffer[2000];
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, ...)
{
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);
- xexit (EXIT_FAILURE);
-}
-#endif /* not NO_STDARG */
/* Indicate assertion failure.
Arguments: Filename, line number, optional function name. */
as_show_where ();
fprintf (stderr, _("Internal error!\n"));
if (fn)
- fprintf (stderr, _("Assertion failure in %s at %s line %d.\n"),
+ fprintf (stderr, _("Assertion failure in %s at %s:%d.\n"),
fn, file, line);
else
- fprintf (stderr, _("Assertion failure at %s line %d.\n"), file, line);
+ fprintf (stderr, _("Assertion failure at %s:%d.\n"), file, line);
fprintf (stderr, _("Please report this bug.\n"));
xexit (EXIT_FAILURE);
}
{
as_show_where ();
if (fn)
- fprintf (stderr, _("Internal error, aborting at %s line %d in %s\n"),
+ fprintf (stderr, _("Internal error, aborting at %s:%d in %s\n"),
file, line, fn);
else
- fprintf (stderr, _("Internal error, aborting at %s line %d\n"),
+ fprintf (stderr, _("Internal error, aborting at %s:%d\n"),
file, line);
fprintf (stderr, _("Please report this bug.\n"));
xexit (EXIT_FAILURE);
#define HEX_MIN_THRESHOLD -(HEX_MAX_THRESHOLD)
static void
-as_internal_value_out_of_range (char * prefix,
- offsetT val,
- offsetT min,
- offsetT max,
- char * file,
- unsigned line,
- int bad)
+as_internal_value_out_of_range (const char *prefix,
+ offsetT val,
+ offsetT min,
+ offsetT max,
+ const char *file,
+ unsigned line,
+ int bad)
{
const char * err;
if (sizeof (val) > sizeof (bfd_vma))
abort ();
- sprintf_vma (val_buf, val);
- sprintf_vma (min_buf, min);
- sprintf_vma (max_buf, max);
+ sprintf_vma (val_buf, (bfd_vma) val);
+ sprintf_vma (min_buf, (bfd_vma) min);
+ sprintf_vma (max_buf, (bfd_vma) max);
/* xgettext:c-format. */
err = _("%s out of range (0x%s is not between 0x%s and 0x%s)");
}
void
-as_warn_value_out_of_range (char * prefix,
- offsetT value,
- offsetT min,
- offsetT max,
- char * file,
+as_warn_value_out_of_range (const char *prefix,
+ offsetT value,
+ offsetT min,
+ offsetT max,
+ const char *file,
unsigned line)
{
as_internal_value_out_of_range (prefix, value, min, max, file, line, 0);
}
void
-as_bad_value_out_of_range (char * prefix,
- offsetT value,
- offsetT min,
- offsetT max,
- char * file,
+as_bad_value_out_of_range (const char *prefix,
+ offsetT value,
+ offsetT min,
+ offsetT max,
+ const char *file,
unsigned line)
{
as_internal_value_out_of_range (prefix, value, min, max, file, line, 1);
projects / deliverable / binutils-gdb.git / blobdiff