ansification: remove _DOTS

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
This commit is contained in:
Yaakov Selkowitz 2017-12-03 20:28:42 -06:00
parent 0bda30e1ff
commit 2310096fbc
25 changed files with 43 additions and 45 deletions

View File

@ -51,7 +51,6 @@
#define _NOARGS void #define _NOARGS void
#define _VOLATILE volatile #define _VOLATILE volatile
#define _SIGNED signed #define _SIGNED signed
#define _DOTS , ...
#define _VOID void #define _VOID void
#ifdef __CYGWIN__ #ifdef __CYGWIN__
#define _EXFUN_NOTHROW(name, proto) __cdecl name proto _NOTHROW #define _EXFUN_NOTHROW(name, proto) __cdecl name proto _NOTHROW
@ -78,7 +77,6 @@
#define _NOARGS #define _NOARGS
#define _VOLATILE #define _VOLATILE
#define _SIGNED #define _SIGNED
#define _DOTS
#define _VOID void #define _VOID void
#define _EXFUN(name, proto) name() #define _EXFUN(name, proto) name()
#define _EXFUN_NOTHROW(name, proto) name() #define _EXFUN_NOTHROW(name, proto) name()

View File

@ -20,7 +20,7 @@ static char ***p_environ = &environ;
int int
_DEFUN(execl, (path, arg0, ...), _DEFUN(execl, (path, arg0, ...),
const char *path, const char *path,
const char *arg0 _DOTS) const char *arg0, ...)
#else #else

View File

@ -15,7 +15,7 @@
int int
_DEFUN(execle, (path, arg0, ...), _DEFUN(execle, (path, arg0, ...),
const char *path, const char *path,
const char *arg0 _DOTS) const char *arg0, ...)
#else #else

View File

@ -15,7 +15,7 @@
int int
_DEFUN(execlp, (path, arg0, ...), _DEFUN(execlp, (path, arg0, ...),
const char *path, const char *path,
const char *arg0 _DOTS) const char *arg0, ...)
#else #else

View File

