projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arc/gas: default mach is arc700, initialised in md_begin
[deliverable/binutils-gdb.git]
/
gas
/
messages.c
diff --git
a/gas/messages.c
b/gas/messages.c
index 979253d2bec75503675e00664f673ee7df331b44..dc016bf86e65ad9aa8e1c050de2a6b989291b038 100644
(file)
--- a/
gas/messages.c
+++ b/
gas/messages.c
@@
-1,5
+1,5
@@
/* messages.c - error reporter -
/* messages.c - error reporter -
- Copyright (C) 1987-201
4
Free Software Foundation, Inc.
+ Copyright (C) 1987-201
6
Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
GAS is free software; you can redistribute it and/or modify
This file is part of GAS, the GNU Assembler.
GAS is free software; you can redistribute it and/or modify
@@
-19,10
+19,10
@@
#include "as.h"
#include "as.h"
-static void identify (char *);
+static void identify (c
onst c
har *);
static void as_show_where (void);
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 (c
onst c
har *, unsigned int, char *);
+static void as_bad_internal (c
onst c
har *, unsigned int, char *);
/* Despite the rest of the comments in this file, (FIXME-SOON),
here is the current scheme for error messages etc:
/* Despite the rest of the comments in this file, (FIXME-SOON),
here is the current scheme for error messages etc:
@@
-61,7
+61,7
@@
static void as_bad_internal (char *, unsigned int, char *);
continues as though no error occurred. */
static void
continues as though no error occurred. */
static void
-identify (char *file)
+identify (c
onst c
har *file)
{
static int identified;
{
static int identified;
@@
-72,7
+72,7
@@
identify (char *file)
if (!file)
{
unsigned int x;
if (!file)
{
unsigned int x;
-
as_where (&file,
&x);
+
file = as_where (
&x);
}
if (file)
}
if (file)
@@
-105,10
+105,10
@@
had_errors (void)
static void
as_show_where (void)
{
static void
as_show_where (void)
{
- char *file;
+ c
onst c
har *file;
unsigned int line;
unsigned int line;
-
as_where (&file,
&line);
+
file = as_where (
&line);
identify (file);
if (file)
{
identify (file);
if (file)
{
@@
-140,24
+140,23
@@
as_tsktsk (const char *format, ...)
/* The common portion of as_warn and as_warn_where. */
static void
/* 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 (c
onst c
har *file, unsigned int line, char *buffer)
{
++warning_count;
if (file == NULL)
{
++warning_count;
if (file == NULL)
-
as_where (&file,
&line);
+
file = as_where (
&line);
identify (file);
if (file)
{
if (line != 0)
identify (file);
if (file)
{
if (line != 0)
- fprintf (stderr, "%s:%u:
", file, line
);
+ fprintf (stderr, "%s:%u:
%s%s\n", file, line, _("Warning: "), buffer
);
else
else
- fprintf (stderr, "%s:
", file
);
+ fprintf (stderr, "%s:
%s%s\n", file, _("Warning: "), buffer
);
}
}
- fprintf (stderr, _("Warning: "));
- fputs (buffer, stderr);
- (void) putc ('\n', stderr);
+ else
+ fprintf (stderr, "%s%s\n", _("Warning: "), buffer);
#ifndef NO_LISTING
listing_warning (buffer);
#endif
#ifndef NO_LISTING
listing_warning (buffer);
#endif
@@
-189,7
+188,7
@@
as_warn (const char *format, ...)
the varargs correctly and portably. */
void
the varargs correctly and portably. */
void
-as_warn_where (char *file, unsigned int line, const char *format, ...)
+as_warn_where (c
onst c
har *file, unsigned int line, const char *format, ...)
{
va_list args;
char buffer[2000];
{
va_list args;
char buffer[2000];
@@
-206,24
+205,23
@@
as_warn_where (char *file, unsigned int line, const char *format, ...)
/* The common portion of as_bad and as_bad_where. */
static void
/* 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 (c
onst c
har *file, unsigned int line, char *buffer)
{
++error_count;
if (file == NULL)
{
++error_count;
if (file == NULL)
-
as_where (&file,
&line);
+
file = as_where (
&line);
identify (file);
if (file)
{
if (line != 0)
identify (file);
if (file)
{
if (line != 0)
- fprintf (stderr, "%s:%u:
", file, line
);
+ fprintf (stderr, "%s:%u:
%s%s\n", file, line, _("Error: "), buffer
);
else
else
- fprintf (stderr, "%s:
", file
);
+ fprintf (stderr, "%s:
%s%s\n", file, _("Error: "), buffer
);
}
}
- fprintf (stderr, _("Error: "));
- fputs (buffer, stderr);
- (void) putc ('\n', stderr);
+ else
+ fprintf (stderr, "%s%s\n", _("Error: "), buffer);
#ifndef NO_LISTING
listing_error (buffer);
#endif
#ifndef NO_LISTING
listing_error (buffer);
#endif
@@
-253,7
+251,7
@@
as_bad (const char *format, ...)
the varargs correctly and portably. */
void
the varargs correctly and portably. */
void
-as_bad_where (char *file, unsigned int line, const char *format, ...)
+as_bad_where (c
onst c
har *file, unsigned int line, const char *format, ...)
{
va_list args;
char buffer[2000];
{
va_list args;
char buffer[2000];
@@
-297,10
+295,10
@@
as_assert (const char *file, int line, const char *fn)
as_show_where ();
fprintf (stderr, _("Internal error!\n"));
if (fn)
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
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);
}
fprintf (stderr, _("Please report this bug.\n"));
xexit (EXIT_FAILURE);
}
@@
-313,10
+311,10
@@
as_abort (const char *file, int line, const char *fn)
{
as_show_where ();
if (fn)
{
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
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);
file, line);
fprintf (stderr, _("Please report this bug.\n"));
xexit (EXIT_FAILURE);
@@
-344,13
+342,13
@@
sprint_value (char *buf, valueT val)
#define HEX_MIN_THRESHOLD -(HEX_MAX_THRESHOLD)
static void
#define HEX_MIN_THRESHOLD -(HEX_MAX_THRESHOLD)
static void
-as_internal_value_out_of_range (c
har *
prefix,
- offsetT val,
- offsetT min,
- offsetT max,
- c
har *
file,
- unsigned line,
- int bad)
+as_internal_value_out_of_range (c
onst char *
prefix,
+ offsetT
val,
+ offsetT
min,
+ offsetT
max,
+ c
onst char *
file,
+ unsigned
line,
+ int
bad)
{
const char * err;
{
const char * err;
@@
-420,7
+418,7
@@
as_warn_value_out_of_range (char * prefix,
offsetT value,
offsetT min,
offsetT max,
offsetT value,
offsetT min,
offsetT max,
- char * file,
+ c
onst c
har * file,
unsigned line)
{
as_internal_value_out_of_range (prefix, value, min, max, file, line, 0);
unsigned line)
{
as_internal_value_out_of_range (prefix, value, min, max, file, line, 0);
@@
-431,7
+429,7
@@
as_bad_value_out_of_range (char * prefix,
offsetT value,
offsetT min,
offsetT max,
offsetT value,
offsetT min,
offsetT max,
- char * file,
+ c
onst c
har * file,
unsigned line)
{
as_internal_value_out_of_range (prefix, value, min, max, file, line, 1);
unsigned line)
{
as_internal_value_out_of_range (prefix, value, min, max, file, line, 1);
This page took
0.047075 seconds
and
4
git commands to generate.