diff options
Diffstat (limited to 'include/sys')
-rw-r--r-- | include/sys/cdefs.h | 4 | ||||
-rw-r--r-- | include/sys/ipc.h | 2 | ||||
-rw-r--r-- | include/sys/mman.h | 12 | ||||
-rw-r--r-- | include/sys/mount.h | 10 | ||||
-rw-r--r-- | include/sys/msg.h | 2 | ||||
-rw-r--r-- | include/sys/poll.h | 4 | ||||
-rw-r--r-- | include/sys/resource.h | 6 | ||||
-rw-r--r-- | include/sys/sem.h | 2 | ||||
-rw-r--r-- | include/sys/shm.h | 4 | ||||
-rw-r--r-- | include/sys/socket.h | 12 | ||||
-rw-r--r-- | include/sys/stat.h | 42 | ||||
-rw-r--r-- | include/sys/statfs.h | 6 | ||||
-rw-r--r-- | include/sys/statvfs.h | 6 | ||||
-rw-r--r-- | include/sys/swap.h | 4 | ||||
-rw-r--r-- | include/sys/syslog.h | 6 | ||||
-rw-r--r-- | include/sys/time.h | 18 | ||||
-rw-r--r-- | include/sys/uio.h | 4 | ||||
-rw-r--r-- | include/sys/wait.h | 2 | ||||
-rw-r--r-- | include/sys/xattr.h | 26 |
19 files changed, 84 insertions, 88 deletions
diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h index 1ec0b97be..6f81b6a7c 100644 --- a/include/sys/cdefs.h +++ b/include/sys/cdefs.h @@ -62,10 +62,6 @@ # define __THROW # define __NTH(fct) fct -# define __const const -# define __signed signed -# define __volatile volatile - #endif /* GCC. */ /* These two macros are not used in glibc anymore. They are kept here diff --git a/include/sys/ipc.h b/include/sys/ipc.h index adf4b4c3c..02aab5255 100644 --- a/include/sys/ipc.h +++ b/include/sys/ipc.h @@ -50,7 +50,7 @@ typedef __key_t key_t; __BEGIN_DECLS /* Generates key for System V style IPC. */ -extern key_t ftok (__const char *__pathname, int __proj_id) __THROW; +extern key_t ftok (const char *__pathname, int __proj_id) __THROW; __END_DECLS diff --git a/include/sys/mman.h b/include/sys/mman.h index fe0231fc3..71d553af4 100644 --- a/include/sys/mman.h +++ b/include/sys/mman.h @@ -114,10 +114,10 @@ extern int posix_madvise (void *__addr, size_t __len, int __advice) __THROW; /* Guarantee all whole pages mapped by the range [ADDR,ADDR+LEN) to be memory resident. */ -extern int mlock (__const void *__addr, size_t __len) __THROW; +extern int mlock (const void *__addr, size_t __len) __THROW; /* Unlock whole pages previously mapped by the range [ADDR,ADDR+LEN). */ -extern int munlock (__const void *__addr, size_t __len) __THROW; +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, @@ -132,8 +132,8 @@ extern int munlockall (void) __THROW; /* On no-mmu systems, memory cannot be swapped out, so * these functions will always succeed. */ -static __inline__ int mlock (__const void *__addr, size_t __len) { return 0; } -static __inline__ int munlock (__const void *__addr, size_t __len) { return 0; } +static __inline__ int mlock (const void *__addr, size_t __len) { return 0; } +static __inline__ int munlock (const void *__addr, size_t __len) { return 0; } static __inline__ int mlockall (int __flags) { return 0; } static __inline__ int munlockall (void) { return 0; } #endif @@ -169,10 +169,10 @@ extern int remap_file_pages (void *__start, size_t __size, int __prot, /* Open shared memory segment. */ -extern int shm_open (__const char *__name, int __oflag, mode_t __mode); +extern int shm_open (const char *__name, int __oflag, mode_t __mode); /* Remove shared memory segment. */ -extern int shm_unlink (__const char *__name); +extern int shm_unlink (const char *__name); __END_DECLS diff --git a/include/sys/mount.h b/include/sys/mount.h index 440af139a..fbd61fdbd 100644 --- a/include/sys/mount.h +++ b/include/sys/mount.h @@ -107,16 +107,16 @@ enum __BEGIN_DECLS /* Mount a filesystem. */ -extern int mount (__const char *__special_file, __const char *__dir, - __const char *__fstype, unsigned long int __rwflag, - __const void *__data) __THROW; +extern int mount (const char *__special_file, const char *__dir, + const char *__fstype, unsigned long int __rwflag, + const void *__data) __THROW; /* Unmount a filesystem. */ -extern int umount (__const char *__special_file) __THROW; +extern int umount (const char *__special_file) __THROW; #ifdef __UCLIBC_LINUX_SPECIFIC__ /* Unmount a filesystem. Force unmounting if FLAGS is set to MNT_FORCE. */ -extern int umount2 (__const char *__special_file, int __flags) __THROW; +extern int umount2 (const char *__special_file, int __flags) __THROW; libc_hidden_proto(umount2) #endif diff --git a/include/sys/msg.h b/include/sys/msg.h index e53990054..b27e972ae 100644 --- a/include/sys/msg.h +++ b/include/sys/msg.h @@ -76,7 +76,7 @@ extern ssize_t msgrcv (int __msqid, void *__msgp, size_t __msgsz, This function is a cancellation point and therefore not marked with __THROW. */ -extern int msgsnd (int __msqid, __const void *__msgp, size_t __msgsz, +extern int msgsnd (int __msqid, const void *__msgp, size_t __msgsz, int __msgflg); __END_DECLS diff --git a/include/sys/poll.h b/include/sys/poll.h index 2130ce688..029a9badd 100644 --- a/include/sys/poll.h +++ b/include/sys/poll.h @@ -65,8 +65,8 @@ libc_hidden_proto(poll) This function is a cancellation point and therefore not marked with __THROW. */ extern int ppoll (struct pollfd *__fds, nfds_t __nfds, - __const struct timespec *__timeout, - __const __sigset_t *__ss); + const struct timespec *__timeout, + const __sigset_t *__ss); #endif __END_DECLS diff --git a/include/sys/resource.h b/include/sys/resource.h index 3356de5a8..17167ed99 100644 --- a/include/sys/resource.h +++ b/include/sys/resource.h @@ -68,12 +68,12 @@ extern int getrlimit64 (__rlimit_resource_t __resource, Return 0 if successful, -1 if not (and sets errno). */ #ifndef __USE_FILE_OFFSET64 extern int setrlimit (__rlimit_resource_t __resource, - __const struct rlimit *__rlimits) __THROW; + const struct rlimit *__rlimits) __THROW; libc_hidden_proto(setrlimit) #else # ifdef __REDIRECT_NTH extern int __REDIRECT_NTH (setrlimit, (__rlimit_resource_t __resource, - __const struct rlimit *__rlimits), + const struct rlimit *__rlimits), setrlimit64); # else # define setrlimit setrlimit64 @@ -81,7 +81,7 @@ extern int __REDIRECT_NTH (setrlimit, (__rlimit_resource_t __resource, #endif #ifdef __USE_LARGEFILE64 extern int setrlimit64 (__rlimit_resource_t __resource, - __const struct rlimit64 *__rlimits) __THROW; + const struct rlimit64 *__rlimits) __THROW; #endif /* Return resource usage information on process indicated by WHO diff --git a/include/sys/sem.h b/include/sys/sem.h index 9b945ba4e..84168d834 100644 --- a/include/sys/sem.h +++ b/include/sys/sem.h @@ -60,7 +60,7 @@ extern int semop (int __semid, struct sembuf *__sops, size_t __nsops) __THROW; #ifdef __USE_GNU /* Operate on semaphore with timeout. */ extern int semtimedop (int __semid, struct sembuf *__sops, size_t __nsops, - __const struct timespec *__timeout) __THROW; + const struct timespec *__timeout) __THROW; #endif __END_DECLS diff --git a/include/sys/shm.h b/include/sys/shm.h index fc9a99d37..8f04adeb4 100644 --- a/include/sys/shm.h +++ b/include/sys/shm.h @@ -53,11 +53,11 @@ extern int shmctl (int __shmid, int __cmd, struct shmid_ds *__buf) __THROW; extern int shmget (key_t __key, size_t __size, int __shmflg) __THROW; /* Attach shared memory segment. */ -extern void *shmat (int __shmid, __const void *__shmaddr, int __shmflg) +extern void *shmat (int __shmid, const void *__shmaddr, int __shmflg) __THROW; /* Detach shared memory segment. */ -extern int shmdt (__const void *__shmaddr) __THROW; +extern int shmdt (const void *__shmaddr) __THROW; __END_DECLS diff --git a/include/sys/socket.h b/include/sys/socket.h index 97f4b0635..8642312aa 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -68,7 +68,7 @@ enum old-style declaration, too. */ #if defined __cplusplus || !__GNUC_PREREQ (2, 7) || !defined __USE_GNU # define __SOCKADDR_ARG struct sockaddr *__restrict -# define __CONST_SOCKADDR_ARG __const struct sockaddr * +# define __CONST_SOCKADDR_ARG const struct sockaddr * #else /* Add more `struct sockaddr_AF' types here as necessary. These are all the ones I found on NetBSD and Linux. */ @@ -91,7 +91,7 @@ enum typedef union { __SOCKADDR_ALLTYPES } __SOCKADDR_ARG __attribute__ ((__transparent_union__)); # undef __SOCKADDR_ONETYPE -# define __SOCKADDR_ONETYPE(type) __const struct type *__restrict __##type##__; +# define __SOCKADDR_ONETYPE(type) const struct type *__restrict __##type##__; typedef union { __SOCKADDR_ALLTYPES } __CONST_SOCKADDR_ARG __attribute__ ((__transparent_union__)); # undef __SOCKADDR_ONETYPE @@ -141,7 +141,7 @@ extern int getpeername (int __fd, __SOCKADDR_ARG __addr, This function is a cancellation point and therefore not marked with __THROW. */ -extern ssize_t send (int __fd, __const void *__buf, size_t __n, int __flags); +extern ssize_t send (int __fd, const void *__buf, size_t __n, int __flags); libc_hidden_proto(send) /* Read N bytes into BUF from socket FD. @@ -157,7 +157,7 @@ libc_hidden_proto(recv) This function is a cancellation point and therefore not marked with __THROW. */ -extern ssize_t sendto (int __fd, __const void *__buf, size_t __n, +extern ssize_t sendto (int __fd, const void *__buf, size_t __n, int __flags, __CONST_SOCKADDR_ARG __addr, socklen_t __addr_len); #ifdef _LIBC @@ -186,7 +186,7 @@ libc_hidden_proto(recvfrom) This function is a cancellation point and therefore not marked with __THROW. */ -extern ssize_t sendmsg (int __fd, __const struct msghdr *__message, +extern ssize_t sendmsg (int __fd, const struct msghdr *__message, int __flags); libc_hidden_proto(sendmsg) @@ -210,7 +210,7 @@ extern int getsockopt (int __fd, int __level, int __optname, to *OPTVAL (which is OPTLEN bytes long). Returns 0 on success, -1 for errors. */ extern int setsockopt (int __fd, int __level, int __optname, - __const void *__optval, socklen_t __optlen) __THROW; + const void *__optval, socklen_t __optlen) __THROW; libc_hidden_proto(setsockopt) diff --git a/include/sys/stat.h b/include/sys/stat.h index 18d087d4b..bff90cb6d 100644 --- a/include/sys/stat.h +++ b/include/sys/stat.h @@ -205,7 +205,7 @@ __BEGIN_DECLS #ifndef __USE_FILE_OFFSET64 /* Get file attributes for FILE and put them in BUF. */ -extern int stat (__const char *__restrict __file, +extern int stat (const char *__restrict __file, struct stat *__restrict __buf) __THROW __nonnull ((1, 2)); libc_hidden_proto(stat) @@ -215,7 +215,7 @@ extern int fstat (int __fd, struct stat *__buf) __THROW __nonnull ((2)); libc_hidden_proto(fstat) #else # ifdef __REDIRECT_NTH -extern int __REDIRECT_NTH (stat, (__const char *__restrict __file, +extern int __REDIRECT_NTH (stat, (const char *__restrict __file, struct stat *__restrict __buf), stat64) __nonnull ((1, 2)); extern int __REDIRECT_NTH (fstat, (int __fd, struct stat *__buf), fstat64) @@ -226,7 +226,7 @@ extern int __REDIRECT_NTH (fstat, (int __fd, struct stat *__buf), fstat64) # endif #endif #ifdef __USE_LARGEFILE64 -extern int stat64 (__const char *__restrict __file, +extern int stat64 (const char *__restrict __file, struct stat64 *__restrict __buf) __THROW __nonnull ((1, 2)); extern int fstat64 (int __fd, struct stat64 *__buf) __THROW __nonnull ((2)); libc_hidden_proto(stat64) @@ -238,12 +238,12 @@ libc_hidden_proto(fstat64) Relative path names are interpreted relative to FD unless FD is AT_FDCWD. */ # ifndef __USE_FILE_OFFSET64 -extern int fstatat (int __fd, __const char *__restrict __file, +extern int fstatat (int __fd, const char *__restrict __file, struct stat *__restrict __buf, int __flag) __THROW __nonnull ((2, 3)); # else # ifdef __REDIRECT_NTH -extern int __REDIRECT_NTH (fstatat, (int __fd, __const char *__restrict __file, +extern int __REDIRECT_NTH (fstatat, (int __fd, const char *__restrict __file, struct stat *__restrict __buf, int __flag), fstatat64) __nonnull ((2, 3)); @@ -253,7 +253,7 @@ extern int __REDIRECT_NTH (fstatat, (int __fd, __const char *__restrict __file, # endif # ifdef __USE_LARGEFILE64 -extern int fstatat64 (int __fd, __const char *__restrict __file, +extern int fstatat64 (int __fd, const char *__restrict __file, struct stat64 *__restrict __buf, int __flag) __THROW __nonnull ((2, 3)); # endif @@ -263,13 +263,13 @@ extern int fstatat64 (int __fd, __const char *__restrict __file, # 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 (__const char *__restrict __file, +extern int lstat (const char *__restrict __file, struct stat *__restrict __buf) __THROW __nonnull ((1, 2)); libc_hidden_proto(lstat) # else # ifdef __REDIRECT_NTH extern int __REDIRECT_NTH (lstat, - (__const char *__restrict __file, + (const char *__restrict __file, struct stat *__restrict __buf), lstat64) __nonnull ((1, 2)); # else @@ -277,7 +277,7 @@ extern int __REDIRECT_NTH (lstat, # endif # endif # ifdef __USE_LARGEFILE64 -extern int lstat64 (__const char *__restrict __file, +extern int lstat64 (const char *__restrict __file, struct stat64 *__restrict __buf) __THROW __nonnull ((1, 2)); libc_hidden_proto(lstat64) @@ -286,7 +286,7 @@ libc_hidden_proto(lstat64) /* Set file access permissions for FILE to MODE. If FILE is a symbolic link, this affects its target instead. */ -extern int chmod (__const char *__file, __mode_t __mode) +extern int chmod (const char *__file, __mode_t __mode) __THROW __nonnull ((1)); libc_hidden_proto(chmod) @@ -294,7 +294,7 @@ libc_hidden_proto(chmod) /* Set file access permissions for FILE to MODE. If FILE is a symbolic link, this affects the link itself rather than its target. */ -extern int lchmod (__const char *__file, __mode_t __mode) +extern int lchmod (const char *__file, __mode_t __mode) __THROW __nonnull ((1)); #endif @@ -306,7 +306,7 @@ extern int fchmod (int __fd, __mode_t __mode) __THROW; #ifdef __USE_ATFILE /* Set file access permissions of FILE relative to the directory FD is open on. */ -extern int fchmodat (int __fd, __const char *__file, __mode_t __mode, +extern int fchmodat (int __fd, const char *__file, __mode_t __mode, int __flag) __THROW __nonnull ((2)) __wur; #endif /* Use ATFILE. */ @@ -324,7 +324,7 @@ extern __mode_t getumask (void) __THROW; #endif /* Create a new directory named PATH, with permission bits MODE. */ -extern int mkdir (__const char *__path, __mode_t __mode) +extern int mkdir (const char *__path, __mode_t __mode) __THROW __nonnull ((1)); libc_hidden_proto(mkdir) @@ -332,7 +332,7 @@ libc_hidden_proto(mkdir) /* Like mkdir, create a new directory with permission bits MODE. But interpret relative PATH names relative to the directory associated with FD. */ -extern int mkdirat (int __fd, __const char *__path, __mode_t __mode) +extern int mkdirat (int __fd, const char *__path, __mode_t __mode) __THROW __nonnull ((2)); #endif @@ -340,7 +340,7 @@ extern int mkdirat (int __fd, __const char *__path, __mode_t __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 (__const char *__path, __mode_t __mode, __dev_t __dev) +extern int mknod (const char *__path, __mode_t __mode, __dev_t __dev) __THROW __nonnull ((1)); libc_hidden_proto(mknod) @@ -348,7 +348,7 @@ libc_hidden_proto(mknod) /* Like mknod, create a new device file with permission bits MODE and device number DEV. But interpret relative PATH names relative to the directory associated with FD. */ -extern int mknodat (int __fd, __const char *__path, __mode_t __mode, +extern int mknodat (int __fd, const char *__path, __mode_t __mode, __dev_t __dev) __THROW __nonnull ((2)); libc_hidden_proto(mknodat) # endif @@ -356,22 +356,22 @@ libc_hidden_proto(mknodat) /* Create a new FIFO named PATH, with permission bits MODE. */ -extern int mkfifo (__const char *__path, __mode_t __mode) +extern int mkfifo (const char *__path, __mode_t __mode) __THROW __nonnull ((1)); #ifdef __USE_ATFILE /* Like mkfifo, create a new FIFO with permission bits MODE. But interpret relative PATH names relative to the directory associated with FD. */ -extern int mkfifoat (int __fd, __const char *__path, __mode_t __mode) +extern int mkfifoat (int __fd, const char *__path, __mode_t __mode) __THROW __nonnull ((2)); #endif #ifdef __USE_ATFILE /* Set file access and modification times relative to directory file descriptor. */ -extern int utimensat (int __fd, __const char *__path, - __const struct timespec __times[2], +extern int utimensat (int __fd, const char *__path, + const struct timespec __times[2], int __flags) __THROW __nonnull ((2)); libc_hidden_proto(utimensat) @@ -379,7 +379,7 @@ libc_hidden_proto(utimensat) #ifdef __USE_XOPEN2K8 /* Set file access and modification times of the file associated with FD. */ -extern int futimens (int __fd, __const struct timespec __times[2]) __THROW; +extern int futimens (int __fd, const struct timespec __times[2]) __THROW; #endif /* on uClibc we have unversioned struct stat and mknod. diff --git a/include/sys/statfs.h b/include/sys/statfs.h index 870408b77..0b90c1319 100644 --- a/include/sys/statfs.h +++ b/include/sys/statfs.h @@ -28,19 +28,19 @@ __BEGIN_DECLS /* Return information about the filesystem on which FILE resides. */ #ifndef __USE_FILE_OFFSET64 -extern int statfs (__const char *__file, struct statfs *__buf) +extern int statfs (const char *__file, struct statfs *__buf) __THROW __nonnull ((1, 2)); #else # ifdef __REDIRECT_NTH extern int __REDIRECT_NTH (statfs, - (__const char *__file, struct statfs *__buf), + (const char *__file, struct statfs *__buf), statfs64) __nonnull ((1, 2)); # else # define statfs statfs64 # endif #endif #ifdef __USE_LARGEFILE64 -extern int statfs64 (__const char *__file, struct statfs64 *__buf) +extern int statfs64 (const char *__file, struct statfs64 *__buf) __THROW __nonnull ((1, 2)); libc_hidden_proto(statfs64) #endif diff --git a/include/sys/statvfs.h b/include/sys/statvfs.h index 1e7d9d368..e5e0c2362 100644 --- a/include/sys/statvfs.h +++ b/include/sys/statvfs.h @@ -48,14 +48,14 @@ __BEGIN_DECLS /* Return information about the filesystem on which FILE resides. */ #ifndef __USE_FILE_OFFSET64 -extern int statvfs (__const char *__restrict __file, +extern int statvfs (const char *__restrict __file, struct statvfs *__restrict __buf) __THROW __nonnull ((1, 2)); libc_hidden_proto(statvfs) #else # ifdef __REDIRECT_NTH extern int __REDIRECT_NTH (statvfs, - (__const char *__restrict __file, + (const char *__restrict __file, struct statvfs *__restrict __buf), statvfs64) __nonnull ((1, 2)); # else @@ -63,7 +63,7 @@ extern int __REDIRECT_NTH (statvfs, # endif #endif #ifdef __USE_LARGEFILE64 -extern int statvfs64 (__const char *__restrict __file, +extern int statvfs64 (const char *__restrict __file, struct statvfs64 *__restrict __buf) __THROW __nonnull ((1, 2)); #endif diff --git a/include/sys/swap.h b/include/sys/swap.h index a5a7aae21..29faba616 100644 --- a/include/sys/swap.h +++ b/include/sys/swap.h @@ -32,10 +32,10 @@ __BEGIN_DECLS /* Make the block special device PATH available to the system for swapping. This call is restricted to the super-user. */ -extern int swapon (__const char *__path, int __flags) __THROW; +extern int swapon (const char *__path, int __flags) __THROW; /* Stop using block special device PATH for swapping. */ -extern int swapoff (__const char *__path) __THROW; +extern int swapoff (const char *__path) __THROW; __END_DECLS diff --git a/include/sys/syslog.h b/include/sys/syslog.h index fb8c500e1..8808d217c 100644 --- a/include/sys/syslog.h +++ b/include/sys/syslog.h @@ -184,7 +184,7 @@ extern void closelog (void); This function is a possible cancellation point and therefore not marked with __THROW. */ -extern void openlog (__const char *__ident, int __option, int __facility); +extern void openlog (const char *__ident, int __option, int __facility); /* Set the log mask level. */ extern int setlogmask (int __mask) __THROW; @@ -193,7 +193,7 @@ extern int setlogmask (int __mask) __THROW; This function is a possible cancellation point and therefore not marked with __THROW. */ -extern void syslog (int __pri, __const char *__fmt, ...) +extern void syslog (int __pri, const char *__fmt, ...) __attribute__ ((__format__ (__printf__, 2, 3))); libc_hidden_proto(syslog) @@ -204,7 +204,7 @@ libc_hidden_proto(syslog) cancellation point. But due to similarity with an POSIX interface or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ -extern void vsyslog (int __pri, __const char *__fmt, __gnuc_va_list __ap) +extern void vsyslog (int __pri, const char *__fmt, __gnuc_va_list __ap) __attribute__ ((__format__ (__printf__, 2, 0))); #endif diff --git a/include/sys/time.h b/include/sys/time.h index 8ebba4bae..3b7a106be 100644 --- a/include/sys/time.h +++ b/include/sys/time.h @@ -76,8 +76,8 @@ libc_hidden_proto(gettimeofday) #ifdef __USE_BSD /* Set the current time of day and timezone information. This call is restricted to the super-user. */ -extern int settimeofday (__const struct timeval *__tv, - __const struct timezone *__tz) +extern int settimeofday (const struct timeval *__tv, + const struct timezone *__tz) __THROW __nonnull ((1)); libc_hidden_proto(settimeofday) @@ -85,7 +85,7 @@ libc_hidden_proto(settimeofday) If OLDDELTA is not NULL, it is filled in with the amount of time adjustment remaining to be done from the last `adjtime' call. This call is restricted to the super-user. */ -extern int adjtime (__const struct timeval *__delta, +extern int adjtime (const struct timeval *__delta, struct timeval *__olddelta) __THROW; #endif @@ -132,25 +132,25 @@ extern int getitimer (__itimer_which_t __which, set *OLD to the old value of timer WHICH. Returns 0 on success, -1 on errors. */ extern int setitimer (__itimer_which_t __which, - __const struct itimerval *__restrict __new, + const struct itimerval *__restrict __new, struct itimerval *__restrict __old) __THROW; libc_hidden_proto(setitimer) /* Change the access time of FILE to TVP[0] and the modification time of FILE to TVP[1]. If TVP is a null pointer, use the current time instead. Returns 0 on success, -1 on errors. */ -extern int utimes (__const char *__file, __const struct timeval __tvp[2]) +extern int utimes (const char *__file, const struct timeval __tvp[2]) __THROW __nonnull ((1)); libc_hidden_proto(utimes) #ifdef __USE_BSD /* Same as `utimes', but does not follow symbolic links. */ -extern int lutimes (__const char *__file, __const struct timeval __tvp[2]) +extern int lutimes (const char *__file, const struct timeval __tvp[2]) __THROW __nonnull ((1)); #if 0 /* Same as `utimes', but takes an open file descriptor instead of a name. */ -extern int futimes (int __fd, __const struct timeval __tvp[2]) __THROW; +extern int futimes (int __fd, const struct timeval __tvp[2]) __THROW; #endif #endif @@ -158,8 +158,8 @@ extern int futimes (int __fd, __const struct timeval __tvp[2]) __THROW; /* Change the access time of FILE relative to FD to TVP[0] and the modification time of FILE to TVP[1]. If TVP is a null pointer, use the current time instead. Returns 0 on success, -1 on errors. */ -extern int futimesat (int __fd, __const char *__file, - __const struct timeval __tvp[2]) __THROW; +extern int futimesat (int __fd, const char *__file, + const struct timeval __tvp[2]) __THROW; #endif diff --git a/include/sys/uio.h b/include/sys/uio.h index 43ce07cb6..efc681e7b 100644 --- a/include/sys/uio.h +++ b/include/sys/uio.h @@ -36,7 +36,7 @@ __BEGIN_DECLS This function is a cancellation point and therefore not marked with __THROW. */ -extern ssize_t readv (int __fd, __const struct iovec *__iovec, int __count); +extern ssize_t readv (int __fd, const struct iovec *__iovec, int __count); /* Write data pointed by the buffers described by IOVEC, which is a vector of COUNT `struct iovec's, to file descriptor FD. @@ -46,7 +46,7 @@ extern ssize_t readv (int __fd, __const struct iovec *__iovec, int __count); This function is a cancellation point and therefore not marked with __THROW. */ -extern ssize_t writev (int __fd, __const struct iovec *__iovec, int __count); +extern ssize_t writev (int __fd, const struct iovec *__iovec, int __count); __END_DECLS diff --git a/include/sys/wait.h b/include/sys/wait.h index 4a2d7c4da..b3c2b973a 100644 --- a/include/sys/wait.h +++ b/include/sys/wait.h @@ -46,7 +46,7 @@ __BEGIN_DECLS (__extension__ (((union { __typeof(status) __in; int __i; }) \ { .__in = (status) }).__i)) # else -# define __WAIT_INT(status) (*(__const int *) &(status)) +# define __WAIT_INT(status) (*(const int *) &(status)) # endif /* This is the type of the argument to `wait'. The funky union diff --git a/include/sys/xattr.h b/include/sys/xattr.h index 031678d8a..f39642dcc 100644 --- a/include/sys/xattr.h +++ b/include/sys/xattr.h @@ -36,48 +36,48 @@ enum /* Set the attribute NAME of the file pointed to by PATH to VALUE (which is SIZE bytes long). Return 0 on success, -1 for errors. */ -extern int setxattr (__const char *__path, __const char *__name, - __const void *__value, size_t __size, int __flags) +extern int setxattr (const char *__path, const char *__name, + const void *__value, size_t __size, int __flags) __THROW; /* Set the attribute NAME of the file pointed to by PATH to VALUE (which is SIZE bytes long), not following symlinks for the last pathname component. Return 0 on success, -1 for errors. */ -extern int lsetxattr (__const char *__path, __const char *__name, - __const void *__value, size_t __size, int __flags) +extern int lsetxattr (const char *__path, const char *__name, + const void *__value, size_t __size, int __flags) __THROW; /* Set the attribute NAME of the file descriptor FD to VALUE (which is SIZE bytes long). Return 0 on success, -1 for errors. */ -extern int fsetxattr (int __fd, __const char *__name, __const void *__value, +extern int fsetxattr (int __fd, const char *__name, const void *__value, size_t __size, int __flags) __THROW; /* Get the attribute NAME of the file pointed to by PATH to VALUE (which is SIZE bytes long). Return 0 on success, -1 for errors. */ -extern ssize_t getxattr (__const char *__path, __const char *__name, +extern ssize_t getxattr (const char *__path, const char *__name, void *__value, size_t __size) __THROW; /* Get the attribute NAME of the file pointed to by PATH to VALUE (which is SIZE bytes long), not following symlinks for the last pathname component. Return 0 on success, -1 for errors. */ -extern ssize_t lgetxattr (__const char *__path, __const char *__name, +extern ssize_t lgetxattr (const char *__path, const char *__name, void *__value, size_t __size) __THROW; /* Get the attribute NAME of the file descriptor FD to VALUE (which is SIZE bytes long). Return 0 on success, -1 for errors. */ -extern ssize_t fgetxattr (int __fd, __const char *__name, void *__value, +extern ssize_t fgetxattr (int __fd, const char *__name, void *__value, size_t __size) __THROW; /* List attributes of the file pointed to by PATH into the user-supplied buffer LIST (which is SIZE bytes big). Return 0 on success, -1 for errors. */ -extern ssize_t listxattr (__const char *__path, char *__list, size_t __size) +extern ssize_t listxattr (const char *__path, char *__list, size_t __size) __THROW; /* List attributes of the file pointed to by PATH into the user-supplied buffer LIST (which is SIZE bytes big), not following symlinks for the last pathname component. Return 0 on success, -1 for errors. */ -extern ssize_t llistxattr (__const char *__path, char *__list, size_t __size) +extern ssize_t llistxattr (const char *__path, char *__list, size_t __size) __THROW; /* List attributes of the file descriptor FD into the user-supplied buffer @@ -87,16 +87,16 @@ extern ssize_t flistxattr (int __fd, char *__list, size_t __size) /* Remove the attribute NAME from the file pointed to by PATH. Return 0 on success, -1 for errors. */ -extern int removexattr (__const char *__path, __const char *__name) __THROW; +extern int removexattr (const char *__path, const char *__name) __THROW; /* Remove the attribute NAME from the file pointed to by PATH, not following symlinks for the last pathname component. Return 0 on success, -1 for errors. */ -extern int lremovexattr (__const char *__path, __const char *__name) __THROW; +extern int lremovexattr (const char *__path, const char *__name) __THROW; /* Remove the attribute NAME from the file descriptor FD. Return 0 on success, -1 for errors. */ -extern int fremovexattr (int __fd, __const char *__name) __THROW; +extern int fremovexattr (int __fd, const char *__name) __THROW; __END_DECLS |