@ -28,7 +28,7 @@ int
_DEFUN(_asiprintf_r, (ptr, strp, fmt), _DEFUN(_asiprintf_r, (ptr, strp, fmt),
struct _reent *ptr, struct _reent *ptr,
char **strp, char **strp,
const char *fmt _DOTS) const char *fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;
@ -55,7 +55,7 @@ _DEFUN(_asiprintf_r, (ptr, strp, fmt),
int int
_DEFUN(asiprintf, (strp, fmt), _DEFUN(asiprintf, (strp, fmt),
char **strp, char **strp,
const char *fmt _DOTS) const char *fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;

View File

@ -18,7 +18,7 @@ _DEFUN(_asniprintf_r, (ptr, buf, lenp, fmt),
struct _reent *ptr, struct _reent *ptr,
char *buf, char *buf,
size_t *lenp, size_t *lenp,
const char *fmt _DOTS) const char *fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;
@ -64,7 +64,7 @@ char *
_DEFUN(asniprintf, (buf, lenp, fmt), _DEFUN(asniprintf, (buf, lenp, fmt),
char *buf, char *buf,
size_t *lenp, size_t *lenp,
const char *fmt _DOTS) const char *fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;

View File

@ -18,7 +18,7 @@ _DEFUN(_asnprintf_r, (ptr, buf, lenp, fmt),
struct _reent *__restrict ptr, struct _reent *__restrict ptr,
char *buf, char *buf,
size_t *lenp, size_t *lenp,
const char *__restrict fmt _DOTS) const char *__restrict fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;
@ -70,7 +70,7 @@ char *
_DEFUN(asnprintf, (buf, lenp, fmt), _DEFUN(asnprintf, (buf, lenp, fmt),
char *__restrict buf, char *__restrict buf,
size_t *__restrict lenp, size_t *__restrict lenp,
const char *__restrict fmt _DOTS) const char *__restrict fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;

View File

@ -28,7 +28,7 @@ int
_DEFUN(_asprintf_r, (ptr, strp, fmt), _DEFUN(_asprintf_r, (ptr, strp, fmt),
struct _reent *ptr, struct _reent *ptr,
char **__restrict strp, char **__restrict strp,
const char *__restrict fmt _DOTS) const char *__restrict fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;
@ -61,7 +61,7 @@ _EXFUN(_asiprintf_r, (struct _reent *, char **, const char *, ...)
int int
_DEFUN(asprintf, (strp, fmt), _DEFUN(asprintf, (strp, fmt),
char **__restrict strp, char **__restrict strp,
const char *__restrict fmt _DOTS) const char *__restrict fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;

View File

@ -52,7 +52,7 @@ int
_DEFUN(_diprintf_r, (ptr, fd, format), _DEFUN(_diprintf_r, (ptr, fd, format),
struct _reent *ptr, struct _reent *ptr,
int fd, int fd,
const char *format _DOTS) const char *format, ...)
{ {
va_list ap; va_list ap;
int n; int n;
@ -68,7 +68,7 @@ _DEFUN(_diprintf_r, (ptr, fd, format),
int int
_DEFUN(diprintf, (fd, format), _DEFUN(diprintf, (fd, format),
int fd, int fd,
const char *format _DOTS) const char *format, ...)
{ {
va_list ap; va_list ap;
int n; int n;

View File

@ -56,7 +56,7 @@ int
_DEFUN(_dprintf_r, (ptr, fd, format), _DEFUN(_dprintf_r, (ptr, fd, format),
struct _reent *ptr, struct _reent *ptr,
int fd, int fd,
const char *__restrict format _DOTS) const char *__restrict format, ...)
{ {
va_list ap; va_list ap;
int n; int n;
@ -78,7 +78,7 @@ _EXFUN(_diprintf_r, (struct _reent *, int, const char *, ...)
int int
_DEFUN(dprintf, (fd, format), _DEFUN(dprintf, (fd, format),
int fd, int fd,
const char *__restrict format _DOTS) const char *__restrict format, ...)
{ {
va_list ap; va_list ap;
int n; int n;

View File

@ -25,7 +25,7 @@ int
_DEFUN(_fiprintf_r, (ptr, fp, fmt), _DEFUN(_fiprintf_r, (ptr, fp, fmt),
struct _reent *ptr, struct _reent *ptr,
FILE * fp, FILE * fp,
const char *fmt _DOTS) const char *fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;
@ -41,7 +41,7 @@ _DEFUN(_fiprintf_r, (ptr, fp, fmt),
int int
_DEFUN(fiprintf, (fp, fmt), _DEFUN(fiprintf, (fp, fmt),
FILE * fp, FILE * fp,
const char *fmt _DOTS) const char *fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;

View File

@ -25,7 +25,7 @@ int
_DEFUN(_fprintf_r, (ptr, fp, fmt), _DEFUN(_fprintf_r, (ptr, fp, fmt),
struct _reent *ptr, struct _reent *ptr,
FILE *__restrict fp, FILE *__restrict fp,
const char *__restrict fmt _DOTS) const char *__restrict fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;
@ -47,7 +47,7 @@ _EXFUN(_fiprintf_r, (struct _reent *, FILE *, const char *, ...)
int int
_DEFUN(fprintf, (fp, fmt), _DEFUN(fprintf, (fp, fmt),
FILE *__restrict fp, FILE *__restrict fp,
const char *__restrict fmt _DOTS) const char *__restrict fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;

View File

@ -26,7 +26,7 @@ int
_DEFUN(_fwprintf_r, (ptr, fp, fmt), _DEFUN(_fwprintf_r, (ptr, fp, fmt),
struct _reent *ptr, struct _reent *ptr,
FILE *fp, FILE *fp,
const wchar_t *fmt _DOTS) const wchar_t *fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;
@ -42,7 +42,7 @@ _DEFUN(_fwprintf_r, (ptr, fp, fmt),
int int
_DEFUN(fwprintf, (fp, fmt), _DEFUN(fwprintf, (fp, fmt),
FILE *__restrict fp, FILE *__restrict fp,
const wchar_t *__restrict fmt _DOTS) const wchar_t *__restrict fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;

View File

@ -26,7 +26,7 @@
int int
_DEFUN(iprintf, (fmt), _DEFUN(iprintf, (fmt),
const char *fmt _DOTS) const char *fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;
@ -44,7 +44,7 @@ _DEFUN(iprintf, (fmt),
int int
_DEFUN(_iprintf_r, (ptr, fmt), _DEFUN(_iprintf_r, (ptr, fmt),
struct _reent *ptr, struct _reent *ptr,
const char *fmt _DOTS) const char *fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;

View File

@ -25,7 +25,7 @@
int int
_DEFUN(_printf_r, (ptr, fmt), _DEFUN(_printf_r, (ptr, fmt),
struct _reent *ptr, struct _reent *ptr,
const char *__restrict fmt _DOTS) const char *__restrict fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;
@ -47,7 +47,7 @@ _EXFUN(_iprintf_r, (struct _reent *, const char *, ...)
int int
_DEFUN(printf, (fmt), _DEFUN(printf, (fmt),
const char *__restrict fmt _DOTS) const char *__restrict fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;

View File

@ -107,7 +107,7 @@ int
_DEFUN(_siprintf_r, (ptr, str, fmt), _DEFUN(_siprintf_r, (ptr, str, fmt),
struct _reent *ptr, struct _reent *ptr,
char *str, char *str,
const char *fmt _DOTS) const char *fmt, ...)
#else #else
_siprintf_r(ptr, str, fmt, va_alist) _siprintf_r(ptr, str, fmt, va_alist)
struct _reent *ptr; struct _reent *ptr;
@ -141,7 +141,7 @@ int
#ifdef _HAVE_STDC #ifdef _HAVE_STDC
_DEFUN(siprintf, (str, fmt), _DEFUN(siprintf, (str, fmt),
char *str, char *str,
const char *fmt _DOTS) const char *fmt, ...)
#else #else
siprintf(str, fmt, va_alist) siprintf(str, fmt, va_alist)
char *str; char *str;

View File

@ -89,7 +89,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int int
_DEFUN(siscanf, (str, fmt), _DEFUN(siscanf, (str, fmt),
const char *str, const char *str,
const char *fmt _DOTS) const char *fmt, ...)
#else #else
int int
siscanf(str, fmt, va_alist) siscanf(str, fmt, va_alist)
@ -126,7 +126,7 @@ int
_DEFUN(_siscanf_r, (ptr, str, fmt), _DEFUN(_siscanf_r, (ptr, str, fmt),
struct _reent *ptr, struct _reent *ptr,
const char *str, const char *str,
const char *fmt _DOTS) const char *fmt, ...)
#else #else
int int
_siscanf_r(ptr, str, fmt, va_alist) _siscanf_r(ptr, str, fmt, va_alist)

View File

@ -36,7 +36,7 @@ _DEFUN (_sniprintf_r, (ptr, str, size, fmt),
struct _reent *ptr, struct _reent *ptr,
char *str, char *str,
size_t size, size_t size,
const char *fmt _DOTS) const char *fmt, ...)
#else #else
_sniprintf_r (ptr, str, size, fmt, va_alist) _sniprintf_r (ptr, str, size, fmt, va_alist)
struct _reent *ptr; struct _reent *ptr;
@ -80,7 +80,7 @@ int
_DEFUN (sniprintf, (str, size, fmt), _DEFUN (sniprintf, (str, size, fmt),
char *str, char *str,
size_t size, size_t size,
const char *fmt _DOTS) const char *fmt, ...)
#else #else
sniprintf (str, size, fmt, va_alist) sniprintf (str, size, fmt, va_alist)
char *str; char *str;

View File

@ -35,7 +35,7 @@ _DEFUN(_snprintf_r, (ptr, str, size, fmt),
struct _reent *ptr, struct _reent *ptr,
char *__restrict str, char *__restrict str,
size_t size, size_t size,
const char *__restrict fmt _DOTS) const char *__restrict fmt, ...)
#else #else
_snprintf_r(ptr, str, size, fmt, va_alist) _snprintf_r(ptr, str, size, fmt, va_alist)
struct _reent *ptr; struct _reent *ptr;
@ -85,7 +85,7 @@ int
_DEFUN(snprintf, (str, size, fmt), _DEFUN(snprintf, (str, size, fmt),
char *__restrict str, char *__restrict str,
size_t size, size_t size,
const char *__restrict fmt _DOTS) const char *__restrict fmt, ...)
#else #else
snprintf(str, size, fmt, va_alist) snprintf(str, size, fmt, va_alist)
char *str; char *str;

View File

@ -583,7 +583,7 @@ int
_DEFUN(_sprintf_r, (ptr, str, fmt), _DEFUN(_sprintf_r, (ptr, str, fmt),
struct _reent *ptr, struct _reent *ptr,
char *__restrict str, char *__restrict str,
const char *__restrict fmt _DOTS) const char *__restrict fmt, ...)
#else #else
_sprintf_r(ptr, str, fmt, va_alist) _sprintf_r(ptr, str, fmt, va_alist)
struct _reent *ptr; struct _reent *ptr;
@ -623,7 +623,7 @@ int
#ifdef _HAVE_STDC #ifdef _HAVE_STDC
_DEFUN(sprintf, (str, fmt), _DEFUN(sprintf, (str, fmt),
char *__restrict str, char *__restrict str,
const char *__restrict fmt _DOTS) const char *__restrict fmt, ...)
#else #else
sprintf(str, fmt, va_alist) sprintf(str, fmt, va_alist)
char *str; char *str;

View File

@ -428,7 +428,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int int
_DEFUN(sscanf, (str, fmt), _DEFUN(sscanf, (str, fmt),
const char *__restrict str, const char *__restrict str,
const char * fmt _DOTS) const char * fmt, ...)
#else #else
int int
sscanf(str, fmt, va_alist) sscanf(str, fmt, va_alist)
@ -471,7 +471,7 @@ int
_DEFUN(_sscanf_r, (ptr, str, fmt), _DEFUN(_sscanf_r, (ptr, str, fmt),
struct _reent *ptr, struct _reent *ptr,
const char *__restrict str, const char *__restrict str,
const char *__restrict fmt _DOTS) const char *__restrict fmt, ...)
#else #else
int int
_sscanf_r(ptr, str, fmt, va_alist) _sscanf_r(ptr, str, fmt, va_alist)

View File

@ -557,7 +557,7 @@ _DEFUN(_swprintf_r, (ptr, str, size, fmt),
struct _reent *ptr, struct _reent *ptr,
wchar_t *str, wchar_t *str,
size_t size, size_t size,
const wchar_t *fmt _DOTS) const wchar_t *fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;
@ -597,7 +597,7 @@ int
_DEFUN(swprintf, (str, size, fmt), _DEFUN(swprintf, (str, size, fmt),
wchar_t *__restrict str, wchar_t *__restrict str,
size_t size, size_t size,
const wchar_t *__restrict fmt _DOTS) const wchar_t *__restrict fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;

View File

@ -26,7 +26,7 @@
int int
_DEFUN(_wprintf_r, (ptr, fmt), _DEFUN(_wprintf_r, (ptr, fmt),
struct _reent *ptr, struct _reent *ptr,
const wchar_t *fmt _DOTS) const wchar_t *fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;
@ -42,7 +42,7 @@ _DEFUN(_wprintf_r, (ptr, fmt),
int int
_DEFUN(wprintf, (fmt), _DEFUN(wprintf, (fmt),
const wchar_t *__restrict fmt _DOTS) const wchar_t *__restrict fmt, ...)
{ {
int ret; int ret;
va_list ap; va_list ap;

View File

@ -12,7 +12,7 @@
int int
_DEFUN (open, (file, flags, ...), _DEFUN (open, (file, flags, ...),
const char *file, const char *file,
int flags _DOTS) int flags, ...)
{ {
va_list ap; va_list ap;
int ret; int ret;

View File

@ -49,7 +49,7 @@ _DEFUN (xdr_vwarnx, (format, ap),
void void
_DEFUN (xdr_warnx, (fmt), _DEFUN (xdr_warnx, (fmt),
const char *fmt _DOTS) const char *fmt, ...)
{ {
va_list ap; va_list ap;
va_start (ap, fmt); va_start (ap, fmt);