OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(forgot in last checkin)

Browse Source 
Use VA_OPEN/VA_CLOSE/VA_FIXEDARG throughout.

From-SVN: r45223
This commit is contained in:
Andreas Jaeger 2001-08-28 06:55:48 +02:00
parent c23bb84bd3
commit 79e8ec0eb2
2 changed files with 83 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
gcc/calls.c
View File

@ -4203,26 +4203,15 @@ void
emit_library_call VPARAMS((rtx orgfun, enum libcall_type fn_type, emit_library_call VPARAMS((rtx orgfun, enum libcall_type fn_type,
enum machine_mode outmode, int nargs, ...)) enum machine_mode outmode, int nargs, ...))
{ {
#ifndef ANSI_PROTOTYPES VA_OPEN (p, nargs);
rtx orgfun; VA_FIXEDARG (p, rtx, orgfun);
int fn_type; VA_FIXEDARG (p, int, fn_type);
enum machine_mode outmode; VA_FIXEDARG (p, enum machine_mode, outmode);
int nargs; VA_FIXEDARG (p, int, nargs);
#endif
va_list p;
VA_START (p, nargs);
#ifndef ANSI_PROTOTYPES
orgfun = va_arg (p, rtx);
fn_type = va_arg (p, int);
outmode = va_arg (p, enum machine_mode);
nargs = va_arg (p, int);
#endif
emit_library_call_value_1 (0, orgfun, NULL_RTX, fn_type, outmode, nargs, p); emit_library_call_value_1 (0, orgfun, NULL_RTX, fn_type, outmode, nargs, p);
va_end (p); VA_CLOSE (p);
} }
/* Like emit_library_call except that an extra argument, VALUE, /* Like emit_library_call except that an extra argument, VALUE,
@ -4238,28 +4227,16 @@ emit_library_call_value VPARAMS((rtx orgfun, rtx value,
enum libcall_type fn_type, enum libcall_type fn_type,
enum machine_mode outmode, int nargs, ...)) enum machine_mode outmode, int nargs, ...))
{ {
#ifndef ANSI_PROTOTYPES VA_OPEN (p, nargs);
rtx orgfun; VA_FIXEDARG (p, rtx, orgfun);
rtx value; VA_FIXEDARG (p, rtx, value);
int fn_type; VA_FIXEDARG (p, int, fn_type);
enum machine_mode outmode; VA_FIXEDARG (p, enum machine_mode, outmode);
int nargs; VA_FIXEDARG (p, int, nargs);
#endif
va_list p;
VA_START (p, nargs);
#ifndef ANSI_PROTOTYPES
orgfun = va_arg (p, rtx);
value = va_arg (p, rtx);
fn_type = va_arg (p, int);
outmode = va_arg (p, enum machine_mode);
nargs = va_arg (p, int);
#endif
value = emit_library_call_value_1 (1, orgfun, value, fn_type, outmode, nargs, p); value = emit_library_call_value_1 (1, orgfun, value, fn_type, outmode, nargs, p);
va_end (p); VA_CLOSE (p);
return value; return value;
} }

274
gcc/diagnostic.c
View File

@ -757,21 +757,14 @@ vbuild_message_string (msg, ap)
static char * static char *
build_message_string VPARAMS ((const char *msg, ...)) build_message_string VPARAMS ((const char *msg, ...))
{ {
#ifndef ANSI_PROTOTYPES
const char *msg;
#endif
va_list ap;
char *str; char *str;
VA_START (ap, msg); VA_OPEN (ap, msg);
VA_FIXEDARG (ap, const char *, msg);
#ifndef ANSI_PROTOTYPES
msg = va_arg (ap, const char *);
#endif
str = vbuild_message_string (msg, ap); str = vbuild_message_string (msg, ap);
va_end (ap); VA_CLOSE (ap);
return str; return str;
} }
@ -830,23 +823,17 @@ output_do_printf (buffer, msg)
void void
output_printf VPARAMS ((struct output_buffer *buffer, const char *msgid, ...)) output_printf VPARAMS ((struct output_buffer *buffer, const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES
struct output_buffer *buffer;
const char *msgid;
#endif
va_list ap;
va_list *old_args; va_list *old_args;
VA_START (ap, msgid); VA_OPEN (ap, msgid);
#ifndef ANSI_PROTOTYPES VA_FIXEDARG (ap, output_buffer *, buffer);
buffer = va_arg (ap, output_buffer *); VA_FIXEDARG (ap, const char *, msgid);
msgid = va_arg (ap, const char *);
#endif
old_args = output_buffer_ptr_to_format_args (buffer); old_args = output_buffer_ptr_to_format_args (buffer);
output_buffer_ptr_to_format_args (buffer) = ≈ output_buffer_ptr_to_format_args (buffer) = ≈
output_do_printf (buffer, _(msgid)); output_do_printf (buffer, _(msgid));
output_buffer_ptr_to_format_args (buffer) = old_args; output_buffer_ptr_to_format_args (buffer) = old_args;
va_end (ap); VA_CLOSE (ap);
} }
/* Print a message relevant to the given DECL. */ /* Print a message relevant to the given DECL. */
@ -966,21 +953,12 @@ count_error (warningp)
void void
fnotice VPARAMS ((FILE *file, const char *msgid, ...)) fnotice VPARAMS ((FILE *file, const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES VA_OPEN (ap, msgid);
FILE *file; VA_FIXEDARG (ap, FILE *, file);
const char *msgid; VA_FIXEDARG (ap, const char *, msgid);
#endif
va_list ap;
VA_START (ap, msgid);
#ifndef ANSI_PROTOTYPES
file = va_arg (ap, FILE *);
msgid = va_arg (ap, const char *);
#endif
vfprintf (file, _(msgid), ap); vfprintf (file, _(msgid), ap);
va_end (ap); VA_CLOSE (ap);
} }
@ -990,18 +968,12 @@ fnotice VPARAMS ((FILE *file, const char *msgid, ...))
void void
fatal_io_error VPARAMS ((const char *msgid, ...)) fatal_io_error VPARAMS ((const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES
const char *msgid;
#endif
va_list ap;
output_state os; output_state os;
os = output_buffer_state (diagnostic_buffer); VA_OPEN (ap, msgid);
VA_START (ap, msgid); VA_FIXEDARG (ap, const char *, msgid);
#ifndef ANSI_PROTOTYPES os = output_buffer_state (diagnostic_buffer);
msgid = va_arg (ap, const char *);
#endif
output_printf (diagnostic_buffer, "%s: %s: ", progname, xstrerror (errno)); output_printf (diagnostic_buffer, "%s: %s: ", progname, xstrerror (errno));
output_buffer_ptr_to_format_args (diagnostic_buffer) = ≈ output_buffer_ptr_to_format_args (diagnostic_buffer) = ≈
@ -1009,7 +981,7 @@ fatal_io_error VPARAMS ((const char *msgid, ...))
output_format (diagnostic_buffer); output_format (diagnostic_buffer);
diagnostic_finish ((output_buffer *)global_dc); diagnostic_finish ((output_buffer *)global_dc);
output_buffer_state (diagnostic_buffer) = os; output_buffer_state (diagnostic_buffer) = os;
va_end (ap); VA_CLOSE (ap);
exit (FATAL_EXIT_CODE); exit (FATAL_EXIT_CODE);
} }
@ -1018,22 +990,15 @@ fatal_io_error VPARAMS ((const char *msgid, ...))
void void
pedwarn VPARAMS ((const char *msgid, ...)) pedwarn VPARAMS ((const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES
const char *msgid;
#endif
va_list ap;
diagnostic_context dc; diagnostic_context dc;
VA_START (ap, msgid); VA_OPEN (ap, msgid);
VA_FIXEDARG (ap, const char *, msgid);
#ifndef ANSI_PROTOTYPES
msgid = va_arg (ap, const char *);
#endif
set_diagnostic_context set_diagnostic_context
(&dc, msgid, &ap, input_filename, lineno, !flag_pedantic_errors); (&dc, msgid, &ap, input_filename, lineno, !flag_pedantic_errors);
report_diagnostic (&dc); report_diagnostic (&dc);
va_end (ap); VA_CLOSE (ap);
} }
/* Issue a pedantic waring about DECL. */ /* Issue a pedantic waring about DECL. */
@ -1041,18 +1006,10 @@ pedwarn VPARAMS ((const char *msgid, ...))
void void
pedwarn_with_decl VPARAMS ((tree decl, const char *msgid, ...)) pedwarn_with_decl VPARAMS ((tree decl, const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES VA_OPEN (ap, msgid);
tree decl; VA_FIXEDARG (ap, tree, decl);
const char *msgid; VA_FIXEDARG (ap, const char *, msgid);
#endif
va_list ap;
VA_START (ap, msgid);
#ifndef ANSI_PROTOTYPES
decl = va_arg (ap, tree);
msgid = va_arg (ap, const char *);
#endif
/* We don't want -pedantic-errors to cause the compilation to fail from /* We don't want -pedantic-errors to cause the compilation to fail from
"errors" in system header files. Sometimes fixincludes can't fix what's "errors" in system header files. Sometimes fixincludes can't fix what's
broken (eg: unsigned char bitfields - fixing it may change the alignment broken (eg: unsigned char bitfields - fixing it may change the alignment
@ -1061,7 +1018,7 @@ pedwarn_with_decl VPARAMS ((tree decl, const char *msgid, ...))
warning either, it's just unnecessary noise. */ warning either, it's just unnecessary noise. */
if (!DECL_IN_SYSTEM_HEADER (decl)) if (!DECL_IN_SYSTEM_HEADER (decl))
diagnostic_for_decl (decl, msgid, &ap, !flag_pedantic_errors); diagnostic_for_decl (decl, msgid, &ap, !flag_pedantic_errors);
va_end (ap); VA_CLOSE (ap);
} }
/* Same as above but within the context FILE and LINE. */ /* Same as above but within the context FILE and LINE. */
@ -1070,25 +1027,16 @@ void
pedwarn_with_file_and_line VPARAMS ((const char *file, int line, pedwarn_with_file_and_line VPARAMS ((const char *file, int line,
const char *msgid, ...)) const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES
const char *file;
int line;
const char *msgid;
#endif
va_list ap;
diagnostic_context dc; diagnostic_context dc;
VA_START (ap, msgid); VA_OPEN (ap, msgid);
VA_FIXEDARG (ap, const char *, file);
#ifndef ANSI_PROTOTYPES VA_FIXEDARG (ap, int, line);
file = va_arg (ap, const char *); VA_FIXEDARG (ap, const char *, msgid);
line = va_arg (ap, int);
msgid = va_arg (ap, const char *);
#endif
set_diagnostic_context (&dc, msgid, &ap, file, line, !flag_pedantic_errors); set_diagnostic_context (&dc, msgid, &ap, file, line, !flag_pedantic_errors);
report_diagnostic (&dc); report_diagnostic (&dc);
va_end (ap); VA_CLOSE (ap);
} }
/* Just apologize with MSGID. */ /* Just apologize with MSGID. */
@ -1096,18 +1044,13 @@ pedwarn_with_file_and_line VPARAMS ((const char *file, int line,
void void
sorry VPARAMS ((const char *msgid, ...)) sorry VPARAMS ((const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES
const char *msgid;
#endif
va_list ap;
output_state os; output_state os;
os = output_buffer_state (diagnostic_buffer); VA_OPEN (ap, msgid);
VA_START (ap, msgid); VA_FIXEDARG (ap, const char *, msgid);
os = output_buffer_state (diagnostic_buffer);
#ifndef ANSI_PROTOTYPES
msgid = va_arg (ap, const char *);
#endif
++sorrycount; ++sorrycount;
output_set_prefix output_set_prefix
(diagnostic_buffer, context_as_prefix (input_filename, lineno, 0)); (diagnostic_buffer, context_as_prefix (input_filename, lineno, 0));
@ -1117,7 +1060,7 @@ sorry VPARAMS ((const char *msgid, ...))
output_format (diagnostic_buffer); output_format (diagnostic_buffer);
diagnostic_finish ((output_buffer *)global_dc); diagnostic_finish ((output_buffer *)global_dc);
output_buffer_state (diagnostic_buffer) = os; output_buffer_state (diagnostic_buffer) = os;
va_end (ap); VA_CLOSE (ap);
} }
/* Called when the start of a function definition is parsed, /* Called when the start of a function definition is parsed,
@ -1193,45 +1136,27 @@ void
error_with_file_and_line VPARAMS ((const char *file, int line, error_with_file_and_line VPARAMS ((const char *file, int line,
const char *msgid, ...)) const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES
const char *file;
int line;
const char *msgid;
#endif
va_list ap;
diagnostic_context dc; diagnostic_context dc;
VA_START (ap, msgid); VA_OPEN (ap, msgid);
VA_FIXEDARG (ap, const char *, file);
#ifndef ANSI_PROTOTYPES VA_FIXEDARG (ap, int, line);
file = va_arg (ap, const char *); VA_FIXEDARG (ap, const char *, msgid);
line = va_arg (ap, int);
msgid = va_arg (ap, const char *);
#endif
set_diagnostic_context (&dc, msgid, &ap, file, line, /* warn = */ 0); set_diagnostic_context (&dc, msgid, &ap, file, line, /* warn = */ 0);
report_diagnostic (&dc); report_diagnostic (&dc);
va_end (ap); VA_CLOSE (ap);
} }
void void
error_with_decl VPARAMS ((tree decl, const char *msgid, ...)) error_with_decl VPARAMS ((tree decl, const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES VA_OPEN (ap, msgid);
tree decl; VA_FIXEDARG (ap, tree, decl);
const char *msgid; VA_FIXEDARG (ap, const char *, msgid);
#endif
va_list ap;
VA_START (ap, msgid);
#ifndef ANSI_PROTOTYPES
decl = va_arg (ap, tree);
msgid = va_arg (ap, const char *);
#endif
diagnostic_for_decl (decl, msgid, &ap, /* warn = */ 0); diagnostic_for_decl (decl, msgid, &ap, /* warn = */ 0);
va_end (ap); VA_CLOSE (ap);
} }
@ -1240,22 +1165,15 @@ error_with_decl VPARAMS ((tree decl, const char *msgid, ...))
void void
error VPARAMS ((const char *msgid, ...)) error VPARAMS ((const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES
const char *msgid;
#endif
va_list ap;
diagnostic_context dc; diagnostic_context dc;
VA_START (ap, msgid); VA_OPEN (ap, msgid);
VA_FIXEDARG (ap, const char *, msgid);
#ifndef ANSI_PROTOTYPES
msgid = va_arg (ap, const char *);
#endif
set_diagnostic_context set_diagnostic_context
(&dc, msgid, &ap, input_filename, lineno, /* warn = */ 0); (&dc, msgid, &ap, input_filename, lineno, /* warn = */ 0);
report_diagnostic (&dc); report_diagnostic (&dc);
va_end (ap); VA_CLOSE (ap);
} }
/* Likewise, except that the compilation is terminated after printing the /* Likewise, except that the compilation is terminated after printing the
@ -1264,22 +1182,15 @@ error VPARAMS ((const char *msgid, ...))
void void
fatal_error VPARAMS ((const char *msgid, ...)) fatal_error VPARAMS ((const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES
const char *msgid;
#endif
va_list ap;
diagnostic_context dc; diagnostic_context dc;
VA_START (ap, msgid); VA_OPEN (ap, msgid);
VA_FIXEDARG (ap, const char *, msgid);
#ifndef ANSI_PROTOTYPES
msgid = va_arg (ap, const char *);
#endif
set_diagnostic_context set_diagnostic_context
(&dc, msgid, &ap, input_filename, lineno, /* warn = */ 0); (&dc, msgid, &ap, input_filename, lineno, /* warn = */ 0);
report_diagnostic (&dc); report_diagnostic (&dc);
va_end (ap); VA_CLOSE (ap);
fnotice (stderr, "compilation terminated.\n"); fnotice (stderr, "compilation terminated.\n");
exit (FATAL_EXIT_CODE); exit (FATAL_EXIT_CODE);
@ -1302,17 +1213,10 @@ set_internal_error_function (f)
void void
internal_error VPARAMS ((const char *msgid, ...)) internal_error VPARAMS ((const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES
const char *msgid;
#endif
va_list ap;
diagnostic_context dc; diagnostic_context dc;
VA_START (ap, msgid); VA_OPEN (ap, msgid);
VA_FIXEDARG (ap, const char *, msgid);
#ifndef ANSI_PROTOTYPES
msgid = va_arg (ap, const char *);
#endif
if (diagnostic_lock) if (diagnostic_lock)
error_recursion (); error_recursion ();
@ -1330,7 +1234,7 @@ internal_error VPARAMS ((const char *msgid, ...))
set_diagnostic_context set_diagnostic_context
(&dc, msgid, &ap, input_filename, lineno, /* warn = */0); (&dc, msgid, &ap, input_filename, lineno, /* warn = */0);
report_diagnostic (&dc); report_diagnostic (&dc);
va_end (ap); VA_CLOSE (ap);
fnotice (stderr, fnotice (stderr,
"Please submit a full bug report,\n\ "Please submit a full bug report,\n\
@ -1343,66 +1247,41 @@ void
warning_with_file_and_line VPARAMS ((const char *file, int line, warning_with_file_and_line VPARAMS ((const char *file, int line,
const char *msgid, ...)) const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES
const char *file;
int line;
const char *msgid;
#endif
va_list ap;
diagnostic_context dc; diagnostic_context dc;
VA_START (ap, msgid); VA_OPEN (ap, msgid);
VA_FIXEDARG (ap, const char *, file);
#ifndef ANSI_PROTOTYPES VA_FIXEDARG (ap, int, line);
file = va_arg (ap, const char *); VA_FIXEDARG (ap, const char *, msgid);
line = va_arg (ap, int);
msgid = va_arg (ap, const char *);
#endif
set_diagnostic_context (&dc, msgid, &ap, file, line, /* warn = */ 1); set_diagnostic_context (&dc, msgid, &ap, file, line, /* warn = */ 1);
report_diagnostic (&dc); report_diagnostic (&dc);
va_end (ap); VA_CLOSE (ap);
} }
void void
warning_with_decl VPARAMS ((tree decl, const char *msgid, ...)) warning_with_decl VPARAMS ((tree decl, const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES VA_OPEN (ap, msgid);
tree decl; VA_FIXEDARG (ap, tree, decl);
const char *msgid; VA_FIXEDARG (ap, const char *, msgid);
#endif
va_list ap;
VA_START (ap, msgid);
#ifndef ANSI_PROTOTYPES
decl = va_arg (ap, tree);
msgid = va_arg (ap, const char *);
#endif
diagnostic_for_decl (decl, msgid, &ap, /* warn = */ 1); diagnostic_for_decl (decl, msgid, &ap, /* warn = */ 1);
va_end (ap); VA_CLOSE (ap);
} }
void void
warning VPARAMS ((const char *msgid, ...)) warning VPARAMS ((const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES
const char *msgid;
#endif
va_list ap;
diagnostic_context dc; diagnostic_context dc;
VA_START (ap, msgid); VA_OPEN (ap, msgid);
VA_FIXEDARG (ap, const char *, msgid);
#ifndef ANSI_PROTOTYPES
msgid = va_arg (ap, const char *);
#endif
set_diagnostic_context set_diagnostic_context
(&dc, msgid, &ap, input_filename, lineno, /* warn = */ 1); (&dc, msgid, &ap, input_filename, lineno, /* warn = */ 1);
report_diagnostic (&dc); report_diagnostic (&dc);
va_end (ap); VA_CLOSE (ap);
} }
/* Flush diagnostic_buffer content on stderr. */ /* Flush diagnostic_buffer content on stderr. */
@ -1443,19 +1322,12 @@ output_do_verbatim (buffer, msgid, args_ptr)
void void
output_verbatim VPARAMS ((output_buffer *buffer, const char *msgid, ...)) output_verbatim VPARAMS ((output_buffer *buffer, const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES VA_OPEN (ap, msgid);
output_buffer *buffer; VA_FIXEDARG (ap, output_buffer *, buffer);
const char *msgid; VA_FIXEDARG (ap, const char *, msgid);
#endif
va_list ap;
VA_START (ap, msgid);
#ifndef ANSI_PROTOTYPES
buffer = va_arg (ap, output_buffer *);
msg = va_arg (ap, const char *);
#endif
output_do_verbatim (buffer, msgid, &ap); output_do_verbatim (buffer, msgid, &ap);
va_end (ap); VA_CLOSE (ap);
} }
/* Same as above but use diagnostic_buffer. */ /* Same as above but use diagnostic_buffer. */
@ -1463,18 +1335,12 @@ output_verbatim VPARAMS ((output_buffer *buffer, const char *msgid, ...))
void void
verbatim VPARAMS ((const char *msgid, ...)) verbatim VPARAMS ((const char *msgid, ...))
{ {
#ifndef ANSI_PROTOTYPES VA_OPEN (ap, msgid);
const char *msgid; VA_FIXEDARG (ap, const char *, msgid);
#endif
va_list ap;
VA_START (ap, msgid);
#ifndef ANSI_PROTOTYPES
msgid = va_arg (ap, const char *);
#endif
output_do_verbatim (diagnostic_buffer, msgid, &ap); output_do_verbatim (diagnostic_buffer, msgid, &ap);
output_buffer_to_stream (diagnostic_buffer); output_buffer_to_stream (diagnostic_buffer);
va_end (ap); VA_CLOSE (ap);
} }
/* Report a diagnostic message (an error or a warning) as specified by /* Report a diagnostic message (an error or a warning) as specified by