2003-06-03 Jeff Johnston <jjohnstn@redhat.com>

* libc/reent/execr.c: Use _DEFUN macro for function declaration.
        * libc/reent/fcntlr.c: Ditto.
        * libc/reent/fstat64r.c: Ditto.
        * libc/reent/linkr.c: Ditto.
        * libc/reent/lseek64r.c: Ditto.
        * libc/reent/lseekr.c: Ditto.
        * libc/reent/openr.c: Ditto.
        * libc/reent/readr.c: Ditto.
        * libc/reent/reent.c: Ditto.
        * libc/reent/sbrkr.c: Ditto.
        * libc/reent/signalr.c: Ditto.
        * libc/reent/signgam.c: Ditto.
        * libc/reent/statr.c: Ditto.
        * libc/reent/timer.c: Ditto.
        * libc/reent/unlinkr.c: Ditto.
        * libc/reent/writer.c: Ditto.
        * libc/syscalls/sysclose.c: Ditto.
        * libc/syscalls/sysexecve.c: Ditto.
        * libc/syscalls/sysfcntl.c: Ditto.
        * libc/syscalls/sysfork.c: Ditto.
        * libc/syscalls/sysfstat.c: Ditto.
        * libc/syscalls/sysgetpid.c: Ditto.
        * libc/syscalls/sysgettod.c: Ditto.
        * libc/syscalls/syskill.c: Ditto.
        * libc/syscalls/syslink.c: Ditto.
        * libc/syscalls/syslseek.c: Ditto.
        * libc/syscalls/sysopen.c: Ditto.
        * libc/syscalls/sysread.c: Ditto.
        * libc/syscalls/syssbrk.c: Ditto.
        * libc/syscalls/sysstat.c: Ditto.
        * libc/syscalls/systimes.c: Ditto.
        * libc/syscalls/sysunlink.c: Ditto.
        * libc/syscalls/syswait.c: Ditto.
This commit is contained in:
Jeff Johnston 2003-06-03 19:48:08 +00:00
parent 702ceb233d
commit bf3bcac28b
35 changed files with 165 additions and 126 deletions

View File

@ -1,3 +1,40 @@
2003-06-03 Jeff Johnston <jjohnstn@redhat.com>
* libc/reent/execr.c: Use _DEFUN macro for function declaration.
* libc/reent/fcntlr.c: Ditto.
* libc/reent/fstat64r.c: Ditto.
* libc/reent/linkr.c: Ditto.
* libc/reent/lseek64r.c: Ditto.
* libc/reent/lseekr.c: Ditto.
* libc/reent/openr.c: Ditto.
* libc/reent/readr.c: Ditto.
* libc/reent/reent.c: Ditto.
* libc/reent/sbrkr.c: Ditto.
* libc/reent/signalr.c: Ditto.
* libc/reent/signgam.c: Ditto.
* libc/reent/statr.c: Ditto.
* libc/reent/timer.c: Ditto.
* libc/reent/unlinkr.c: Ditto.
* libc/reent/writer.c: Ditto.
* libc/syscalls/sysclose.c: Ditto.
* libc/syscalls/sysexecve.c: Ditto.
* libc/syscalls/sysfcntl.c: Ditto.
* libc/syscalls/sysfork.c: Ditto.
* libc/syscalls/sysfstat.c: Ditto.
* libc/syscalls/sysgetpid.c: Ditto.
* libc/syscalls/sysgettod.c: Ditto.
* libc/syscalls/syskill.c: Ditto.
* libc/syscalls/syslink.c: Ditto.
* libc/syscalls/syslseek.c: Ditto.
* libc/syscalls/sysopen.c: Ditto.
* libc/syscalls/sysread.c: Ditto.
* libc/syscalls/syssbrk.c: Ditto.
* libc/syscalls/sysstat.c: Ditto.
* libc/syscalls/systimes.c: Ditto.
* libc/syscalls/sysunlink.c: Ditto.
* libc/syscalls/syswait.c: Ditto.
* libc/syscalls/syswrite.c: Ditto.
2003-06-03 Till Straumann <strauman@SLAC.Stanford.EDU> 2003-06-03 Till Straumann <strauman@SLAC.Stanford.EDU>
* libc/time/tzset_r.c: Change local variables that are * libc/time/tzset_r.c: Change local variables that are

