ansification: remove _EXFUN, _EXFUN_NOTHROW

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
This commit is contained in:
Yaakov Selkowitz
2017-12-03 23:54:48 -06:00
parent 77f16db546
commit 70ee6b17df
98 changed files with 1740 additions and 1798 deletions

View File

@ -55,7 +55,7 @@ register char * stack_ptr asm ("sp");
/* following is copied from libc/stdio/local.h to check std streams */
extern void _EXFUN(__sinit,(struct _reent *));
extern void __sinit (struct _reent *);
#define CHECK_INIT(ptr) \
do \
{ \

View File

@ -22,10 +22,10 @@ typedef struct __sigjmpbuf
typedef __jmp_buf jmp_buf;
void _EXFUN(longjmp,(jmp_buf __jmpb, int __retval));
int _EXFUN(setjmp,(jmp_buf __jmpb));
void _EXFUN(siglongjmp,(sigjmp_buf __jmpb, int __retval));
int _EXFUN(sigsetjmp,(sigjmp_buf __jmpb, int __savemask));
void longjmp (jmp_buf __jmpb, int __retval);
int setjmp (jmp_buf __jmpb);
void siglongjmp (sigjmp_buf __jmpb, int __retval);
int sigsetjmp (sigjmp_buf __jmpb, int __savemask);
/* sigsetjmp is implemented as macro using setjmp */

View File

@ -62,27 +62,27 @@ struct tm
typedef __timer_t timer_t;
#endif
clock_t _EXFUN(clock, (void));
double _EXFUN(difftime, (time_t _time2, time_t _time1));
time_t _EXFUN(mktime, (struct tm *_timeptr));
time_t _EXFUN(time, (time_t *_timer));
clock_t clock (void);
double difftime (time_t _time2, time_t _time1);
time_t mktime (struct tm *_timeptr);
time_t time (time_t *_timer);
#ifndef _REENT_ONLY
char *_EXFUN(asctime, (const struct tm *_tblock));
char *_EXFUN(ctime, (const time_t *_time));
struct tm *_EXFUN(gmtime, (const time_t *_timer));
struct tm *_EXFUN(localtime,(const time_t *_timer));
char *asctime (const struct tm *_tblock);
char *ctime (const time_t *_time);
struct tm *gmtime (const time_t *_timer);
struct tm *localtime (const time_t *_timer);
#endif
size_t _EXFUN(strftime, (char *_s, size_t _maxsize, const char *_fmt, const struct tm *_t));
size_t strftime (char *_s, size_t _maxsize, const char *_fmt, const struct tm *_t);
char *_EXFUN(asctime_r, (const struct tm *, char *));
char *_EXFUN(ctime_r, (const time_t *, char *));
struct tm *_EXFUN(gmtime_r, (const time_t *, struct tm *));
struct tm *_EXFUN(localtime_r, (const time_t *, struct tm *));
char *asctime_r (const struct tm *, char *);
char *ctime_r (const time_t *, char *);
struct tm *gmtime_r (const time_t *, struct tm *);
struct tm *localtime_r (const time_t *, struct tm *);
#ifndef __STRICT_ANSI__
char *_EXFUN(strptime, (const char *, const char *, struct tm *));
void _EXFUN(tzset, (void));
void _EXFUN(_tzset_r, (struct _reent *));
char *strptime (const char *, const char *, struct tm *);
void tzset (void);
void _tzset_r (struct _reent *);
typedef struct __tzrule_struct
{
@ -102,15 +102,15 @@ typedef struct __tzinfo_struct
__tzrule_type __tzrule[2];
} __tzinfo_type;
__tzinfo_type *_EXFUN (__gettzinfo, (void));
__tzinfo_type *__gettzinfo (void);
/* getdate functions */
#ifndef _REENT_ONLY
#define getdate_err (*__getdate_err())
int *_EXFUN(__getdate_err,(void));
int *__getdate_err (void);
struct tm * _EXFUN(getdate, (const char *));
struct tm * getdate (const char *);
/* getdate_err is set to one of the following values to indicate the error.
1 the DATEMSK environment variable is null or undefined,
2 the template file cannot be opened for reading,
@ -123,7 +123,7 @@ struct tm * _EXFUN(getdate, (const char *));
#endif /* !_REENT_ONLY */
/* getdate_r returns the error code as above */
int _EXFUN(getdate_r, (const char *, struct tm *));
int getdate_r (const char *, struct tm *);
/* defines for the opengroup specifications Derived from Issue 1 of the SVID. */
extern __IMPORT long _timezone;
@ -145,30 +145,28 @@ extern __IMPORT char *_tzname[2];
/* Clocks, P1003.1b-1993, p. 263 */
int _EXFUN(clock_settime, (clockid_t clock_id, const struct timespec *tp));
int _EXFUN(clock_gettime, (clockid_t clock_id, struct timespec *tp));
int _EXFUN(clock_getres, (clockid_t clock_id, struct timespec *res));
int clock_settime (clockid_t clock_id, const struct timespec *tp);
int clock_gettime (clockid_t clock_id, struct timespec *tp);
int clock_getres (clockid_t clock_id, struct timespec *res);
/* Create a Per-Process Timer, P1003.1b-1993, p. 264 */
int _EXFUN(timer_create,
(clockid_t clock_id, struct sigevent *evp, timer_t *timerid));
int timer_create (clockid_t clock_id, struct sigevent *evp, timer_t *timerid);
/* Delete a Per_process Timer, P1003.1b-1993, p. 266 */
int _EXFUN(timer_delete, (timer_t timerid));
int timer_delete (timer_t timerid);
/* Per-Process Timers, P1003.1b-1993, p. 267 */
int _EXFUN(timer_settime,
(timer_t timerid, int flags, const struct itimerspec *value,
struct itimerspec *ovalue));
int _EXFUN(timer_gettime, (timer_t timerid, struct itimerspec *value));
int _EXFUN(timer_getoverrun, (timer_t timerid));
int timer_settime (timer_t timerid, int flags, const struct itimerspec *value,
struct itimerspec *ovalue);
int timer_gettime (timer_t timerid, struct itimerspec *value);
int timer_getoverrun (timer_t timerid);
/* High Resolution Sleep, P1003.1b-1993, p. 269 */
int _EXFUN(nanosleep, (const struct timespec *rqtp, struct timespec *rmtp));
int nanosleep (const struct timespec *rqtp, struct timespec *rmtp);
#endif /* _POSIX_TIMERS */
@ -223,7 +221,7 @@ int _EXFUN(nanosleep, (const struct timespec *rqtp, struct timespec *rmtp));
/* Accessing a Process CPU-time CLock, P1003.4b/D8, p. 55 */
int _EXFUN(clock_getcpuclockid, (pid_t pid, clockid_t *clock_id));
int clock_getcpuclockid (pid_t pid, clockid_t *clock_id);
#endif /* _POSIX_CPUTIME */
@ -231,8 +229,8 @@ int _EXFUN(clock_getcpuclockid, (pid_t pid, clockid_t *clock_id));
/* CPU-time Clock Attribute Access, P1003.4b/D8, p. 56 */
int _EXFUN(clock_setenable_attr, (clockid_t clock_id, int attr));
int _EXFUN(clock_getenable_attr, (clockid_t clock_id, int *attr));
int clock_setenable_attr (clockid_t clock_id, int attr);
int clock_getenable_attr (clockid_t clock_id, int *attr);
#endif /* _POSIX_CPUTIME or _POSIX_THREAD_CPUTIME */

View File

@ -36,16 +36,16 @@ typedef _sig_func_ptr __sighandler_t;
#include <_ansi.h>
int _EXFUN(kill, (int, int));
int _EXFUN(sigaction, (int, const struct sigaction *, struct sigaction *));
int _EXFUN(sigaddset, (sigset_t *, const int));
int _EXFUN(sigdelset, (sigset_t *, const int));
int _EXFUN(sigismember, (const sigset_t *, int));
int _EXFUN(sigfillset, (sigset_t *));
int _EXFUN(sigemptyset, (sigset_t *));
int _EXFUN(sigpending, (sigset_t *));
int _EXFUN(sigsuspend, (const sigset_t *));
int _EXFUN(sigpause, (int));
int kill (int, int);
int sigaction (int, const struct sigaction *, struct sigaction *);
int sigaddset (sigset_t *, const int);
int sigdelset (sigset_t *, const int);
int sigismember (const sigset_t *, int);
int sigfillset (sigset_t *);
int sigemptyset (sigset_t *);
int sigpending (sigset_t *);
int sigsuspend (const sigset_t *);
int sigpause (int);
#ifndef _POSIX_SOURCE
extern const char *const sys_siglist[];

View File

@ -17,17 +17,17 @@
/* --- redundant stuff below --- */
int _EXFUN(fstat,( int __fd, struct stat *__sbuf ));
int _EXFUN(mkdir,( const char *_path, mode_t __mode ));
int _EXFUN(mkfifo,( const char *__path, mode_t __mode ));
int _EXFUN(stat,( const char *__restrict __path, struct stat *__restrict __sbuf ));
mode_t _EXFUN(umask,( mode_t __mask ));
int fstat (int __fd, struct stat *__sbuf);
int mkdir (const char *_path, mode_t __mode);
int mkfifo (const char *__path, mode_t __mode);
int stat (const char *__restrict __path, struct stat *__restrict __sbuf);
mode_t umask (mode_t __mask);
#ifndef _POSIX_SOURCE
int _EXFUN(fstat64,( int __fd, struct stat64 *__sbuf ));
int _EXFUN(lstat,( const char *__restrict file_name, struct stat64 *__restrict buf));
int _EXFUN(lstat64,( const char *__restrict file_name, struct stat64 *__restrict buf));
int _EXFUN(stat64,( const char *__restrict __path, struct stat64 *__restrict __sbuf ));
int fstat64 (int __fd, struct stat64 *__sbuf);
int lstat (const char *__restrict file_name, struct stat64 *__restrict buf);
int lstat64 (const char *__restrict file_name, struct stat64 *__restrict buf);
int stat64 (const char *__restrict __path, struct stat64 *__restrict __sbuf);
#endif /* _POSIX_SOURCE */
#endif /* _SYS_STAT_H */

View File

@ -16,6 +16,6 @@
#define getline __getline
#define getdelim __getdelim
char * _EXFUN(ctermid, (char *));
char * ctermid (char *);
#endif /* _NEWLIB_STDIO_H */

View File

@ -2,7 +2,7 @@
#define _SYS_STRING_H
#ifndef __STRICT_ANSI__
char *_EXFUN(strsignal, (int __signo));
char *strsignal (int __signo);
#endif
#endif /* _SYS_STRING_H */

View File

@ -85,10 +85,10 @@
#include <_ansi.h>
int _EXFUN(gettimeofday, (struct timeval *__p, struct timezone *__z));
int _EXFUN(settimeofday, (const struct timeval *, const struct timezone *));
int _EXFUN(utimes, (const char *__path, const struct timeval __tvp[2]));
int _EXFUN(getitimer, (int __which, struct itimerval *__value));
int _EXFUN(setitimer, (int __which, const struct itimerval *__value,
struct itimerval *__ovalue));
int gettimeofday (struct timeval *__p, struct timezone *__z);
int settimeofday (const struct timeval *, const struct timezone *);
int utimes (const char *__path, const struct timeval __tvp[2]);
int getitimer (int __which, struct itimerval *__value);
int setitimer (int __which, const struct itimerval *__value,
struct itimerval *__ovalue);
#endif

View File

@ -16,86 +16,86 @@ extern "C" {
extern char **environ;
void _EXFUN(_exit, (int __status ) _ATTRIBUTE ((__noreturn__)));
void _exit (int __status) _ATTRIBUTE ((__noreturn__));
int _EXFUN(access,(const char *__path, int __amode ));
unsigned _EXFUN(alarm, (unsigned __secs ));
int _EXFUN(chdir, (const char *__path ));
int _EXFUN(chmod, (const char *__path, mode_t __mode ));
int _EXFUN(chown, (const char *__path, uid_t __owner, gid_t __group ));
int _EXFUN(chroot, (const char *__path ));
int _EXFUN(close, (int __fildes ));
char _EXFUN(*ctermid, (char *__s ));
char _EXFUN(*cuserid, (char *__s ));
int _EXFUN(dup, (int __fildes ));
int _EXFUN(dup2, (int __fildes, int __fildes2 ));
int _EXFUN(execl, (const char *__path, const char *, ... ));
int _EXFUN(execle, (const char *__path, const char *, ... ));
int _EXFUN(execlp, (const char *__file, const char *, ... ));
int _EXFUN(execv, (const char *__path, char * const __argv[] ));
int _EXFUN(execve, (const char *__path, char * const __argv[], char * const __envp[] ));
int _EXFUN(execvp, (const char *__file, char * const __argv[] ));
int _EXFUN(fchdir, (int __fildes));
int _EXFUN(fchmod, (int __fildes, mode_t __mode ));
int _EXFUN(fchown, (int __fildes, uid_t __owner, gid_t __group ));
pid_t _EXFUN(fork, (void ));
long _EXFUN(fpathconf, (int __fd, int __name ));
int _EXFUN(fsync, (int __fd));
int _EXFUN(ftruncate, (int __fd, off_t __length));
char _EXFUN(*getcwd, (char *__buf, size_t __size ));
int _EXFUN(getdomainname ,(char *__name, size_t __len));
gid_t _EXFUN(getegid, (void ));
uid_t _EXFUN(geteuid, (void ));
gid_t _EXFUN(getgid, (void ));
int _EXFUN(getgroups, (int __gidsetsize, gid_t __grouplist[] ));
int _EXFUN(__gethostname, (char *__name, size_t __len));
char _EXFUN(*getlogin, (void ));
int access (const char *__path, int __amode);
unsigned alarm (unsigned __secs);
int chdir (const char *__path);
int chmod (const char *__path, mode_t __mode);
int chown (const char *__path, uid_t __owner, gid_t __group);
int chroot (const char *__path);
int close (int __fildes);
char *ctermid (char *__s);
char *cuserid (char *__s);
int dup (int __fildes);
int dup2 (int __fildes, int __fildes2);
int execl (const char *__path, const char *, ...);
int execle (const char *__path, const char *, ...);
int execlp (const char *__file, const char *, ...);
int execv (const char *__path, char * const __argv[]);
int execve (const char *__path, char * const __argv[], char * const __envp[]);
int execvp (const char *__file, char * const __argv[]);
int fchdir (int __fildes);
int fchmod (int __fildes, mode_t __mode);
int fchown (int __fildes, uid_t __owner, gid_t __group);
pid_t fork (void);
long fpathconf (int __fd, int __name);
int fsync (int __fd);
int ftruncate (int __fd, off_t __length);
char *getcwd (char *__buf, size_t __size);
int getdomainname (char *__name, size_t __len);
gid_t getegid (void);
uid_t geteuid (void);
gid_t getgid (void);
int getgroups (int __gidsetsize, gid_t __grouplist[]);
int __gethostname (char *__name, size_t __len);
char *getlogin (void);
#if defined(_POSIX_THREAD_SAFE_FUNCTIONS)
int _EXFUN(getlogin_r, (char *name, size_t namesize) );
int getlogin_r (char *name, size_t namesize) ;
#endif
char _EXFUN(*getpass, (__const char *__prompt));
int _EXFUN(getpagesize, (void));
pid_t _EXFUN(getpgid, (pid_t));
pid_t _EXFUN(getpgrp, (void ));
pid_t _EXFUN(getpid, (void ));
pid_t _EXFUN(getppid, (void ));
uid_t _EXFUN(getuid, (void ));
char * _EXFUN(getusershell, (void));
char _EXFUN(*getwd, (char *__buf ));
int _EXFUN(isatty, (int __fildes ));
int _EXFUN(lchown, (const char *__path, uid_t __owner, gid_t __group ));
int _EXFUN(link, (const char *__path1, const char *__path2 ));
int _EXFUN(nice, (int __nice_value ));
off_t _EXFUN(lseek, (int __fildes, off_t __offset, int __whence ));
long _EXFUN(pathconf, (const char *__path, int __name ));
int _EXFUN(pause, (void ));
int _EXFUN(pipe, (int __fildes[2] ));
ssize_t _EXFUN(pread, (int __fd, void *__buf, size_t __nbytes, off_t __offset));
ssize_t _EXFUN(pwrite, (int __fd, const void *__buf, size_t __nbytes, off_t __offset));
_READ_WRITE_RETURN_TYPE _EXFUN(read, (int __fd, void *__buf, size_t __nbyte ));
int _EXFUN(readlink, (const char *path, char *buf, size_t bufsiz));
int _EXFUN(rmdir, (const char *__path ));
void * _EXFUN(sbrk, (ptrdiff_t __incr));
int _EXFUN(setegid, (gid_t __gid ));
int _EXFUN(seteuid, (uid_t __uid ));
int _EXFUN(setgid, (gid_t __gid ));
int _EXFUN(setpgid, (pid_t __pid, pid_t __pgid ));
int _EXFUN(setpgrp, (void ));
pid_t _EXFUN(setsid, (void ));
int _EXFUN(setuid, (uid_t __uid ));
unsigned _EXFUN(sleep, (unsigned int __seconds ));
void _EXFUN(swab, (const void *, void *, ssize_t));
int _EXFUN(symlink, (const char *oldpath, const char *newpath));
long _EXFUN(sysconf, (int __name ));
pid_t _EXFUN(tcgetpgrp, (int __fildes ));
int _EXFUN(tcsetpgrp, (int __fildes, pid_t __pgrp_id ));
int _EXFUN(truncate, (const char *, off_t __length));
char * _EXFUN(ttyname, (int __fildes ));
int _EXFUN(ttyname_r, (int __fildes, char *__buf, size_t __len));
int _EXFUN(unlink, (const char *__path ));
int _EXFUN(usleep, (__useconds_t __useconds));
int _EXFUN(vhangup, (void ));
_READ_WRITE_RETURN_TYPE _EXFUN(write, (int __fd, const void *__buf, size_t __nbyte ));
char *getpass (__const char *__prompt);
int getpagesize (void);
pid_t getpgid (pid_t);
pid_t getpgrp (void);
pid_t getpid (void);
pid_t getppid (void);
uid_t getuid (void);
char * getusershell (void);
char *getwd (char *__buf);
int isatty (int __fildes);
int lchown (const char *__path, uid_t __owner, gid_t __group);
int link (const char *__path1, const char *__path2);
int nice (int __nice_value);
off_t lseek (int __fildes, off_t __offset, int __whence);
long pathconf (const char *__path, int __name);
int pause (void);
int pipe (int __fildes[2]);
ssize_t pread (int __fd, void *__buf, size_t __nbytes, off_t __offset);
ssize_t pwrite (int __fd, const void *__buf, size_t __nbytes, off_t __offset);
_READ_WRITE_RETURN_TYPE read (int __fd, void *__buf, size_t __nbyte);
int readlink (const char *path, char *buf, size_t bufsiz);
int rmdir (const char *__path);
void * sbrk (ptrdiff_t __incr);
int setegid (gid_t __gid);
int seteuid (uid_t __uid);
int setgid (gid_t __gid);
int setpgid (pid_t __pid, pid_t __pgid);
int setpgrp (void);
pid_t setsid (void);
int setuid (uid_t __uid);
unsigned sleep (unsigned int __seconds);
void swab (const void *, void *, ssize_t);
int symlink (const char *oldpath, const char *newpath);
long sysconf (int __name);
pid_t tcgetpgrp (int __fildes);
int tcsetpgrp (int __fildes, pid_t __pgrp_id);
int truncate (const char *, off_t __length);
char * ttyname (int __fildes);
int ttyname_r (int __fildes, char *__buf, size_t __len);
int unlink (const char *__path);
int usleep (__useconds_t __useconds);
int vhangup (void);
_READ_WRITE_RETURN_TYPE write (int __fd, const void *__buf, size_t __nbyte);
extern char *optarg; /* getopt(3) external variables */
extern int optind, opterr, optopt;
@ -103,7 +103,7 @@ int getopt(int, char * const [], const char *);
extern int optreset; /* getopt(3) external variable */
#ifndef _POSIX_SOURCE
pid_t _EXFUN(vfork, (void ));
pid_t vfork (void);
extern char *suboptarg; /* getsubopt(3) external variable */
int getsubopt(char **, char * const *, char **);
@ -111,16 +111,16 @@ int getsubopt(char **, char * const *, char **);
/* Provide prototypes for most of the _<systemcall> names that are
provided in newlib for some compilers. */
int _EXFUN(_close, (int __fildes ));
pid_t _EXFUN(_fork, (void ));
pid_t _EXFUN(_getpid, (void ));
int _EXFUN(_link, (const char *__path1, const char *__path2 ));
off_t _EXFUN(_lseek, (int __fildes, off_t __offset, int __whence ));
_READ_WRITE_RETURN_TYPE _EXFUN(_read, (int __fd, void *__buf, size_t __nbyte ));
void * _EXFUN(_sbrk, (size_t __incr));
int _EXFUN(_unlink, (const char *__path ));
_READ_WRITE_RETURN_TYPE _EXFUN(_write, (int __fd, const void *__buf, size_t __nbyte ));
int _EXFUN(_execve, (const char *__path, char * const __argv[], char * const __envp[] ));
int _close (int __fildes);
pid_t _fork (void);
pid_t _getpid (void);
int _link (const char *__path1, const char *__path2);
off_t _lseek (int __fildes, off_t __offset, int __whence);
_READ_WRITE_RETURN_TYPE _read (int __fd, void *__buf, size_t __nbyte);
void * _sbrk (size_t __incr);
int _unlink (const char *__path);
_READ_WRITE_RETURN_TYPE _write (int __fd, const void *__buf, size_t __nbyte);
int _execve (const char *__path, char * const __argv[], char * const __envp[]);
#define F_OK 0
#define R_OK 4

View File

@ -9,6 +9,6 @@ struct utimbuf
time_t modtime; /* Modification time. */
};
int _EXFUN(utime, (const char *__file, const struct utimbuf *__times));
int utime (const char *__file, const struct utimbuf *__times);
#endif /* _SYS_UTIME_H */

View File

@ -119,12 +119,12 @@ struct stat
#define S_ISLNK(m) (((m)&_IFMT) == _IFLNK)
#define S_ISSOCK(m) (((m)&_IFMT) == _IFSOCK)
int _EXFUN(chmod,( const char *_path, mode_t _mode ));
int _EXFUN(fstat,( int _fd, struct stat *_sbuf ));
int _EXFUN(mkdir,( char *_path, mode_t _mode ));
int _EXFUN(mkfifo,( char *_path, mode_t _mode ));
int _EXFUN(stat,( const char *__restrict _path, struct stat *__restrict _sbuf ));
mode_t _EXFUN(umask,( mode_t _mask ));
int chmod (const char *_path, mode_t _mode);
int fstat (int _fd, struct stat *_sbuf);
int mkdir (char *_path, mode_t _mode);
int mkfifo (char *_path, mode_t _mode);
int stat (const char *__restrict _path, struct stat *__restrict _sbuf);
mode_t umask (mode_t _mask);
#ifdef __cplusplus
}