PATCH: More ISO-ifying of sim/common

Ben Elliston
2005-07-08T08:18:07Z

[-- Attachment #1: Type: text/plain, Size: 4165 bytes --]

Committed as obvious.

2005-07-08 Ben Elliston <bje@au.ibm.com>

* callback.c: Remove ANSI_PROTOTYPES conditional code.
* sim-load.c: Likewise.
* syscall.c: Likewise.

Index: callback.c
===================================================================
RCS file: /home/bje/src-cvs/src/sim/common/callback.c,v
retrieving revision 1.17
diff -u -p -r1.17 callback.c
--- callback.c 29 Apr 2005 14:48:02 -0000 1.17
+++ callback.c 8 Jul 2005 07:47:19 -0000
@@ -26,11 +26,7 @@
#include "cconfig.h"
#endif
#include "ansidecl.h"
-#ifdef ANSI_PROTOTYPES
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
@@ -755,23 +751,10 @@ os_init (p)

/* VARARGS */
static void
-#ifdef ANSI_PROTOTYPES
os_printf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, ...)
-#else
-os_printf_filtered (p, va_alist)
- host_callback *p;
- va_dcl
-#endif
{
va_list args;
-#ifdef ANSI_PROTOTYPES
va_start (args, format);
-#else
- char *format;
-
- va_start (args);
- format = va_arg (args, char *);
-#endif

vfprintf (stdout, format, args);
va_end (args);
@@ -779,51 +762,24 @@ os_printf_filtered (p, va_alist)

/* VARARGS */
static void
-#ifdef ANSI_PROTOTYPES
os_vprintf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, va_list
args)
-#else
-os_vprintf_filtered (p, format, args)
- host_callback *p;
- const char *format;
- va_list args;
-#endif
{
vprintf (format, args);
}

/* VARARGS */
static void
-#ifdef ANSI_PROTOTYPES
os_evprintf_filtered (host_callback *p ATTRIBUTE_UNUSED, const char *format, va_lis
t args)
-#else
-os_evprintf_filtered (p, format, args)
- host_callback *p;
- const char *format;
- va_list args;
-#endif
{
vfprintf (stderr, format, args);
}

/* VARARGS */
static void
-#ifdef ANSI_PROTOTYPES
os_error (host_callback *p ATTRIBUTE_UNUSED, const char *format, ...)
-#else
-os_error (p, va_alist)
- host_callback *p;
- va_dcl
-#endif
{
va_list args;
-#ifdef ANSI_PROTOTYPES
va_start (args, format);
-#else
- char *format;
-
- va_start (args);
- format = va_arg (args, char *);
-#endif

vfprintf (stderr, format, args);
fprintf (stderr, "\n");
Index: sim-load.c
===================================================================
RCS file: /home/bje/src-cvs/src/sim/common/sim-load.c,v
retrieving revision 1.7
diff -u -p -r1.7 sim-load.c
--- sim-load.c 15 Jun 2004 01:08:00 -0000 1.7
+++ sim-load.c 8 Jul 2005 07:47:19 -0000
@@ -24,11 +24,7 @@ along with this program; if not, write t
#endif
#include "ansidecl.h"
#include <stdio.h> /* for NULL */
-#ifdef ANSI_PROTOTYPES
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
@@ -176,17 +172,11 @@ sim_load_file (sd, myname, callback, pro
static void
xprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
{
-#ifndef ANSI_PROTOTYPES
host_callback *callback;
char *fmt;
-#endif
va_list ap;

VA_START (ap, fmt);
-#ifndef ANSI_PROTOTYPES
- callback = va_arg (ap, host_callback *);
- fmt = va_arg (ap, char *);
-#endif

(*callback->vprintf_filtered) (callback, fmt, ap);

@@ -196,17 +186,11 @@ xprintf VPARAMS ((host_callback *callbac
static void
eprintf VPARAMS ((host_callback *callback, const char *fmt, ...))
{
-#ifndef ANSI_PROTOTYPES
host_callback *callback;
char *fmt;
-#endif
va_list ap;

VA_START (ap, fmt);
-#ifndef ANSI_PROTOTYPES
- callback = va_arg (ap, host_callback *);
- fmt = va_arg (ap, char *);
-#endif

(*callback->evprintf_filtered) (callback, fmt, ap);

Index: syscall.c
===================================================================
RCS file: /home/bje/src-cvs/src/sim/common/syscall.c,v
retrieving revision 1.8
diff -u -p -r1.8 syscall.c
--- syscall.c 28 Jan 2005 03:40:54 -0000 1.8
+++ syscall.c 8 Jul 2005 07:47:19 -0000
@@ -29,11 +29,7 @@
#endif
#include "ansidecl.h"
#include "libiberty.h"
-#ifdef ANSI_PROTOTYPES
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 256 bytes --]