From c1422e5b7cdb4400f934c91bcefa3a1a96d789fb Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 9 Oct 1999 21:56:43 +0000 Subject: Update. Patch by khendricks@ivey.uwo.ca [libc/1382]. --- io/sys/poll.h | 10 ++++---- io/sys/stat.h | 77 +++++++++++++++++++++++++++++--------------------------- io/sys/statfs.h | 17 +++++++------ io/sys/statvfs.h | 14 +++++------ 4 files changed, 61 insertions(+), 57 deletions(-) (limited to 'io/sys') diff --git a/io/sys/poll.h b/io/sys/poll.h index 9cb60e72ea..ac9c634e9d 100644 --- a/io/sys/poll.h +++ b/io/sys/poll.h @@ -1,5 +1,5 @@ /* Compatibility definitions for System V `poll' interface. - Copyright (C) 1994, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1994, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -41,10 +41,10 @@ struct pollfd an event to occur; if TIMEOUT is -1, block until an event occurs. Returns the number of file descriptors with events, zero if timed out, or -1 for errors. */ -extern int __poll __P ((struct pollfd *__fds, unsigned long int __nfds, - int __timeout)); -extern int poll __P ((struct pollfd *__fds, unsigned long int __nfds, - int __timeout)); +extern int __poll (struct pollfd *__fds, unsigned long int __nfds, + int __timeout) __THROW; +extern int poll (struct pollfd *__fds, unsigned long int __nfds, int __timeout) + __THROW; __END_DECLS diff --git a/io/sys/stat.h b/io/sys/stat.h index 97f789715d..d6175dd0cd 100644 --- a/io/sys/stat.h +++ b/io/sys/stat.h @@ -187,79 +187,81 @@ __BEGIN_DECLS #ifndef __USE_FILE_OFFSET64 /* Get file attributes for FILE and put them in BUF. */ -extern int stat __P ((__const char *__file, struct stat *__buf)); +extern int stat (__const char *__file, struct stat *__buf) __THROW; /* Get file attributes for the file, device, pipe, or socket that file descriptor FD is open on and put them in BUF. */ -extern int fstat __P ((int __fd, struct stat *__buf)); +extern int fstat (int __fd, struct stat *__buf) __THROW; #else # ifdef __REDIRECT -extern int __REDIRECT (stat, __P ((__const char *__file, struct stat *__buf)), +extern int __REDIRECT (stat, + (__const char *__file, struct stat *__buf) __THROW, stat64); -extern int __REDIRECT (fstat, __P ((int __fd, struct stat *__buf)), fstat64); +extern int __REDIRECT (fstat, (int __fd, struct stat *__buf) __THROW, fstat64); # else # define stat stat64 # define fstat fstat64 # endif #endif #ifdef __USE_LARGEFILE64 -extern int stat64 __P ((__const char *__file, struct stat64 *__buf)); -extern int fstat64 __P ((int __fd, struct stat64 *__buf)); +extern int stat64 (__const char *__file, struct stat64 *__buf) __THROW; +extern int fstat64 (int __fd, struct stat64 *__buf) __THROW; #endif #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED # ifndef __USE_FILE_OFFSET64 /* Get file attributes about FILE and put them in BUF. If FILE is a symbolic link, do not follow it. */ -extern int lstat __P ((__const char *__file, struct stat *__buf)); +extern int lstat (__const char *__file, struct stat *__buf) __THROW; # else # ifdef __REDIRECT -extern int __REDIRECT (lstat, __P ((__const char *__file, struct stat *__buf)), +extern int __REDIRECT (lstat, + (__const char *__file, struct stat *__buf) __THROW, lstat64); # else # define lstat lstat64 # endif # endif # ifdef __USE_LARGEFILE64 -extern int lstat64 __P ((__const char *__file, struct stat64 *__buf)); +extern int lstat64 (__const char *__file, struct stat64 *__buf) __THROW; # endif #endif /* Set file access permissions for FILE to MODE. This takes an `int' MODE argument because that is what `mode_t's get widened to. */ -extern int chmod __P ((__const char *__file, __mode_t __mode)); +extern int chmod (__const char *__file, __mode_t __mode) __THROW; /* Set file access permissions of the file FD is open on to MODE. */ #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED -extern int fchmod __P ((int __fd, __mode_t __mode)); +extern int fchmod (int __fd, __mode_t __mode) __THROW; #endif /* Set the file creation mask of the current process to MASK, and return the old creation mask. */ -extern __mode_t umask __P ((__mode_t __mask)); +extern __mode_t umask (__mode_t __mask) __THROW; #ifdef __USE_GNU /* Get the current `umask' value without changing it. This function is only available under the GNU Hurd. */ -extern __mode_t getumask __P ((void)); +extern __mode_t getumask (void) __THROW; #endif /* Create a new directory named PATH, with permission bits MODE. */ -extern int mkdir __P ((__const char *__path, __mode_t __mode)); +extern int mkdir (__const char *__path, __mode_t __mode) __THROW; /* Create a device file named PATH, with permission and special bits MODE and device number DEV (which can be constructed from major and minor device numbers with the `makedev' macro above). */ #if defined __USE_MISC || defined __USE_BSD || defined __USE_XOPEN_EXTENDED -extern int mknod __P ((__const char *__path, - __mode_t __mode, __dev_t __dev)); +extern int mknod (__const char *__path, __mode_t __mode, __dev_t __dev) + __THROW; #endif /* Create a new FIFO named PATH, with permission bits MODE. */ -extern int mkfifo __P ((__const char *__path, __mode_t __mode)); +extern int mkfifo (__const char *__path, __mode_t __mode) __THROW; /* To allow the `struct stat' structure and the file type `mode_t' bits to vary without changing shared library major version number, @@ -285,20 +287,21 @@ extern int mkfifo __P ((__const char *__path, __mode_t __mode)); /* Wrappers for stat and mknod system calls. */ #ifndef __USE_FILE_OFFSET64 -extern int __fxstat __P ((int __ver, int __fildes, - struct stat *__stat_buf)); -extern int __xstat __P ((int __ver, __const char *__filename, - struct stat *__stat_buf)); -extern int __lxstat __P ((int __ver, __const char *__filename, - struct stat *__stat_buf)); +extern int __fxstat (int __ver, int __fildes, struct stat *__stat_buf) __THROW; +extern int __xstat (int __ver, __const char *__filename, + struct stat *__stat_buf) __THROW; +extern int __lxstat (int __ver, __const char *__filename, + struct stat *__stat_buf) __THROW; #else # ifdef __REDIRECT -extern int __REDIRECT (__fxstat, __P ((int __ver, int __fildes, - struct stat *__stat_buf)), __fxstat64); -extern int __REDIRECT (__xstat, __P ((int __ver, __const char *__filename, - struct stat *__stat_buf)), __xstat64); -extern int __REDIRECT (__lxstat, __P ((int __ver, __const char *__filename, - struct stat *__stat_buf)), __lxstat64); +extern int __REDIRECT (__fxstat, (int __ver, int __fildes, + struct stat *__stat_buf) __THROW, + __fxstat64); +extern int __REDIRECT (__xstat, (int __ver, __const char *__filename, + struct stat *__stat_buf) __THROW, __xstat64); +extern int __REDIRECT (__lxstat, (int __ver, __const char *__filename, + struct stat *__stat_buf) __THROW, + __lxstat64); # else # define __fxstat __fxstat64 @@ -308,15 +311,15 @@ extern int __REDIRECT (__lxstat, __P ((int __ver, __const char *__filename, #endif #ifdef __USE_LARGEFILE64 -extern int __fxstat64 __P ((int __ver, int __fildes, - struct stat64 *__stat_buf)); -extern int __xstat64 __P ((int __ver, __const char *__filename, - struct stat64 *__stat_buf)); -extern int __lxstat64 __P ((int __ver, __const char *__filename, - struct stat64 *__stat_buf)); +extern int __fxstat64 (int __ver, int __fildes, struct stat64 *__stat_buf) + __THROW; +extern int __xstat64 (int __ver, __const char *__filename, + struct stat64 *__stat_buf) __THROW; +extern int __lxstat64 (int __ver, __const char *__filename, + struct stat64 *__stat_buf) __THROW; #endif -extern int __xmknod __P ((int __ver, __const char *__path, - __mode_t __mode, __dev_t *__dev)); +extern int __xmknod (int __ver, __const char *__path, __mode_t __mode, + __dev_t *__dev) __THROW; #if defined __GNUC__ && __GNUC__ >= 2 /* Inlined versions of the real stat and mknod functions. */ diff --git a/io/sys/statfs.h b/io/sys/statfs.h index be93bc9239..f5258f8d83 100644 --- a/io/sys/statfs.h +++ b/io/sys/statfs.h @@ -1,5 +1,5 @@ /* Definitions for getting information about a filesystem. - Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -29,33 +29,34 @@ __BEGIN_DECLS /* Return information about the filesystem on which FILE resides. */ #ifndef __USE_FILE_OFFSET64 -extern int statfs __P ((__const char *__file, struct statfs *__buf)); +extern int statfs (__const char *__file, struct statfs *__buf) __THROW; #else # ifdef __REDIRECT -extern int __REDIRECT (statfs, __P ((__const char *__file, - struct statfs *__buf)), statfs64); +extern int __REDIRECT (statfs, + (__const char *__file, struct statfs *__buf) __THROW, + statfs64); # else # define statfs statfs64 # endif #endif #ifdef __USE_LARGEFILE64 -extern int statfs64 __P ((__const char *__file, struct statfs64 *__buf)); +extern int statfs64 (__const char *__file, struct statfs64 *__buf) __THROW; #endif /* Return information about the filesystem containing the file FILDES refers to. */ #ifndef __USE_FILE_OFFSET64 -extern int fstatfs __P ((int __fildes, struct statfs *__buf)); +extern int fstatfs (int __fildes, struct statfs *__buf) __THROW; #else # ifdef __REDIRECT -extern int __REDIRECT (fstatfs, __P ((int __fildes, struct statfs *__buf)), +extern int __REDIRECT (fstatfs, (int __fildes, struct statfs *__buf) __THROW, fstatfs64); # else # define fstatfs fstatfs64 # endif #endif #ifdef __USE_LARGEFILE64 -extern int fstatfs64 __P ((int __fildes, struct statfs64 *__buf)); +extern int fstatfs64 (int __fildes, struct statfs64 *__buf) __THROW; #endif __END_DECLS diff --git a/io/sys/statvfs.h b/io/sys/statvfs.h index 31d60df28b..6f497cc4a7 100644 --- a/io/sys/statvfs.h +++ b/io/sys/statvfs.h @@ -1,5 +1,5 @@ /* Definitions for getting information about a filesystem. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -29,34 +29,34 @@ __BEGIN_DECLS /* Return information about the filesystem on which FILE resides. */ #ifndef __USE_FILE_OFFSET64 -extern int statvfs __P ((__const char *__file, struct statvfs *__buf)); +extern int statvfs (__const char *__file, struct statvfs *__buf) __THROW; #else # ifdef __REDIRECT extern int __REDIRECT (statvfs, - __P ((__const char *__file, struct statvfs *__buf)), + (__const char *__file, struct statvfs *__buf) __THROW, statvfs64); # else # define statvfs statvfs64 # endif #endif #ifdef __USE_LARGEFILE64 -extern int statvfs64 __P ((__const char *__file, struct statvfs64 *__buf)); +extern int statvfs64 (__const char *__file, struct statvfs64 *__buf) __THROW; #endif /* Return information about the filesystem containing the file FILDES refers to. */ #ifndef __USE_FILE_OFFSET64 -extern int fstatvfs __P ((int __fildes, struct statvfs *__buf)); +extern int fstatvfs (int __fildes, struct statvfs *__buf) __THROW; #else # ifdef __REDIRECT -extern int __REDIRECT (fstatvfs, __P ((int __fildes, struct statvfs *__buf)), +extern int __REDIRECT (fstatvfs, (int __fildes, struct statvfs *__buf) __THROW, fstatvfs64); # else # define fstatvfs fstatvfs64 # endif #endif #ifdef __USE_LARGEFILE64 -extern int fstatvfs64 __P ((int __fildes, struct statvfs64 *__buf)); +extern int fstatvfs64 (int __fildes, struct statvfs64 *__buf) __THROW; #endif __END_DECLS -- cgit v1.2.3