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]. --- misc/err.h | 34 +++++++++++++++++----------------- misc/fstab.h | 10 +++++----- misc/libgen.h | 4 ++-- misc/mntent.h | 24 ++++++++++++------------ misc/regexp.h | 8 ++++---- misc/search.h | 53 +++++++++++++++++++++++++---------------------------- misc/sgtty.h | 6 +++--- misc/sys/cdefs.h | 24 +++++++++--------------- misc/sys/file.h | 4 ++-- misc/sys/ioctl.h | 4 ++-- misc/sys/mman.h | 36 ++++++++++++++++++------------------ misc/sys/select.h | 21 ++++++++++----------- misc/sys/syslog.h | 14 +++++++------- misc/sys/uio.h | 10 +++++----- misc/sys/ustat.h | 4 ++-- misc/ttyent.h | 8 ++++---- 16 files changed, 127 insertions(+), 137 deletions(-) (limited to 'misc') diff --git a/misc/err.h b/misc/err.h index 6170006b85..e5d0e46403 100644 --- a/misc/err.h +++ b/misc/err.h @@ -1,5 +1,5 @@ /* 4.4BSD utility functions for error messages. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1995, 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 @@ -32,26 +32,26 @@ __BEGIN_DECLS /* Print "program: ", FORMAT, ": ", the standard error string for errno, and a newline, on stderr. */ -extern void warn __P ((__const char *__format, ...)) - __attribute__ ((__format__ (__printf__, 1, 2))); -extern void vwarn __P ((__const char *__format, __gnuc_va_list)) - __attribute__ ((__format__ (__printf__, 1, 0))); +extern void warn (__const char *__format, ...) + __THROW __attribute__ ((__format__ (__printf__, 1, 2))); +extern void vwarn (__const char *__format, __gnuc_va_list) + __THROW __attribute__ ((__format__ (__printf__, 1, 0))); /* Likewise, but without ": " and the standard error string. */ -extern void warnx __P ((__const char *__format, ...)) - __attribute__ ((__format__ (__printf__, 1, 2))); -extern void vwarnx __P ((__const char *__format, __gnuc_va_list)) - __attribute__ ((__format__ (__printf__, 1, 0))); +extern void warnx (__const char *__format, ...) + __THROW __attribute__ ((__format__ (__printf__, 1, 2))); +extern void vwarnx (__const char *__format, __gnuc_va_list) + __THROW __attribute__ ((__format__ (__printf__, 1, 0))); /* Likewise, and then exit with STATUS. */ -extern void err __P ((int __status, __const char *__format, ...)) - __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3))); -extern void verr __P ((int __status, __const char *__format, __gnuc_va_list)) - __attribute__ ((__noreturn__, __format__ (__printf__, 2, 0))); -extern void errx __P ((int __status, __const char *__format, ...)) - __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3))); -extern void verrx __P ((int __status, __const char *, __gnuc_va_list)) - __attribute__ ((__noreturn__, __format__ (__printf__, 2, 0))); +extern void err (int __status, __const char *__format, ...) + __THROW __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3))); +extern void verr (int __status, __const char *__format, __gnuc_va_list) + __THROW __attribute__ ((__noreturn__, __format__ (__printf__, 2, 0))); +extern void errx (int __status, __const char *__format, ...) + __THROW __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3))); +extern void verrx (int __status, __const char *, __gnuc_va_list) + __THROW __attribute__ ((__noreturn__, __format__ (__printf__, 2, 0))); __END_DECLS diff --git a/misc/fstab.h b/misc/fstab.h index 316a4f8b5d..24ecad7dbc 100644 --- a/misc/fstab.h +++ b/misc/fstab.h @@ -68,11 +68,11 @@ struct fstab __BEGIN_DECLS -extern struct fstab *getfsent __P ((void)); -extern struct fstab *getfsspec __P ((__const char *__name)); -extern struct fstab *getfsfile __P ((__const char *__name)); -extern int setfsent __P ((void)); -extern void endfsent __P ((void)); +extern struct fstab *getfsent (void) __THROW; +extern struct fstab *getfsspec (__const char *__name) __THROW; +extern struct fstab *getfsfile (__const char *__name) __THROW; +extern int setfsent (void) __THROW; +extern void endfsent (void) __THROW; __END_DECLS diff --git a/misc/libgen.h b/misc/libgen.h index b4ef9e5c77..948a9c381a 100644 --- a/misc/libgen.h +++ b/misc/libgen.h @@ -24,7 +24,7 @@ __BEGIN_DECLS /* Return directory part of PATH or "." if none is available. */ -extern char *dirname __P ((char *__path)); +extern char *dirname (char *__path) __THROW; /* Return final component of PATH. @@ -32,7 +32,7 @@ extern char *dirname __P ((char *__path)); modify its argument. Therefore we normally use the GNU version (in ) and only if this header is included make the XPG version available under the real name. */ -extern char *__xpg_basename __P ((char *__path)); +extern char *__xpg_basename (char *__path) __THROW; #define basename __xpg_basename __END_DECLS diff --git a/misc/mntent.h b/misc/mntent.h index 6acd532ba8..decda94440 100644 --- a/misc/mntent.h +++ b/misc/mntent.h @@ -1,5 +1,5 @@ /* Utilities for reading/writing fstab, mtab, etc. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1995, 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 @@ -64,33 +64,33 @@ struct mntent /* Prepare to begin reading and/or writing mount table entries from the beginning of FILE. MODE is as for `fopen'. */ -extern FILE *setmntent __P ((__const char *__file, __const char *__mode)); +extern FILE *setmntent (__const char *__file, __const char *__mode) __THROW; /* Read one mount table entry from STREAM. Returns a pointer to storage reused on the next call, or null for EOF or error (use feof/ferror to check). */ -extern struct mntent *getmntent __P ((FILE *__stream)); +extern struct mntent *getmntent (FILE *__stream) __THROW; #ifdef __USE_MISC /* Reentrant version of the above function. */ -extern struct mntent *getmntent_r __P ((FILE *__restrict __stream, - struct mntent *__restrict __result, - char *__restrict __buffer, - int __bufsize)); +extern struct mntent *getmntent_r (FILE *__restrict __stream, + struct mntent *__restrict __result, + char *__restrict __buffer, + int __bufsize) __THROW; #endif /* Write the mount table entry described by MNT to STREAM. Return zero on success, nonzero on failure. */ -extern int addmntent __P ((FILE *__restrict __stream, - __const struct mntent *__restrict __mnt)); +extern int addmntent (FILE *__restrict __stream, + __const struct mntent *__restrict __mnt) __THROW; /* Close a stream opened with `setmntent'. */ -extern int endmntent __P ((FILE *__stream)); +extern int endmntent (FILE *__stream) __THROW; /* Search MNT->mnt_opts for an option matching OPT. Returns the address of the substring, or null if none found. */ -extern char *hasmntopt __P ((__const struct mntent *__mnt, - __const char *__opt)); +extern char *hasmntopt (__const struct mntent *__mnt, + __const char *__opt) __THROW; __END_DECLS diff --git a/misc/regexp.h b/misc/regexp.h index fc60d3ca51..a8659aede6 100644 --- a/misc/regexp.h +++ b/misc/regexp.h @@ -206,14 +206,14 @@ compile (char *__restrict instring, char *__restrict expbuf, found in the buffer starting at EXPBUF. `loc1' will return the first character matched and `loc2' points to the next unmatched character. */ -extern int step __P ((__const char *__restrict __string, - __const char *__restrict __expbuf)); +extern int step (__const char *__restrict __string, + __const char *__restrict __expbuf) __THROW; /* Match the beginning of STRING with the compiled regular expression in EXPBUF. If the match is successful `loc2' will contain the position of the first unmatched character. */ -extern int advance __P ((__const char *__restrict __string, - __const char *__restrict __expbuf)); +extern int advance (__const char *__restrict __string, + __const char *__restrict __expbuf) __THROW; __END_DECLS diff --git a/misc/search.h b/misc/search.h index 8fb2539cd1..ebc525a7a3 100644 --- a/misc/search.h +++ b/misc/search.h @@ -42,17 +42,17 @@ struct qelem /* Insert ELEM into a doubly-linked list, after PREV. */ -extern void insque __P ((void *__elem, void *__prev)); +extern void insque (void *__elem, void *__prev) __THROW; /* Unlink ELEM from the doubly-linked list that it is in. */ -extern void remque __P ((void *__elem)); +extern void remque (void *__elem) __THROW; #endif /* For use with hsearch(3). */ #ifndef __COMPAR_FN_T # define __COMPAR_FN_T -typedef int (*__compar_fn_t) __PMT ((__const __ptr_t, __const __ptr_t)); +typedef int (*__compar_fn_t) (__const void *, __const void *); # ifdef __USE_GNU typedef __compar_fn_t comparison_fn_t; @@ -85,13 +85,13 @@ struct _ENTRY; ACTION is `FIND' return found entry or signal error by returning NULL. If ACTION is `ENTER' replace existing data (if any) with ITEM.data. */ -extern ENTRY *hsearch __P ((ENTRY __item, ACTION __action)); +extern ENTRY *hsearch (ENTRY __item, ACTION __action) __THROW; /* Create a new hashing table which will at most contain NEL elements. */ -extern int hcreate __P ((size_t __nel)); +extern int hcreate (size_t __nel) __THROW; /* Destroy current internal hashing table. */ -extern void hdestroy __P ((void)); +extern void hdestroy (void) __THROW; #ifdef __USE_GNU /* Data type for reentrant functions. */ @@ -104,10 +104,10 @@ struct hsearch_data /* Reentrant versions which can handle multiple hashing tables at the same time. */ -extern int hsearch_r __P ((ENTRY __item, ACTION __action, ENTRY **__retval, - struct hsearch_data *__htab)); -extern int hcreate_r __P ((size_t __nel, struct hsearch_data *__htab)); -extern void hdestroy_r __P ((struct hsearch_data *__htab)); +extern int hsearch_r (ENTRY __item, ACTION __action, ENTRY **__retval, + struct hsearch_data *__htab) __THROW; +extern int hcreate_r (size_t __nel, struct hsearch_data *__htab) __THROW; +extern void hdestroy_r (struct hsearch_data *__htab) __THROW; #endif @@ -127,50 +127,47 @@ VISIT; /* Search for an entry matching the given KEY in the tree pointed to by *ROOTP and insert a new element if not found. */ -extern void *tsearch __PMT ((__const void *__key, void **__rootp, - __compar_fn_t __compar)); +extern void *tsearch (__const void *__key, void **__rootp, + __compar_fn_t __compar); /* Search for an entry matching the given KEY in the tree pointed to by *ROOTP. If no matching entry is available return NULL. */ -extern void *tfind __PMT ((__const void *__key, void *__const *__rootp, - __compar_fn_t __compar)); +extern void *tfind (__const void *__key, void *__const *__rootp, + __compar_fn_t __compar); /* Remove the element matching KEY from the tree pointed to by *ROOTP. */ -extern void *tdelete __PMT ((__const void *__key, void **__rootp, - __compar_fn_t __compar)); +extern void *tdelete (__const void *__key, void **__rootp, + __compar_fn_t __compar); #ifndef __ACTION_FN_T # define __ACTION_FN_T -typedef void (*__action_fn_t) __PMT ((__const void *__nodep, - VISIT __value, - int __level)); +typedef void (*__action_fn_t) (__const void *__nodep, VISIT __value, + int __level); #endif /* Walk through the whole tree and call the ACTION callback for every node or leaf. */ -extern void twalk __PMT ((__const void *__root, __action_fn_t __action)); +extern void twalk (__const void *__root, __action_fn_t __action); #ifdef __USE_GNU /* Callback type for function to free a tree node. If the keys are atomic data this function should do nothing. */ -typedef void (*__free_fn_t) __PMT ((void *__nodep)); +typedef void (*__free_fn_t) (void *__nodep); /* Destroy the whole tree, call FREEFCT for each node or leaf. */ -extern void tdestroy __PMT ((void *__root, __free_fn_t __freefct)); +extern void tdestroy (void *__root, __free_fn_t __freefct); #endif /* Perform linear search for KEY by comparing by COMPAR in an array [BASE,BASE+NMEMB*SIZE). */ -extern void *lfind __PMT ((__const void *__key, __const void *__base, - size_t *__nmemb, size_t __size, - __compar_fn_t __compar)); +extern void *lfind (__const void *__key, __const void *__base, + size_t *__nmemb, size_t __size, __compar_fn_t __compar); /* Perform linear search for KEY by comparing by COMPAR function in array [BASE,BASE+NMEMB*SIZE) and insert entry if not found. */ -extern void *lsearch __PMT ((__const void *__key, void *__base, - size_t *__nmemb, size_t __size, - __compar_fn_t __compar)); +extern void *lsearch (__const void *__key, void *__base, + size_t *__nmemb, size_t __size, __compar_fn_t __compar); __END_DECLS diff --git a/misc/sgtty.h b/misc/sgtty.h index 02bbb18665..6d1c5a88c2 100644 --- a/misc/sgtty.h +++ b/misc/sgtty.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1996, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1996, 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 @@ -30,10 +30,10 @@ struct sgttyb; __BEGIN_DECLS /* Fill in *PARAMS with terminal parameters associated with FD. */ -extern int gtty __P ((int __fd, struct sgttyb *__params)); +extern int gtty patch(int __fd, struct sgttyb *__params) __THROW; /* Set the terminal parameters associated with FD to *PARAMS. */ -extern int stty __P ((int __fd, __const struct sgttyb *__params)); +extern int stty (int __fd, __const struct sgttyb *__params) __THROW; __END_DECLS diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h index 6a8b870e13..84e24b0b62 100644 --- a/misc/sys/cdefs.h +++ b/misc/sys/cdefs.h @@ -43,8 +43,6 @@ functions. */ # define __PMT(args) args -# define __DOTS , ... - #else /* Not GCC. */ # define __inline /* No inline functions. */ @@ -53,22 +51,18 @@ # define __P(args) args # define __PMT(args) args -# define __const const -# define __signed signed -# define __volatile volatile -# define __DOTS , ... # else /* Not ANSI C or C++. */ # define __P(args) () /* No prototypes. */ # define __PMT(args) () -# define __const /* No ANSI C keywords. */ -# define __signed -# define __volatile -# define __DOTS # endif /* ANSI C or C++. */ +# define __const const +# define __signed signed +# define __volatile volatile + #endif /* GCC. */ /* For these things, GCC behaves the ANSI way normally, @@ -95,11 +89,11 @@ old programs may lose if they use the new keywords as identifiers), but those names are not available under -traditional. We define them to their __ versions, which are taken care of above. */ -#ifdef __USE_BSD -# define const __const -# define signed __signed -# define volatile __volatile -#endif +# ifdef __USE_BSD +# define const __const +# define signed __signed +# define volatile __volatile +# endif #endif /* __STDC__ */ diff --git a/misc/sys/file.h b/misc/sys/file.h index a2e7bf0ee6..faff35ddef 100644 --- a/misc/sys/file.h +++ b/misc/sys/file.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 96, 97, 98, 99 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 @@ -48,7 +48,7 @@ __BEGIN_DECLS /* Apply or remove an advisory lock, according to OPERATION, on the file FD refers to. */ -extern int flock __P ((int __fd, int __operation)); +extern int flock (int __fd, int __operation) __THROW; __END_DECLS diff --git a/misc/sys/ioctl.h b/misc/sys/ioctl.h index acb42f2b35..30a9155b58 100644 --- a/misc/sys/ioctl.h +++ b/misc/sys/ioctl.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 93, 94, 96, 98 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 94, 96, 98, 99 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 @@ -39,7 +39,7 @@ __BEGIN_DECLS /* Perform the I/O control operation specified by REQUEST on FD. One argument may follow; its presence and type depend on REQUEST. Return value depends on REQUEST. Usually -1 indicates error. */ -extern int ioctl __P ((int __fd, unsigned long int __request, ...)); +extern int ioctl (int __fd, unsigned long int __request, ...) __THROW; __END_DECLS diff --git a/misc/sys/mman.h b/misc/sys/mman.h index 92b4bf85a0..cddb451081 100644 --- a/misc/sys/mman.h +++ b/misc/sys/mman.h @@ -1,5 +1,5 @@ /* Definitions for BSD-style memory management. - Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1994, 95, 96, 97, 98, 99 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 @@ -28,7 +28,7 @@ #include /* Return value of `mmap' in case of an error. */ -#define MAP_FAILED ((__ptr_t) -1) +#define MAP_FAILED ((void *) -1) __BEGIN_DECLS /* Map addresses starting near ADDR and extending for LEN bytes. from @@ -41,60 +41,60 @@ __BEGIN_DECLS deallocates any previous mapping for the affected region. */ #ifndef __USE_FILE_OFFSET64 -extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off_t __offset)); +extern void *mmap (void *__addr, size_t __len, int __prot, + int __flags, int __fd, __off_t __offset) __THROW; #else -extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off_t __offset)) +extern void *mmap (void *__addr, size_t __len, int __prot, + int __flags, int __fd, __off_t __offset) __THROW __asm__ ("mmap64"); #endif #ifdef __USE_LARGEFILE64 -extern __ptr_t mmap64 __P ((__ptr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off64_t __offset)); +extern void *mmap64 (void *__addr, size_t __len, int __prot, + int __flags, int __fd, __off64_t __offset) __THROW; #endif /* Deallocate any mapping for the region starting at ADDR and extending LEN bytes. Returns 0 if successful, -1 for errors (and sets errno). */ -extern int munmap __P ((__ptr_t __addr, size_t __len)); +extern int munmap (void *__addr, size_t __len) __THROW; /* Change the memory protection of the region starting at ADDR and extending LEN bytes to PROT. Returns 0 if successful, -1 for errors (and sets errno). */ -extern int mprotect __P ((__ptr_t __addr, size_t __len, int __prot)); +extern int mprotect (void *__addr, size_t __len, int __prot) __THROW; /* Synchronize the region starting at ADDR and extending LEN bytes with the file it maps. Filesystem operations on a file being mapped are unpredictable before this is done. Flags are from the MS_* set. */ -extern int msync __P ((__ptr_t __addr, size_t __len, int __flags)); +extern int msync (void *__addr, size_t __len, int __flags) __THROW; #ifdef __USE_BSD /* Advise the system about particular usage patterns the program follows for the region starting at ADDR and extending LEN bytes. */ -extern int madvise __P ((__ptr_t __addr, size_t __len, int __advice)); +extern int madvise (void *__addr, size_t __len, int __advice) __THROW; #endif /* Guarantee all whole pages mapped by the range [ADDR,ADDR+LEN) to be memory resident. */ -extern int mlock __P ((__const __ptr_t __addr, size_t __len)); +extern int mlock (__const void *__addr, size_t __len) __THROW; /* Unlock whole pages previously mapped by the range [ADDR,ADDR+LEN). */ -extern int munlock __P ((__const __ptr_t __addr, size_t __len)); +extern int munlock (__const void *__addr, size_t __len) __THROW; /* Cause all currently mapped pages of the process to be memory resident until unlocked by a call to the `munlockall', until the process exits, or until the process calls `execve'. */ -extern int mlockall __P ((int __flags)); +extern int mlockall (int __flags) __THROW; /* All currently mapped pages of the process' address space become unlocked. */ -extern int munlockall __P ((void)); +extern int munlockall (void) __THROW; #ifdef __USE_MISC /* Remap pages mapped by the range [ADDR,ADDR+OLD_LEN) to new length NEW_LEN. If MAY_MOVE is MREMAP_MAYMOVE the returned address may differ from ADDR. */ -extern __ptr_t mremap __P ((__ptr_t __addr, size_t __old_len, - size_t __new_len, int __may_move)); +extern void *mremap (void *__addr, size_t __old_len, size_t __new_len, + int __may_move) __THROW; #endif __END_DECLS diff --git a/misc/sys/select.h b/misc/sys/select.h index 0972560b97..15130cbab3 100644 --- a/misc/sys/select.h +++ b/misc/sys/select.h @@ -1,5 +1,5 @@ /* `fd_set' type and related macros, and `select'/`pselect' declarations. - 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 @@ -71,12 +71,12 @@ typedef __fd_set fd_set; (if not NULL) for exceptional conditions. If TIMEOUT is not NULL, time out after waiting the interval specified therein. Returns the number of ready descriptors, or -1 for errors. */ -extern int __select __P ((int __nfds, __fd_set *__readfds, - __fd_set *__writefds, __fd_set *__exceptfds, - struct timeval *__timeout)); -extern int select __P ((int __nfds, __fd_set *__readfds, - __fd_set *__writefds, __fd_set *__exceptfds, - struct timeval *__timeout)); +extern int __select (int __nfds, __fd_set *__readfds, + __fd_set *__writefds, __fd_set *__exceptfds, + struct timeval *__timeout) __THROW; +extern int select (int __nfds, __fd_set *__readfds, + __fd_set *__writefds, __fd_set *__exceptfds, + struct timeval *__timeout) __THROW; #ifdef __USE_GNU /* XXX Once/if POSIX.1g gets official this prototype will be available @@ -84,10 +84,9 @@ extern int select __P ((int __nfds, __fd_set *__readfds, /* Same as above only that the TIMEOUT value is given with higher resolution and a sigmask which is been set temporarily. This version should be used. */ -extern int pselect __P ((int __nfds, __fd_set *__readfds, - __fd_set *__writefds, __fd_set *__exceptfds, - const struct timespec *__timeout, - const __sigset_t *__sigmask)); +extern int pselect (int __nfds, __fd_set *__readfds, __fd_set *__writefds, + __fd_set *__exceptfds, const struct timespec *__timeout, + const __sigset_t *__sigmask) __THROW; #endif __END_DECLS diff --git a/misc/sys/syslog.h b/misc/sys/syslog.h index 143f946bd4..a2b720909a 100644 --- a/misc/sys/syslog.h +++ b/misc/sys/syslog.h @@ -169,22 +169,22 @@ CODE facilitynames[] = __BEGIN_DECLS /* Close desriptor used to write to system logger. */ -extern void closelog __P ((void)); +extern void closelog (void) __THROW; /* Open connection to system logger. */ -extern void openlog __P ((__const char *__ident, int __option, - int __facility)); +extern void openlog (__const char *__ident, int __option, int __facility) + __THROW; /* Set the log mask level. */ -extern int setlogmask __P ((int __mask)); +extern int setlogmask (int __mask) __THROW; /* Generate a log message using FMT string and option arguments. */ -extern void syslog __P ((int __pri, __const char *__fmt, ...)); +extern void syslog (int __pri, __const char *__fmt, ...) __THROW; #ifdef __USE_BSD /* Generate a log message using FMT and using arguments pointed to by AP. */ -extern void vsyslog __P ((int __pri, __const char *__fmt, - __gnuc_va_list __ap)); +extern void vsyslog (int __pri, __const char *__fmt, __gnuc_va_list __ap) + __THROW; #endif __END_DECLS diff --git a/misc/sys/uio.h b/misc/sys/uio.h index 0be33e9b45..f833a52ec8 100644 --- a/misc/sys/uio.h +++ b/misc/sys/uio.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 96, 97, 98, 99 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 @@ -34,16 +34,16 @@ __BEGIN_DECLS The buffers are filled in the order specified. Operates just like `read' (see ) except that data are put in VECTOR instead of a contiguous buffer. */ -extern ssize_t readv __P ((int __fd, __const struct iovec *__vector, - int __count)); +extern ssize_t readv (int __fd, __const struct iovec *__vector, int __count) + __THROW; /* Write data pointed by the buffers described by VECTOR, which is a vector of COUNT `struct iovec's, to file descriptor FD. The data is written in the order specified. Operates just like `write' (see ) except that the data are taken from VECTOR instead of a contiguous buffer. */ -extern ssize_t writev __P ((int __fd, __const struct iovec *__vector, - int __count)); +extern ssize_t writev (int __fd, __const struct iovec *__vector, int __count) + __THROW; __END_DECLS diff --git a/misc/sys/ustat.h b/misc/sys/ustat.h index 355f28ddd9..58862ffb03 100644 --- a/misc/sys/ustat.h +++ b/misc/sys/ustat.h @@ -1,5 +1,5 @@ /* Header describing obsolete `ustat' interface. - Copyright (C) 1996, 1998 Free Software Foundation, Inc. + Copyright (C) 1996, 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 @@ -31,7 +31,7 @@ __BEGIN_DECLS -extern int ustat __P ((__dev_t __dev, struct ustat *__ubuf)); +extern int ustat (__dev_t __dev, struct ustat *__ubuf) __THROW; __END_DECLS diff --git a/misc/ttyent.h b/misc/ttyent.h index 9958d88886..0b221bccfa 100644 --- a/misc/ttyent.h +++ b/misc/ttyent.h @@ -55,10 +55,10 @@ struct ttyent { __BEGIN_DECLS -extern struct ttyent *getttyent __P ((void)); -extern struct ttyent *getttynam __P ((__const char *__tty)); -extern int setttyent __P ((void)); -extern int endttyent __P ((void)); +extern struct ttyent *getttyent (void) __THROW; +extern struct ttyent *getttynam (__const char *__tty) __THROW; +extern int setttyent (void) __THROW; +extern int endttyent (void) __THROW; __END_DECLS -- cgit v1.2.3