View File

@ -53,11 +53,11 @@ DESCRIPTION
*/ */
int int
_execve_r (ptr, name, argv, env) _DEFUN (_execve_r, (ptr, name, argv, env),
struct _reent *ptr; struct _reent *ptr _AND
char *name; char *name _AND
char **argv; char **argv _AND
char **env; char **env)
{ {
int ret; int ret;
@ -93,8 +93,8 @@ DESCRIPTION
#ifndef NO_FORK #ifndef NO_FORK
int int
_fork_r (ptr) _DEFUN (_fork_r, (ptr),
struct _reent *ptr; struct _reent *ptr)
{ {
int ret; int ret;
@ -130,9 +130,9 @@ DESCRIPTION
*/ */
int int
_wait_r (ptr, status) _DEFUN (_wait_r, (ptr, status),
struct _reent *ptr; struct _reent *ptr _AND
int *status; int *status)
{ {
int ret; int ret;

View File

@ -48,11 +48,11 @@ DESCRIPTION
*/ */
int int
_fcntl_r (ptr, fd, cmd, arg) _DEFUN (_fcntl_r, (ptr, fd, cmd, arg),
struct _reent *ptr; struct _reent *ptr _AND
int fd; int fd _AND
int cmd; int cmd _AND
int arg; int arg)
{ {
int ret; int ret;

View File

@ -54,10 +54,10 @@ DESCRIPTION
*/ */
int int
_fstat64_r (ptr, fd, pstat) _DEFUN (_fstat64_r, (ptr, fd, pstat),
struct _reent *ptr; struct _reent *ptr _AND
int fd; int fd _AND
struct stat64 *pstat; struct stat64 *pstat)
{ {
int ret; int ret;

View File

@ -50,10 +50,10 @@ DESCRIPTION
*/ */
int int
_link_r (ptr, old, new) _DEFUN (_link_r, (ptr, old, new),
struct _reent *ptr; struct _reent *ptr _AND
_CONST char *old; _CONST char *old _AND
_CONST char *new; _CONST char *new)
{ {
int ret; int ret;

View File

@ -49,11 +49,11 @@ DESCRIPTION
*/ */
_off64_t _off64_t
_lseek64_r (ptr, fd, pos, whence) _DEFUN (_lseek64_r, (ptr, fd, pos, whence),
struct _reent *ptr; struct _reent *ptr _AND
int fd; int fd _AND
_off64_t pos; _off64_t pos _AND
int whence; int whence)
{ {
_off64_t ret; _off64_t ret;

View File

@ -46,11 +46,11 @@ DESCRIPTION
*/ */
_off_t _off_t
_lseek_r (ptr, fd, pos, whence) _DEFUN (_lseek_r, (ptr, fd, pos, whence),
struct _reent *ptr; struct _reent *ptr _AND
int fd; int fd _AND
_off_t pos; _off_t pos _AND
int whence; int whence)
{ {
_off_t ret; _off_t ret;

View File

@ -47,11 +47,11 @@ DESCRIPTION
*/ */
int int
_open_r (ptr, file, flags, mode) _DEFUN (_open_r, (ptr, file, flags, mode),
struct _reent *ptr; struct _reent *ptr _AND
_CONST char *file; _CONST char *file _AND
int flags; int flags _AND
int mode; int mode)
{ {
int ret; int ret;

View File

@ -46,11 +46,11 @@ DESCRIPTION
*/ */
_ssize_t _ssize_t
_read_r (ptr, fd, buf, cnt) _DEFUN (_read_r, (ptr, fd, buf, cnt),
struct _reent *ptr; struct _reent *ptr _AND
int fd; int fd _AND
_PTR buf; _PTR buf _AND
size_t cnt; size_t cnt)
{ {
_ssize_t ret; _ssize_t ret;

View File

@ -30,9 +30,9 @@ int errno;
/* Interim cleanup code */ /* Interim cleanup code */
void void
cleanup_glue (ptr, glue) _DEFUN (cleanup_glue, (ptr, glue),
struct _reent *ptr; struct _reent *ptr _AND
struct _glue *glue; struct _glue *glue)
{ {
/* Have to reclaim these in reverse order: */ /* Have to reclaim these in reverse order: */
if (glue->_next) if (glue->_next)
@ -42,8 +42,8 @@ cleanup_glue (ptr, glue)
} }
void void
_reclaim_reent (ptr) _DEFUN (_reclaim_reent, (ptr),
struct _reent *ptr; struct _reent *ptr)
{ {
if (ptr != _impure_ptr) if (ptr != _impure_ptr)
{ {
@ -121,7 +121,7 @@ _reclaim_reent (ptr)
*/ */
void void
_wrapup_reent(struct _reent *ptr) _DEFUN (_wrapup_reent, (ptr), struct _reent *ptr)
{ {
register struct _atexit *p; register struct _atexit *p;
register int n; register int n;

View File

@ -49,9 +49,9 @@ DESCRIPTION
*/ */
void * void *
_sbrk_r (ptr, incr) _DEFUN (_sbrk_r, (ptr, incr),
struct _reent *ptr; struct _reent *ptr _AND
ptrdiff_t incr; ptrdiff_t incr)
{ {
char *ret; char *ret;
void *_sbrk(ptrdiff_t); void *_sbrk(ptrdiff_t);

View File

@ -50,10 +50,10 @@ DESCRIPTION
*/ */
int int
_kill_r (ptr, pid, sig) _DEFUN (_kill_r, (ptr, pid, sig),
struct _reent *ptr; struct _reent *ptr _AND
int pid; int pid _AND
int sig; int sig)
{ {
int ret; int ret;
@ -89,8 +89,8 @@ DESCRIPTION
*/ */
int int
_getpid_r (ptr) _DEFUN (_getpid_r, (ptr),
struct _reent *ptr; struct _reent *ptr)
{ {
int ret; int ret;
ret = _getpid (); ret = _getpid ();

View File

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

View File

@ -52,10 +52,10 @@ DESCRIPTION
*/ */
int int
_stat_r (ptr, file, pstat) _DEFUN (_stat_r, (ptr, file, pstat),
struct _reent *ptr; struct _reent *ptr _AND
_CONST char *file; _CONST char *file _AND
struct stat *pstat; struct stat *pstat)
{ {
int ret; int ret;

View File

@ -55,9 +55,9 @@ DESCRIPTION
*/ */
clock_t clock_t
_times_r (ptr, ptms) _DEFUN (_times_r, (ptr, ptms),
struct _reent *ptr; struct _reent *ptr _AND
struct tms *ptms; struct tms *ptms)
{ {
clock_t ret; clock_t ret;
@ -97,10 +97,10 @@ DESCRIPTION
*/ */
int int
_gettimeofday_r (ptr, ptimeval, ptimezone) _DEFUN (_gettimeofday_r, (ptr, ptimeval, ptimezone),
struct _reent *ptr; struct _reent *ptr _AND
struct timeval *ptimeval; struct timeval *ptimeval _AND
struct timezone *ptimezone; struct timezone *ptimezone)
{ {
int ret; int ret;

View File

@ -44,9 +44,9 @@ DESCRIPTION
*/ */
int int
_unlink_r (ptr, file) _DEFUN (_unlink_r, (ptr, file),
struct _reent *ptr; struct _reent *ptr _AND
_CONST char *file; _CONST char *file)
{ {
int ret; int ret;

View File

@ -46,11 +46,11 @@ DESCRIPTION
*/ */
_ssize_t _ssize_t
_write_r (ptr, fd, buf, cnt) _DEFUN (_write_r, (ptr, fd, buf, cnt),
struct _reent *ptr; struct _reent *ptr _AND
int fd; int fd _AND
_CONST _PTR buf; _CONST _PTR buf _AND
size_t cnt; size_t cnt)
{ {
_ssize_t ret; _ssize_t ret;

View File

@ -3,8 +3,8 @@
#include <reent.h> #include <reent.h>
int int
close (fd) _DEFUN (close, (fd),
int fd; int fd)
{ {
#ifdef REENTRANT_SYSCALLS_PROVIDED #ifdef REENTRANT_SYSCALLS_PROVIDED
return _close_r (_REENT, fd); return _close_r (_REENT, fd);

View File

@ -3,10 +3,10 @@
#include <reent.h> #include <reent.h>
int int
execve (name, argv, env) _DEFUN (execve, (name, argv, env),
char *name; char *name _AND
char **argv; char **argv _AND
char **env; char **env)
{ {
#ifdef REENTRANT_SYSCALLS_PROVIDED #ifdef REENTRANT_SYSCALLS_PROVIDED
return _execve_r (_REENT, name, argv, env); return _execve_r (_REENT, name, argv, env);

View File

@ -5,10 +5,10 @@
#include <errno.h> #include <errno.h>
int int
fcntl (fd, flag, arg) _DEFUN (fcntl, (fd, flag, arg),
int fd; int fd _AND
int flag; int flag _AND
int arg; int arg)
{ {
#ifdef HAVE_FCNTL #ifdef HAVE_FCNTL
# ifdef REENTRANT_SYSCALLS_PROVIDED # ifdef REENTRANT_SYSCALLS_PROVIDED

View File

@ -7,7 +7,7 @@
#include <reent.h> #include <reent.h>
int int
fork () _DEFUN_VOID (fork)
{ {
#ifdef REENTRANT_SYSCALLS_PROVIDED #ifdef REENTRANT_SYSCALLS_PROVIDED
return _fork_r (_REENT); return _fork_r (_REENT);

View File

@ -4,9 +4,9 @@
#include <unistd.h> #include <unistd.h>
int int
fstat (fd, pstat) _DEFUN (fstat, (fd, pstat),
int fd; int fd _AND
struct stat *pstat; struct stat *pstat)
{ {
#ifdef REENTRANT_SYSCALLS_PROVIDED #ifdef REENTRANT_SYSCALLS_PROVIDED
return _fstat_r (_REENT, fd, pstat); return _fstat_r (_REENT, fd, pstat);

View File

@ -3,7 +3,7 @@
#include <reent.h> #include <reent.h>
int int
getpid () _DEFUN_VOID (getpid)
{ {
#ifdef REENTRANT_SYSCALLS_PROVIDED #ifdef REENTRANT_SYSCALLS_PROVIDED
return _getpid_r (_REENT); return _getpid_r (_REENT);

View File

@ -8,9 +8,9 @@ struct timeval;
struct timezone; struct timezone;
int int
gettimeofday (ptimeval, ptimezone) _DEFUN (gettimeofday, (ptimeval, ptimezone),
struct timeval *ptimeval; struct timeval *ptimeval _AND
struct timezone *ptimezone; struct timezone *ptimezone)
{ {
#ifdef REENTRANT_SYSCALLS_PROVIDED #ifdef REENTRANT_SYSCALLS_PROVIDED
return _gettimeofday_r (_REENT, ptimeval, ptimezone); return _gettimeofday_r (_REENT, ptimeval, ptimezone);

View File

@ -3,9 +3,9 @@
#include <reent.h> #include <reent.h>
int int
kill (pid, sig) _DEFUN (kill, (pid, sig),
int pid; int pid _AND
int sig; int sig)
{ {
#ifdef REENTRANT_SYSCALLS_PROVIDED #ifdef REENTRANT_SYSCALLS_PROVIDED
return _kill_r (_REENT, pid, sig); return _kill_r (_REENT, pid, sig);

View File

@ -3,9 +3,9 @@
#include <reent.h> #include <reent.h>
int int
link (old, new) _DEFUN (link, (old, new),
char *old; char *old _AND
char *new; char *new)
{ {
#ifdef REENTRANT_SYSCALLS_PROVIDED #ifdef REENTRANT_SYSCALLS_PROVIDED
return _link_r (_REENT, old, new); return _link_r (_REENT, old, new);

View File

@ -4,10 +4,10 @@
#include <unistd.h> #include <unistd.h>
off_t off_t
lseek (fd, pos, whence) _DEFUN (lseek, (fd, pos, whence),
int fd; int fd _AND
off_t pos; off_t pos _AND
int whence; int whence)
{ {
#ifdef REENTRANT_SYSCALLS_PROVIDED #ifdef REENTRANT_SYSCALLS_PROVIDED
return _lseek_r (_REENT, fd, pos, whence); return _lseek_r (_REENT, fd, pos, whence);

View File

@ -10,7 +10,9 @@
#include <stdarg.h> #include <stdarg.h>
int int
open (const char *file, int flags, ...) _DEFUN (open, (file, flags, ...),
const char *file _AND
int flags _DOTS)
{ {
va_list ap; va_list ap;
int ret; int ret;

View File

@ -4,10 +4,10 @@
#include <unistd.h> #include <unistd.h>
_READ_WRITE_RETURN_TYPE _READ_WRITE_RETURN_TYPE
read (fd, buf, cnt) _DEFUN (read, (fd, buf, cnt),
int fd; int fd _AND
void *buf; void *buf _AND
size_t cnt; size_t cnt)
{ {
#ifdef REENTRANT_SYSCALLS_PROVIDED #ifdef REENTRANT_SYSCALLS_PROVIDED
return _read_r (_REENT, fd, buf, cnt); return _read_r (_REENT, fd, buf, cnt);

View File

@ -7,8 +7,8 @@ extern void *_sbrk_r (struct _reent *, ptrdiff_t);
extern void *_sbrk (ptrdiff_t); extern void *_sbrk (ptrdiff_t);
void * void *
sbrk (incr) _DEFUN (sbrk, (incr),
ptrdiff_t incr; ptrdiff_t incr)
{ {
#ifdef REENTRANT_SYSCALLS_PROVIDED #ifdef REENTRANT_SYSCALLS_PROVIDED
return _sbrk_r (_REENT, incr); return _sbrk_r (_REENT, incr);

View File

@ -4,9 +4,9 @@
#include <unistd.h> #include <unistd.h>
int int
stat (file, pstat) _DEFUN (stat, (file, pstat),
char *file; char *file _AND
struct stat *pstat; struct stat *pstat)
{ {
#ifdef REENTRANT_SYSCALLS_PROVIDED #ifdef REENTRANT_SYSCALLS_PROVIDED
return _stat_r (_REENT, file, pstat); return _stat_r (_REENT, file, pstat);

View File

@ -4,8 +4,8 @@
#include <sys/times.h> #include <sys/times.h>
clock_t clock_t
times (buf) _DEFUN (times, (buf),
struct tms *buf; struct tms *buf)
{ {
#ifdef REENTRANT_SYSCALLS_PROVIDED #ifdef REENTRANT_SYSCALLS_PROVIDED
return _times_r (_REENT, buf); return _times_r (_REENT, buf);

View File

@ -3,8 +3,8 @@
#include <reent.h> #include <reent.h>
int int
unlink (file) _DEFUN (unlink, (file),
char *file; char *file)
{ {
#ifdef REENTRANT_SYSCALLS_PROVIDED #ifdef REENTRANT_SYSCALLS_PROVIDED
return _unlink_r (_REENT, file); return _unlink_r (_REENT, file);

View File

@ -3,8 +3,8 @@
#include <reent.h> #include <reent.h>
int int
wait (status) _DEFUN (wait, (status),
int *status; int *status)
{ {
#ifdef REENTRANT_SYSCALLS_PROVIDED #ifdef REENTRANT_SYSCALLS_PROVIDED
return _wait_r (_REENT, status); return _wait_r (_REENT, status);

View File

@ -4,10 +4,10 @@
#include <unistd.h> #include <unistd.h>
_READ_WRITE_RETURN_TYPE _READ_WRITE_RETURN_TYPE
write (fd, buf, cnt) _DEFUN (write, (fd, buf, cnt),
int fd; int fd _AND
const void *buf; const void *buf _AND
size_t cnt; size_t cnt)
{ {
#ifdef REENTRANT_SYSCALLS_PROVIDED #ifdef REENTRANT_SYSCALLS_PROVIDED
return _write_r (_REENT, fd, buf, cnt); return _write_r (_REENT, fd, buf, cnt);