ansification: remove _DEFUN_VOID

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
This commit is contained in:
Yaakov Selkowitz 2017-12-03 21:00:43 -06:00
parent 670b01da7f
commit fff27f8429
47 changed files with 94 additions and 96 deletions

View File

@ -32,7 +32,7 @@
* from channel A
*/
char
_DEFUN_VOID (inbyte)
inbyte (void)
{
while ((READREG (DUART_SRA) & 0x01) == 0x00)
;

View File

@ -133,7 +133,7 @@ ExceptionHook exceptionHook; /* hook variable for errors/exceptions */
/* FORWARD DECLARATIONS */
/************************/
/** static void initializeRemcomErrorFrame PARAMS ((void)); **/
static void _DEFUN_VOID (initializeRemcomErrorFrame);
static void initializeRemcomErrorFrame (void);
/************************************************************************/
/* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/
@ -203,9 +203,9 @@ jmp_buf remcomEnv;
#define BREAKPOINT() asm(" trap #1");
extern void _DEFUN_VOID (return_to_super);
extern void _DEFUN_VOID (return_to_user);
extern void _DEFUN_VOID (_catchException);
extern void return_to_super (void);
extern void return_to_user (void);
extern void _catchException (void);
void _returnFromException( Frame *frame )
{

View File

@ -14,7 +14,7 @@
*/
#include "glue.h"
extern char _DEFUN_VOID (inbyte);
extern char inbyte (void);
/*
* read -- read bytes from the serial port. Ignore fd, since

View File

@ -14,7 +14,7 @@
*/
#include "glue.h"
extern char _DEFUN_VOID (inbyte);
extern char inbyte (void);
/*
* read -- read bytes from the serial port. Ignore fd, since

View File

@ -62,7 +62,6 @@
#define _EXFNPTR(name, proto) (* name) proto
#endif
#define _DEFUN(name, arglist, args) name(args)
#define _DEFUN_VOID(name) name(void)
#ifndef _LONG_DOUBLE
#define _LONG_DOUBLE long double
#endif
@ -73,7 +72,6 @@
#define _EXFUN(name, proto) name()
#define _EXFUN_NOTHROW(name, proto) name()
#define _DEFUN(name, arglist, args) name arglist args;
#define _DEFUN_VOID(name) name()
#define _LONG_DOUBLE double
#endif

View File

@ -966,7 +966,7 @@ __get_locale_env (struct _reent *p, int category)
#endif /* _MB_CAPABLE */
int
_DEFUN_VOID (__locale_mb_cur_max)
__locale_mb_cur_max (void)
{
#ifdef __HAVE_LOCALE_INFO__
return __get_current_ctype_locale ()->mb_cur_max[0];

View File

@ -62,7 +62,7 @@ _DEFUN (_localeconv_r, (data),
#ifndef _REENT_ONLY
struct lconv *
_DEFUN_VOID (localeconv)
localeconv (void)
{
return __localeconv_l (__get_current_locale ());
}

View File

@ -47,7 +47,7 @@ Supporting OS subroutines required: <<_exit>> and optionally, <<write>>.
#include <signal.h>
_VOID
_DEFUN_VOID (abort)
abort (void)
{
#ifdef ABORT_MESSAGE
write (2, "Abort called\n", sizeof ("Abort called\n")-1);

View File

@ -29,7 +29,7 @@ Supporting OS subroutines required: <<_exit>>.
#include <unistd.h>
_VOID
_DEFUN_VOID (abort)
abort (void)
{
while (1)
{

View File

@ -82,7 +82,7 @@ _DEFUN (__sinit, (s),
}
_VOID
_DEFUN_VOID (__check_init)
__check_init (void)
{
CHECK_INIT(_REENT);
}

View File

@ -37,7 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#ifndef _REENT_ONLY
FILE *
_DEFUN_VOID (tmpfile)
tmpfile (void)
{
int ret;
FILE* fp;

View File

@ -14,7 +14,7 @@ int _dummy_getreent;
#endif
struct _reent *
_DEFUN_VOID(__getreent)
__getreent (void)
{
return _impure_ptr;
}

View File

@ -8,7 +8,7 @@
#ifndef _REENT_ONLY
int *
_DEFUN_VOID (__signgam)
__signgam (void)
{
return &_REENT_SIGNGAM(_REENT);
}

View File

@ -63,7 +63,7 @@ _DEFUN(hcreate, (nel), size_t nel)
}
void
_DEFUN_VOID (hdestroy)
hdestroy (void)
{
hdestroy_r (&htab);
}

View File

@ -213,7 +213,7 @@ _DEFUN (signal, (sig, func),
}
int
_DEFUN_VOID (_init_signal)
_init_signal (void)
{
return _init_signal_r (_REENT);
}

View File

@ -66,7 +66,7 @@ _DEFUN(_fcloseall_r, (ptr),
#ifndef _REENT_ONLY
int
_DEFUN_VOID(fcloseall)
fcloseall (void)
{
return _fcloseall_r (_GLOBAL_REENT);
}

View File

@ -235,7 +235,7 @@ _DEFUN(_cleanup_r, (ptr),
#ifndef _REENT_ONLY
_VOID
_DEFUN_VOID(_cleanup)
_cleanup (void)
{
_cleanup_r (_GLOBAL_REENT);
}
@ -304,25 +304,25 @@ __LOCK_INIT_RECURSIVE(static, __sfp_recursive_mutex);
__LOCK_INIT_RECURSIVE(static, __sinit_recursive_mutex);
_VOID
_DEFUN_VOID(__sfp_lock_acquire)
__sfp_lock_acquire (void)
{
__lock_acquire_recursive (__sfp_recursive_mutex);
}
_VOID
_DEFUN_VOID(__sfp_lock_release)
__sfp_lock_release (void)
{
__lock_release_recursive (__sfp_recursive_mutex);
}
_VOID
_DEFUN_VOID(__sinit_lock_acquire)
__sinit_lock_acquire (void)
{
__lock_acquire_recursive (__sinit_recursive_mutex);
}
_VOID
_DEFUN_VOID(__sinit_lock_release)
__sinit_lock_release (void)
{
__lock_release_recursive (__sinit_recursive_mutex);
}
@ -350,7 +350,7 @@ _DEFUN(__fp_unlock, (ptr),
}
_VOID
_DEFUN_VOID(__fp_lock_all)
__fp_lock_all (void)
{
__sfp_lock_acquire ();
@ -358,7 +358,7 @@ _DEFUN_VOID(__fp_lock_all)
}
_VOID
_DEFUN_VOID(__fp_unlock_all)
__fp_unlock_all (void)
{
(void) _fwalk (_REENT, __fp_unlock);

View File

@ -82,7 +82,7 @@ _DEFUN(_getchar_r, (reent),
#ifndef _REENT_ONLY
int
_DEFUN_VOID(getchar)
getchar (void)
{
struct _reent *reent = _REENT;

View File

@ -79,7 +79,7 @@ _DEFUN(_getchar_unlocked_r, (ptr),
#ifndef _REENT_ONLY
int
_DEFUN_VOID(getchar_unlocked)
getchar_unlocked (void)
{
/* CHECK_INIT is called (eventually) by __srefill_r. */

View File

@ -103,7 +103,7 @@ _DEFUN (_getwchar_r, (ptr),
* Synonym for fgetwc(stdin).
*/
wint_t
_DEFUN_VOID (getwchar)
getwchar (void)
{
_REENT_SMALL_CHECK_INIT (_REENT);
return fgetwc (stdin);

View File

@ -44,7 +44,7 @@ _DEFUN (_getwchar_unlocked_r, (ptr),
* Synonym for fgetwc_unlocked(stdin).
*/
wint_t
_DEFUN_VOID (getwchar_unlocked)
getwchar_unlocked (void)
{
_REENT_SMALL_CHECK_INIT (_REENT);
return fgetwc_unlocked (stdin);

View File

@ -81,7 +81,7 @@ _DEFUN(_tmpfile_r, (ptr),
#ifndef _REENT_ONLY
FILE *
_DEFUN_VOID(tmpfile)
tmpfile (void)
{
return _tmpfile_r (_REENT);
}

View File

@ -84,7 +84,7 @@ _DEFUN (_tmpfile64_r, (ptr),
#ifndef _REENT_ONLY
FILE *
_DEFUN_VOID (tmpfile64)
tmpfile64 (void)
{
return _tmpfile64_r (_REENT);
}

View File

@ -47,7 +47,7 @@ Supporting OS subroutines required: <<_exit>> and optionally, <<write>>.
#include <signal.h>
_VOID
_DEFUN_VOID (abort)
abort (void)
{
#ifdef ABORT_MESSAGE
write (2, "Abort called\n", sizeof ("Abort called\n")-1);

View File

@ -23,7 +23,7 @@ _DEFUN (_drand48_r, (r),
#ifndef _REENT_ONLY
double
_DEFUN_VOID (drand48)
drand48 (void)
{
return _drand48_r (_REENT);
}

View File

@ -25,7 +25,7 @@ _DEFUN (_lrand48_r, (r),
#ifndef _REENT_ONLY
long
_DEFUN_VOID (lrand48)
lrand48 (void)
{
return _lrand48_r (_REENT);
}

View File

@ -24,7 +24,7 @@ _DEFUN (_mrand48_r, (r),
#ifndef _REENT_ONLY
long
_DEFUN_VOID (mrand48)
mrand48 (void)
{
return _mrand48_r (_REENT);
}

View File

@ -84,14 +84,14 @@ not portable.
#ifndef _REENT_ONLY
struct mallinfo
_DEFUN_VOID (mallinfo)
mallinfo (void)
{
return _mallinfo_r (_REENT);
}
#if !defined (_ELIX_LEVEL) || _ELIX_LEVEL >= 2
void
_DEFUN_VOID (malloc_stats)
malloc_stats (void)
{
_malloc_stats_r (_REENT);
}

View File

@ -68,7 +68,7 @@ _DEFUN (srand, (seed), unsigned int seed)
}
int
_DEFUN_VOID (rand)
rand (void)
{
struct _reent *reent = _REENT;

View File

@ -66,7 +66,7 @@ _DEFUN (srandom, (seed), unsigned int seed)
}
long int
_DEFUN_VOID (random)
random (void)
{
struct _reent *reent = _REENT;

View File

@ -6,7 +6,7 @@
<sys/types.h>. */
int
_DEFUN_VOID (_getpid)
_getpid (void)
{
return 1;
}

View File

@ -3,7 +3,7 @@
#include <unistd.h>
char *
_DEFUN_VOID (getlogin)
getlogin (void)
{
errno = ENOSYS;
return NULL;

View File

@ -3,7 +3,7 @@
fp_rnd
_DEFUN_VOID(fpgetround)
fpgetround (void)
{
char *out;
ieee_flags("get", "direction","", &out);
@ -44,7 +44,7 @@ _DEFUN(fpsetround,(new),
fp_except
_DEFUN_VOID(fpgetmask)
fpgetmask (void)
{
char *out;
int r = 0;
@ -92,7 +92,7 @@ _DEFUN(fpsetsticky,(mask),
}
fp_except
_DEFUN_VOID(fpgetsticky)
fpgetsticky (void)
{
return fpgetmask();
}
@ -107,7 +107,7 @@ _DEFUN(fpsetroundtoi,(rdi_mode),
}
int
_DEFUN_VOID(fpgetroundtoi)
fpgetroundtoi (void)
{
return 0;

View File

@ -3,7 +3,7 @@
fp_rnd
_DEFUN_VOID(fpgetround)
fpgetround (void)
{
char *out;
ieee_flags("get", "direction","", &out);
@ -44,7 +44,7 @@ _DEFUN(fpsetround,(new),
fp_except
_DEFUN_VOID(fpgetmask)
fpgetmask (void)
{
char *out;
int r = 0;
@ -92,7 +92,7 @@ _DEFUN(fpsetsticky,(mask),
}
fp_except
_DEFUN_VOID(fpgetsticky)
fpgetsticky (void)
{
return fpgetmask();
}
@ -107,7 +107,7 @@ _DEFUN(fpsetroundtoi,(rdi_mode),
}
int
_DEFUN_VOID(fpgetroundtoi)
fpgetroundtoi (void)
{
return 0;

View File

@ -17,7 +17,7 @@ fp_except _DEFUN(fpsetmask,(newmask),
}
fp_except _DEFUN_VOID(fpgetmask)
fp_except fpgetmask (void)
{
v60_tkcw_type tkcw;
sysv60(0, 8, &tkcw);
@ -25,7 +25,7 @@ fp_except _DEFUN_VOID(fpgetmask)
}
fp_rnd _DEFUN_VOID(fpgetround)
fp_rnd fpgetround (void)
{
v60_tkcw_type tkcw;
sysv60(0, 8, &tkcw);
@ -49,7 +49,7 @@ fp_rnd _DEFUN(fpsetround,(rnd),
fp_rdi _DEFUN_VOID(fpgetroundtoi)
fp_rdi fpgetroundtoi (void)
{
v60_tkcw_type tkcw;
sysv60(0, 8, &tkcw);

View File

@ -17,7 +17,7 @@ fp_except _DEFUN(fpsetmask,(newmask),
}
fp_except _DEFUN_VOID(fpgetmask)
fp_except fpgetmask (void)
{
v60_tkcw_type tkcw;
sysv60(0, 8, &tkcw);
@ -25,7 +25,7 @@ fp_except _DEFUN_VOID(fpgetmask)
}
fp_rnd _DEFUN_VOID(fpgetround)
fp_rnd fpgetround (void)
{
v60_tkcw_type tkcw;
sysv60(0, 8, &tkcw);
@ -49,7 +49,7 @@ fp_rnd _DEFUN(fpsetround,(rnd),
fp_rdi _DEFUN_VOID(fpgetroundtoi)
fp_rdi fpgetroundtoi (void)
{
v60_tkcw_type tkcw;
sysv60(0, 8, &tkcw);

View File

@ -8,7 +8,7 @@
#include <unistd.h>
int
_DEFUN_VOID (fork)
fork (void)
{
return _fork_r (_REENT);
}

View File

@ -4,7 +4,7 @@
#include <unistd.h>
int
_DEFUN_VOID (getpid)
getpid (void)
{
return _getpid_r (_REENT);
}

View File

@ -36,7 +36,7 @@ __LOCK_INIT(static, __tz_mutex);
#endif
_VOID
_DEFUN_VOID (__tz_lock)
__tz_lock (void)
{
#ifndef __SINGLE_THREAD__
__lock_acquire(__tz_mutex);
@ -44,7 +44,7 @@ _DEFUN_VOID (__tz_lock)
}
_VOID
_DEFUN_VOID (__tz_unlock)
__tz_unlock (void)
{
#ifndef __SINGLE_THREAD__
__lock_release(__tz_mutex);

View File

@ -62,13 +62,13 @@ Supporting OS subroutine required: None
#include "local.h"
_VOID
_DEFUN_VOID (_tzset_unlocked)
_tzset_unlocked (void)
{
_tzset_unlocked_r (_REENT);
}
_VOID
_DEFUN_VOID (tzset)
tzset (void)
{
TZ_LOCK;
_tzset_unlocked_r (_REENT);

View File

@ -76,7 +76,7 @@ _DEFUN (xdr_free, (proc, objp),
* XDR nothing
*/
bool_t
_DEFUN_VOID (xdr_void)
xdr_void (void)
{
return TRUE;
}

View File

@ -111,7 +111,7 @@ _DEFUN (x_inline, (xdrs, len),
}
static int
_DEFUN_VOID (harmless)
harmless (void)
{
/* Always return FALSE/NULL, as the case may be */
return 0;

View File

@ -13,7 +13,7 @@ extern double_type doubles[];
double_type *pd = doubles;
void
_DEFUN_VOID(test_strtod)
test_strtod (void)
{
char *tail;
double v;
@ -24,7 +24,7 @@ _DEFUN_VOID(test_strtod)
}
void
_DEFUN_VOID(test_strtof)
test_strtof (void)
{
char *tail;
double v;
@ -35,13 +35,13 @@ _DEFUN_VOID(test_strtof)
}
void
_DEFUN_VOID(test_atof)
test_atof (void)
{
test_mok(atof(pd->string), pd->value, 64);
}
void
_DEFUN_VOID(test_atoff)
test_atoff (void)
{
test_mok(atoff(pd->string), pd->value, 32);
}
@ -101,7 +101,7 @@ _DEFUN(test_strtol_base,(base, pi, string),
}
void
_DEFUN_VOID(test_strtol)
test_strtol (void)
{
test_strtol_base(8,&(p->octal), p->string);
test_strtol_base(10,&(p->decimal), p->string);
@ -111,14 +111,14 @@ _DEFUN_VOID(test_strtol)
}
void
_DEFUN_VOID(test_atoi)
test_atoi (void)
{
test_iok(atoi(p->string), p->decimal.value);
test_eok(errno, p->decimal.errno_val);
}
void
_DEFUN_VOID(test_atol)
test_atol (void)
{
test_iok(atol(p->string), p->decimal.value);
test_eok(errno, p->decimal.errno_val);
@ -128,7 +128,7 @@ _DEFUN_VOID(test_atol)
extern ddouble_type ddoubles[];
ddouble_type *pdd;
void
_DEFUN_VOID(test_ecvtbuf)
test_ecvtbuf (void)
{
int a2,a3;
char *s;
@ -140,7 +140,7 @@ _DEFUN_VOID(test_ecvtbuf)
}
void
_DEFUN_VOID(test_ecvt)
test_ecvt (void)
{
int a2,a3;
char *s;
@ -158,7 +158,7 @@ _DEFUN_VOID(test_ecvt)
}
void
_DEFUN_VOID(test_fcvtbuf)
test_fcvtbuf (void)
{
int a2,a3;
char *s;
@ -170,7 +170,7 @@ _DEFUN_VOID(test_fcvtbuf)
}
void
_DEFUN_VOID(test_gcvt)
test_gcvt (void)
{
char *s = gcvt(pdd->value, pdd->g1, buffer);
test_scok(s, pdd->gstring, 9);
@ -181,7 +181,7 @@ _DEFUN_VOID(test_gcvt)
}
void
_DEFUN_VOID(test_fcvt)
test_fcvt (void)
{
int a2,a3;
char *sd;
@ -223,7 +223,7 @@ _DEFUN(diterate,(func, name),
void
_DEFUN_VOID(deltest)
deltest (void)
{
newfunc("rounding");
line(1);
@ -255,7 +255,7 @@ _DEFUN_VOID(deltest)
/* Most of what sprint does is tested with the tests of
fcvt/ecvt/gcvt, but here are some more */
void
_DEFUN_VOID(test_sprint)
test_sprint (void)
{
extern sprint_double_type sprint_doubles[];
sprint_double_type *s = sprint_doubles;
@ -286,7 +286,7 @@ _DEFUN_VOID(test_sprint)
/* Scanf calls strtod etc tested elsewhere, but also has some pattern matching skills */
void
_DEFUN_VOID(test_scan)
test_scan (void)
{
int i,j;
extern sprint_double_type sprint_doubles[];
@ -340,7 +340,7 @@ _DEFUN_VOID(test_scan)
}
void
_DEFUN_VOID(test_cvt)
test_cvt (void)
{
deltest();

View File

@ -354,7 +354,7 @@ _DEFUN(run_vector_1,(vector, p, func, name, args),
}
void
_DEFUN_VOID(test_math)
test_math (void)
{
test_acos(0);
test_acosf(0);

View File

@ -4,14 +4,14 @@
int
_DEFUN_VOID(randi)
randi (void)
{
static int next;
next = (next * 1103515245) + 12345;
return ((next >> 16) & 0xffff);
}
double _DEFUN_VOID(randx)
double randx (void)
{
double res;
@ -34,7 +34,7 @@ double _DEFUN_VOID(randx)
}
/* Return a random double, but bias for numbers closer to 0 */
double _DEFUN_VOID(randy)
double randy (void)
{
int pow;
double r= randx();
@ -43,7 +43,7 @@ double _DEFUN_VOID(randy)
}
void
_DEFUN_VOID(test_frexp)
test_frexp (void)
{
int i;
double r;
@ -131,7 +131,7 @@ _DEFUN_VOID(test_frexp)
*/
void
_DEFUN_VOID(test_mod)
test_mod (void)
{
int i;
@ -176,7 +176,7 @@ _DEFUN_VOID(test_mod)
Test pow by multiplying logs
*/
void
_DEFUN_VOID(test_pow)
test_pow (void)
{
unsigned int i;
newfunc("pow");
@ -224,7 +224,7 @@ _DEFUN_VOID(test_pow)
void
_DEFUN_VOID(test_math2)
test_math2 (void)
{
test_mod();
test_frexp();

View File

@ -6,7 +6,7 @@
/* Test fp getround and fp setround */
void
_DEFUN_VOID(test_getround)
test_getround (void)
{
newfunc("fpgetround/fpsetround");
@ -26,7 +26,7 @@ _DEFUN_VOID(test_getround)
/* And fpset/fpgetmask */
void
_DEFUN_VOID(test_getmask)
test_getmask (void)
{
newfunc("fpsetmask/fpgetmask");
line(1);
@ -47,7 +47,7 @@ _DEFUN_VOID(test_getmask)
}
void
_DEFUN_VOID(test_getsticky)
test_getsticky (void)
{
newfunc("fpsetsticky/fpgetsticky");
line(1);
@ -68,7 +68,7 @@ _DEFUN_VOID(test_getsticky)
}
void
_DEFUN_VOID(test_getroundtoi)
test_getroundtoi (void)
{
newfunc("fpsetroundtoi/fpgetroundtoi");
line(1);
@ -105,7 +105,7 @@ double sub_rounded_down ;
double sub_rounded_up ;
double r1,r2,r3,r4;
void
_DEFUN_VOID(test_round)
test_round (void)
{
n = dnumber(0x40000000, 0x00000008); /* near 2 */
m = dnumber(0x40400000, 0x00000003); /* near 3.4 */
@ -163,7 +163,7 @@ _DEFUN_VOID(test_round)
void
_DEFUN_VOID(test_ieee)
test_ieee (void)
{
fp_rnd old = fpgetround();
test_getround();

View File

@ -1993,7 +1993,7 @@ _DEFUN(test_to_set,(func, name, p, low, high),
#undef _toupper
void
_DEFUN_VOID(test_is)
test_is (void)
{
test_is_set(def_isalnum, "isalnum define", &myalnum);
test_is_set(def_isalpha, "isalpha define", &myalpha);