diff options
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/bits/unistd.h | 18 | ||||
| -rw-r--r-- | posix/fnmatch.h | 14 | ||||
| -rw-r--r-- | posix/glob.h | 36 | ||||
| -rw-r--r-- | posix/sched.h | 8 | ||||
| -rw-r--r-- | posix/spawn.h | 38 | ||||
| -rw-r--r-- | posix/sys/wait.h | 4 | ||||
| -rw-r--r-- | posix/unistd.h | 94 | ||||
| -rw-r--r-- | posix/wordexp.h | 5 |
8 files changed, 105 insertions, 112 deletions
diff --git a/posix/bits/unistd.h b/posix/bits/unistd.h index e29b4cca46..16efe72758 100644 --- a/posix/bits/unistd.h +++ b/posix/bits/unistd.h @@ -1,5 +1,5 @@ /* Checking macros for unistd functions. - Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2005, 2006, 2007, 2008, 2012 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 @@ -121,23 +121,23 @@ pread64 (int __fd, void *__buf, size_t __nbytes, __off64_t __offset) #endif #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K -extern ssize_t __readlink_chk (__const char *__restrict __path, +extern ssize_t __readlink_chk (const char *__restrict __path, char *__restrict __buf, size_t __len, size_t __buflen) __THROW __nonnull ((1, 2)) __wur; extern ssize_t __REDIRECT_NTH (__readlink_alias, - (__const char *__restrict __path, + (const char *__restrict __path, char *__restrict __buf, size_t __len), readlink) __nonnull ((1, 2)) __wur; extern ssize_t __REDIRECT_NTH (__readlink_chk_warn, - (__const char *__restrict __path, + (const char *__restrict __path, char *__restrict __buf, size_t __len, size_t __buflen), __readlink_chk) __nonnull ((1, 2)) __wur __warnattr ("readlink called with bigger length " "than size of destination buffer"); __extern_always_inline __nonnull ((1, 2)) __wur ssize_t -__NTH (readlink (__const char *__restrict __path, char *__restrict __buf, +__NTH (readlink (const char *__restrict __path, char *__restrict __buf, size_t __len)) { if (__bos (__buf) != (size_t) -1) @@ -153,17 +153,17 @@ __NTH (readlink (__const char *__restrict __path, char *__restrict __buf, #endif #ifdef __USE_ATFILE -extern ssize_t __readlinkat_chk (int __fd, __const char *__restrict __path, +extern ssize_t __readlinkat_chk (int __fd, const char *__restrict __path, char *__restrict __buf, size_t __len, size_t __buflen) __THROW __nonnull ((2, 3)) __wur; extern ssize_t __REDIRECT_NTH (__readlinkat_alias, - (int __fd, __const char *__restrict __path, + (int __fd, const char *__restrict __path, char *__restrict __buf, size_t __len), readlinkat) __nonnull ((2, 3)) __wur; extern ssize_t __REDIRECT_NTH (__readlinkat_chk_warn, - (int __fd, __const char *__restrict __path, + (int __fd, const char *__restrict __path, char *__restrict __buf, size_t __len, size_t __buflen), __readlinkat_chk) __nonnull ((2, 3)) __wur __warnattr ("readlinkat called with bigger " @@ -171,7 +171,7 @@ extern ssize_t __REDIRECT_NTH (__readlinkat_chk_warn, "buffer"); __extern_always_inline __nonnull ((2, 3)) __wur ssize_t -__NTH (readlinkat (int __fd, __const char *__restrict __path, +__NTH (readlinkat (int __fd, const char *__restrict __path, char *__restrict __buf, size_t __len)) { if (__bos (__buf) != (size_t) -1) diff --git a/posix/fnmatch.h b/posix/fnmatch.h index aefb007fba..7d1a8f5e7f 100644 --- a/posix/fnmatch.h +++ b/posix/fnmatch.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1991-93,96,97,98,99,2001,2004 Free Software Foundation, Inc. +/* Copyright (C) 1991-93,1996-1999,2001,2004,2012 + 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 @@ -23,14 +24,6 @@ extern "C" { #endif -#ifndef const -# if (defined __STDC__ && __STDC__) || defined __cplusplus -# define __const const -# else -# define __const -# endif -#endif - /* We #undef these before defining them because some losing systems (HP-UX A.08.07 for example) define these in <unistd.h>. */ #undef FNM_PATHNAME @@ -62,8 +55,7 @@ extern "C" { /* Match NAME against the filename pattern PATTERN, returning zero if it matches, FNM_NOMATCH if not. */ -extern int fnmatch (__const char *__pattern, __const char *__name, - int __flags); +extern int fnmatch (const char *__pattern, const char *__name, int __flags); #ifdef __cplusplus } diff --git a/posix/glob.h b/posix/glob.h index 07f2ac7744..2de03d2912 100644 --- a/posix/glob.h +++ b/posix/glob.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,1992,1995-1998,2000,2001,2004,2010,2011 +/* Copyright (C) 1991,1992,1995-1998,2000,2001,2004,2010,2011,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -96,13 +96,13 @@ typedef struct #else void *(*gl_readdir) (void *); #endif - void *(*gl_opendir) (__const char *); + void *(*gl_opendir) (const char *); #ifdef __USE_GNU - int (*gl_lstat) (__const char *__restrict, struct stat *__restrict); - int (*gl_stat) (__const char *__restrict, struct stat *__restrict); + int (*gl_lstat) (const char *__restrict, struct stat *__restrict); + int (*gl_stat) (const char *__restrict, struct stat *__restrict); #else - int (*gl_lstat) (__const char *__restrict, void *__restrict); - int (*gl_stat) (__const char *__restrict, void *__restrict); + int (*gl_lstat) (const char *__restrict, void *__restrict); + int (*gl_stat) (const char *__restrict, void *__restrict); #endif } glob_t; @@ -125,13 +125,13 @@ typedef struct # else void *(*gl_readdir) (void *); # endif - void *(*gl_opendir) (__const char *); + void *(*gl_opendir) (const char *); # ifdef __USE_GNU - int (*gl_lstat) (__const char *__restrict, struct stat64 *__restrict); - int (*gl_stat) (__const char *__restrict, struct stat64 *__restrict); + int (*gl_lstat) (const char *__restrict, struct stat64 *__restrict); + int (*gl_stat) (const char *__restrict, struct stat64 *__restrict); # else - int (*gl_lstat) (__const char *__restrict, void *__restrict); - int (*gl_stat) (__const char *__restrict, void *__restrict); + int (*gl_lstat) (const char *__restrict, void *__restrict); + int (*gl_stat) (const char *__restrict, void *__restrict); # endif } glob64_t; #endif @@ -145,24 +145,24 @@ typedef struct If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned. Otherwise, `glob' returns zero. */ #if !defined __USE_FILE_OFFSET64 -extern int glob (__const char *__restrict __pattern, int __flags, - int (*__errfunc) (__const char *, int), +extern int glob (const char *__restrict __pattern, int __flags, + int (*__errfunc) (const char *, int), glob_t *__restrict __pglob) __THROW; /* Free storage allocated in PGLOB by a previous `glob' call. */ extern void globfree (glob_t *__pglob) __THROW; #else -extern int __REDIRECT_NTH (glob, (__const char *__restrict __pattern, +extern int __REDIRECT_NTH (glob, (const char *__restrict __pattern, int __flags, - int (*__errfunc) (__const char *, int), + int (*__errfunc) (const char *, int), glob_t *__restrict __pglob), glob64); extern void __REDIRECT_NTH (globfree, (glob_t *__pglob), globfree64); #endif #ifdef __USE_LARGEFILE64 -extern int glob64 (__const char *__restrict __pattern, int __flags, - int (*__errfunc) (__const char *, int), +extern int glob64 (const char *__restrict __pattern, int __flags, + int (*__errfunc) (const char *, int), glob64_t *__restrict __pglob) __THROW; extern void globfree64 (glob64_t *__pglob) __THROW; @@ -175,7 +175,7 @@ extern void globfree64 (glob64_t *__pglob) __THROW; This function is not part of the interface specified by POSIX.2 but several programs want to use it. */ -extern int glob_pattern_p (__const char *__pattern, int __quote) __THROW; +extern int glob_pattern_p (const char *__pattern, int __quote) __THROW; #endif __END_DECLS diff --git a/posix/sched.h b/posix/sched.h index 55bc487b37..41bfa13615 100644 --- a/posix/sched.h +++ b/posix/sched.h @@ -1,5 +1,5 @@ /* Definitions for POSIX 1003.1b-1993 (aka POSIX.4) scheduling interface. - Copyright (C) 1996,1997,1999,2001-2004,2007,2010 + Copyright (C) 1996,1997,1999,2001-2004,2007,2010,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -48,7 +48,7 @@ typedef __pid_t pid_t; __BEGIN_DECLS /* Set scheduling parameters for a process. */ -extern int sched_setparam (__pid_t __pid, __const struct sched_param *__param) +extern int sched_setparam (__pid_t __pid, const struct sched_param *__param) __THROW; /* Retrieve scheduling parameters for a particular process. */ @@ -56,7 +56,7 @@ extern int sched_getparam (__pid_t __pid, struct sched_param *__param) __THROW; /* Set scheduling algorithm and/or parameters for a process. */ extern int sched_setscheduler (__pid_t __pid, int __policy, - __const struct sched_param *__param) __THROW; + const struct sched_param *__param) __THROW; /* Retrieve scheduling algorithm for a particular purpose. */ extern int sched_getscheduler (__pid_t __pid) __THROW; @@ -116,7 +116,7 @@ extern int sched_rr_get_interval (__pid_t __pid, struct timespec *__t) __THROW; /* Set the CPU affinity for a task */ extern int sched_setaffinity (__pid_t __pid, size_t __cpusetsize, - __const cpu_set_t *__cpuset) __THROW; + const cpu_set_t *__cpuset) __THROW; /* Get the CPU affinity for a task */ extern int sched_getaffinity (__pid_t __pid, size_t __cpusetsize, diff --git a/posix/spawn.h b/posix/spawn.h index 3eefa0fadc..ef772dff24 100644 --- a/posix/spawn.h +++ b/posix/spawn.h @@ -1,5 +1,5 @@ /* Definitions for POSIX spawn interface. - Copyright (C) 2000, 2003, 2004, 2009, 2011 Free Software Foundation, Inc. + Copyright (C) 2000,2003,2004,2009,2011,2012 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 @@ -70,21 +70,21 @@ __BEGIN_DECLS This function is a possible cancellation point and therefore not marked with __THROW. */ extern int posix_spawn (pid_t *__restrict __pid, - __const char *__restrict __path, - __const posix_spawn_file_actions_t *__restrict + const char *__restrict __path, + const posix_spawn_file_actions_t *__restrict __file_actions, - __const posix_spawnattr_t *__restrict __attrp, - char *__const __argv[__restrict_arr], - char *__const __envp[__restrict_arr]); + const posix_spawnattr_t *__restrict __attrp, + char *const __argv[__restrict_arr], + char *const __envp[__restrict_arr]); /* Similar to `posix_spawn' but search for FILE in the PATH. This function is a possible cancellation point and therefore not marked with __THROW. */ -extern int posix_spawnp (pid_t *__pid, __const char *__file, - __const posix_spawn_file_actions_t *__file_actions, - __const posix_spawnattr_t *__attrp, - char *__const __argv[], char *__const __envp[]); +extern int posix_spawnp (pid_t *__pid, const char *__file, + const posix_spawn_file_actions_t *__file_actions, + const posix_spawnattr_t *__attrp, + char *const __argv[], char *const __envp[]); /* Initialize data structure with attributes for `spawn' to default values. */ @@ -95,29 +95,29 @@ extern int posix_spawnattr_destroy (posix_spawnattr_t *__attr) __THROW; /* Store signal mask for signals with default handling from ATTR in SIGDEFAULT. */ -extern int posix_spawnattr_getsigdefault (__const posix_spawnattr_t * +extern int posix_spawnattr_getsigdefault (const posix_spawnattr_t * __restrict __attr, sigset_t *__restrict __sigdefault) __THROW; /* Set signal mask for signals with default handling in ATTR to SIGDEFAULT. */ extern int posix_spawnattr_setsigdefault (posix_spawnattr_t *__restrict __attr, - __const sigset_t *__restrict + const sigset_t *__restrict __sigdefault) __THROW; /* Store signal mask for the new process from ATTR in SIGMASK. */ -extern int posix_spawnattr_getsigmask (__const posix_spawnattr_t *__restrict +extern int posix_spawnattr_getsigmask (const posix_spawnattr_t *__restrict __attr, sigset_t *__restrict __sigmask) __THROW; /* Set signal mask for the new process in ATTR to SIGMASK. */ extern int posix_spawnattr_setsigmask (posix_spawnattr_t *__restrict __attr, - __const sigset_t *__restrict __sigmask) + const sigset_t *__restrict __sigmask) __THROW; /* Get flag word from the attribute structure. */ -extern int posix_spawnattr_getflags (__const posix_spawnattr_t *__restrict +extern int posix_spawnattr_getflags (const posix_spawnattr_t *__restrict __attr, short int *__restrict __flags) __THROW; @@ -126,7 +126,7 @@ extern int posix_spawnattr_setflags (posix_spawnattr_t *_attr, short int __flags) __THROW; /* Get process group ID from the attribute structure. */ -extern int posix_spawnattr_getpgroup (__const posix_spawnattr_t *__restrict +extern int posix_spawnattr_getpgroup (const posix_spawnattr_t *__restrict __attr, pid_t *__restrict __pgroup) __THROW; @@ -135,7 +135,7 @@ extern int posix_spawnattr_setpgroup (posix_spawnattr_t *__attr, pid_t __pgroup) __THROW; /* Get scheduling policy from the attribute structure. */ -extern int posix_spawnattr_getschedpolicy (__const posix_spawnattr_t * +extern int posix_spawnattr_getschedpolicy (const posix_spawnattr_t * __restrict __attr, int *__restrict __schedpolicy) __THROW; @@ -145,7 +145,7 @@ extern int posix_spawnattr_setschedpolicy (posix_spawnattr_t *__attr, int __schedpolicy) __THROW; /* Get scheduling parameters from the attribute structure. */ -extern int posix_spawnattr_getschedparam (__const posix_spawnattr_t * +extern int posix_spawnattr_getschedparam (const posix_spawnattr_t * __restrict __attr, struct sched_param *__restrict __schedparam) __THROW; @@ -169,7 +169,7 @@ extern int posix_spawn_file_actions_destroy (posix_spawn_file_actions_t * extern int posix_spawn_file_actions_addopen (posix_spawn_file_actions_t * __restrict __file_actions, int __fd, - __const char *__restrict __path, + const char *__restrict __path, int __oflag, mode_t __mode) __THROW; diff --git a/posix/sys/wait.h b/posix/sys/wait.h index a5fd58f9d2..23080f255b 100644 --- a/posix/sys/wait.h +++ b/posix/sys/wait.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1994,1996-2001,2003,2004,2005,2007,2009,2010,2011 +/* Copyright (C) 1991-1994,1996-2001,2003,2004,2005,2007,2009,2010,2011,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -47,7 +47,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/posix/unistd.h b/posix/unistd.h index 01fb64a4dc..f8d559f257 100644 --- a/posix/unistd.h +++ b/posix/unistd.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2009, 2010, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1991-2009, 2010, 2011, 2012 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 @@ -285,16 +285,16 @@ typedef __socklen_t socklen_t; #define F_OK 0 /* Test for existence. */ /* Test for access to NAME using the real UID and real GID. */ -extern int access (__const char *__name, int __type) __THROW __nonnull ((1)); +extern int access (const char *__name, int __type) __THROW __nonnull ((1)); #ifdef __USE_GNU /* Test for access to NAME using the effective UID and GID (as normal file operations use). */ -extern int euidaccess (__const char *__name, int __type) +extern int euidaccess (const char *__name, int __type) __THROW __nonnull ((1)); /* An alias for `euidaccess', used by some other systems. */ -extern int eaccess (__const char *__name, int __type) +extern int eaccess (const char *__name, int __type) __THROW __nonnull ((1)); #endif @@ -302,7 +302,7 @@ extern int eaccess (__const char *__name, int __type) /* Test for access to FILE relative to the directory FD is open on. If AT_EACCESS is set in FLAG, then use effective IDs like `eaccess', otherwise use real IDs like `access'. */ -extern int faccessat (int __fd, __const char *__file, int __type, int __flag) +extern int faccessat (int __fd, const char *__file, int __type, int __flag) __THROW __nonnull ((2)) __wur; #endif /* Use GNU. */ @@ -364,7 +364,7 @@ extern ssize_t read (int __fd, void *__buf, size_t __nbytes) __wur; This function is a cancellation point and therefore not marked with __THROW. */ -extern ssize_t write (int __fd, __const void *__buf, size_t __n) __wur; +extern ssize_t write (int __fd, const void *__buf, size_t __n) __wur; #if defined __USE_UNIX98 || defined __USE_XOPEN2K8 # ifndef __USE_FILE_OFFSET64 @@ -382,14 +382,14 @@ extern ssize_t pread (int __fd, void *__buf, size_t __nbytes, This function is a cancellation point and therefore not marked with __THROW. */ -extern ssize_t pwrite (int __fd, __const void *__buf, size_t __n, +extern ssize_t pwrite (int __fd, const void *__buf, size_t __n, __off_t __offset) __wur; # else # ifdef __REDIRECT extern ssize_t __REDIRECT (pread, (int __fd, void *__buf, size_t __nbytes, __off64_t __offset), pread64) __wur; -extern ssize_t __REDIRECT (pwrite, (int __fd, __const void *__buf, +extern ssize_t __REDIRECT (pwrite, (int __fd, const void *__buf, size_t __nbytes, __off64_t __offset), pwrite64) __wur; # else @@ -406,7 +406,7 @@ extern ssize_t pread64 (int __fd, void *__buf, size_t __nbytes, __off64_t __offset) __wur; /* Write N bytes of BUF to FD at the given position OFFSET without changing the file pointer. Return the number written, or -1. */ -extern ssize_t pwrite64 (int __fd, __const void *__buf, size_t __n, +extern ssize_t pwrite64 (int __fd, const void *__buf, size_t __n, __off64_t __offset) __wur; # endif #endif @@ -471,7 +471,7 @@ extern int pause (void); /* Change the owner and group of FILE. */ -extern int chown (__const char *__file, __uid_t __owner, __gid_t __group) +extern int chown (const char *__file, __uid_t __owner, __gid_t __group) __THROW __nonnull ((1)) __wur; #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8 @@ -481,7 +481,7 @@ extern int fchown (int __fd, __uid_t __owner, __gid_t __group) __THROW __wur; /* Change owner and group of FILE, if it is a symbolic link the ownership of the symbolic link is changed. */ -extern int lchown (__const char *__file, __uid_t __owner, __gid_t __group) +extern int lchown (const char *__file, __uid_t __owner, __gid_t __group) __THROW __nonnull ((1)) __wur; #endif /* Use BSD || X/Open Unix. */ @@ -489,13 +489,13 @@ extern int lchown (__const char *__file, __uid_t __owner, __gid_t __group) #ifdef __USE_ATFILE /* Change the owner and group of FILE relative to the directory FD is open on. */ -extern int fchownat (int __fd, __const char *__file, __uid_t __owner, +extern int fchownat (int __fd, const char *__file, __uid_t __owner, __gid_t __group, int __flag) __THROW __nonnull ((2)) __wur; #endif /* Use GNU. */ /* Change the process's working directory to PATH. */ -extern int chdir (__const char *__path) __THROW __nonnull ((1)) __wur; +extern int chdir (const char *__path) __THROW __nonnull ((1)) __wur; #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K8 /* Change the process's working directory to the one FD is open on. */ @@ -549,47 +549,47 @@ extern char **environ; /* Replace the current process, executing PATH with arguments ARGV and environment ENVP. ARGV and ENVP are terminated by NULL pointers. */ -extern int execve (__const char *__path, char *__const __argv[], - char *__const __envp[]) __THROW __nonnull ((1, 2)); +extern int execve (const char *__path, char *const __argv[], + char *const __envp[]) __THROW __nonnull ((1, 2)); #ifdef __USE_XOPEN2K8 /* Execute the file FD refers to, overlaying the running program image. ARGV and ENVP are passed to the new program, as for `execve'. */ -extern int fexecve (int __fd, char *__const __argv[], char *__const __envp[]) +extern int fexecve (int __fd, char *const __argv[], char *const __envp[]) __THROW __nonnull ((2)); #endif /* Execute PATH with arguments ARGV and environment from `environ'. */ -extern int execv (__const char *__path, char *__const __argv[]) +extern int execv (const char *__path, char *const __argv[]) __THROW __nonnull ((1, 2)); /* Execute PATH with all arguments after PATH until a NULL pointer, and the argument after that for environment. */ -extern int execle (__const char *__path, __const char *__arg, ...) +extern int execle (const char *__path, const char *__arg, ...) __THROW __nonnull ((1, 2)); /* Execute PATH with all arguments after PATH until a NULL pointer and environment from `environ'. */ -extern int execl (__const char *__path, __const char *__arg, ...) +extern int execl (const char *__path, const char *__arg, ...) __THROW __nonnull ((1, 2)); /* Execute FILE, searching in the `PATH' environment variable if it contains no slashes, with arguments ARGV and environment from `environ'. */ -extern int execvp (__const char *__file, char *__const __argv[]) +extern int execvp (const char *__file, char *const __argv[]) __THROW __nonnull ((1, 2)); /* Execute FILE, searching in the `PATH' environment variable if it contains no slashes, with all arguments after FILE until a NULL pointer and environment from `environ'. */ -extern int execlp (__const char *__file, __const char *__arg, ...) +extern int execlp (const char *__file, const char *__arg, ...) __THROW __nonnull ((1, 2)); #ifdef __USE_GNU /* Execute FILE, searching in the `PATH' environment variable if it contains no slashes, with arguments ARGV and environment from `environ'. */ -extern int execvpe (__const char *__file, char *__const __argv[], - char *__const __envp[]) +extern int execvpe (const char *__file, char *const __argv[], + char *const __envp[]) __THROW __nonnull ((1, 2)); #endif @@ -610,7 +610,7 @@ extern void _exit (int __status) __attribute__ ((__noreturn__)); #include <bits/confname.h> /* Get file-specific configuration information about PATH. */ -extern long int pathconf (__const char *__path, int __name) +extern long int pathconf (const char *__path, int __name) __THROW __nonnull ((1)); /* Get file-specific configuration about descriptor FD. */ @@ -810,52 +810,52 @@ extern int ttyslot (void) __THROW; /* Make a link to FROM named TO. */ -extern int link (__const char *__from, __const char *__to) +extern int link (const char *__from, const char *__to) __THROW __nonnull ((1, 2)) __wur; #ifdef __USE_ATFILE /* Like link but relative paths in TO and FROM are interpreted relative to FROMFD and TOFD respectively. */ -extern int linkat (int __fromfd, __const char *__from, int __tofd, - __const char *__to, int __flags) +extern int linkat (int __fromfd, const char *__from, int __tofd, + const char *__to, int __flags) __THROW __nonnull ((2, 4)) __wur; #endif #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED || defined __USE_XOPEN2K /* Make a symbolic link to FROM named TO. */ -extern int symlink (__const char *__from, __const char *__to) +extern int symlink (const char *__from, const char *__to) __THROW __nonnull ((1, 2)) __wur; /* Read the contents of the symbolic link PATH into no more than LEN bytes of BUF. The contents are not null-terminated. Returns the number of characters read, or -1 for errors. */ -extern ssize_t readlink (__const char *__restrict __path, +extern ssize_t readlink (const char *__restrict __path, char *__restrict __buf, size_t __len) __THROW __nonnull ((1, 2)) __wur; #endif /* Use BSD. */ #ifdef __USE_ATFILE /* Like symlink but a relative path in TO is interpreted relative to TOFD. */ -extern int symlinkat (__const char *__from, int __tofd, - __const char *__to) __THROW __nonnull ((1, 3)) __wur; +extern int symlinkat (const char *__from, int __tofd, + const char *__to) __THROW __nonnull ((1, 3)) __wur; /* Like readlink but a relative PATH is interpreted relative to FD. */ -extern ssize_t readlinkat (int __fd, __const char *__restrict __path, +extern ssize_t readlinkat (int __fd, const char *__restrict __path, char *__restrict __buf, size_t __len) __THROW __nonnull ((2, 3)) __wur; #endif /* Remove the link NAME. */ -extern int unlink (__const char *__name) __THROW __nonnull ((1)); +extern int unlink (const char *__name) __THROW __nonnull ((1)); #ifdef __USE_ATFILE /* Remove the link NAME relative to FD. */ -extern int unlinkat (int __fd, __const char *__name, int __flag) +extern int unlinkat (int __fd, const char *__name, int __flag) __THROW __nonnull ((2)); #endif /* Remove the directory PATH. */ -extern int rmdir (__const char *__path) __THROW __nonnull ((1)); +extern int rmdir (const char *__path) __THROW __nonnull ((1)); /* Return the foreground process group ID of FD. */ @@ -882,7 +882,7 @@ extern int getlogin_r (char *__name, size_t __name_len) __nonnull ((1)); #ifdef __USE_BSD /* Set the login name returned by `getlogin'. */ -extern int setlogin (__const char *__name) __THROW __nonnull ((1)); +extern int setlogin (const char *__name) __THROW __nonnull ((1)); #endif @@ -906,7 +906,7 @@ extern int gethostname (char *__name, size_t __len) __THROW __nonnull ((1)); #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_UNIX98) /* Set the name of the current host to NAME, which is LEN bytes long. This call is restricted to the super-user. */ -extern int sethostname (__const char *__name, size_t __len) +extern int sethostname (const char *__name, size_t __len) __THROW __nonnull ((1)) __wur; /* Set the current machine's Internet number to ID. @@ -919,7 +919,7 @@ extern int sethostid (long int __id) __THROW __wur; The NIS domain name is usually the empty string when not using NIS. */ extern int getdomainname (char *__name, size_t __len) __THROW __nonnull ((1)) __wur; -extern int setdomainname (__const char *__name, size_t __len) +extern int setdomainname (const char *__name, size_t __len) __THROW __nonnull ((1)) __wur; @@ -929,7 +929,7 @@ extern int setdomainname (__const char *__name, size_t __len) extern int vhangup (void) __THROW; /* Revoke the access of all descriptors currently open on FILE. */ -extern int revoke (__const char *__file) __THROW __nonnull ((1)) __wur; +extern int revoke (const char *__file) __THROW __nonnull ((1)) __wur; /* Enable statistical profiling, writing samples of the PC into at most @@ -945,7 +945,7 @@ extern int profil (unsigned short int *__sample_buffer, size_t __size, /* Turn accounting on if NAME is an existing file. The system will then write a record for each process as it terminates, to this file. If NAME is NULL, turn accounting off. This call is restricted to the super-user. */ -extern int acct (__const char *__name) __THROW; +extern int acct (const char *__name) __THROW; /* Successive calls return the shells listed in `/etc/shells'. */ @@ -964,11 +964,11 @@ extern int daemon (int __nochdir, int __noclose) __THROW __wur; #if defined __USE_BSD || (defined __USE_XOPEN && !defined __USE_XOPEN2K) /* Make PATH be the root directory (the starting point for absolute paths). This call is restricted to the super-user. */ -extern int chroot (__const char *__path) __THROW __nonnull ((1)) __wur; +extern int chroot (const char *__path) __THROW __nonnull ((1)) __wur; /* Prompt with PROMPT and read a string from the terminal without echoing. Uses /dev/tty if possible; otherwise stderr and stdin. */ -extern char *getpass (__const char *__prompt) __nonnull ((1)); +extern char *getpass (const char *__prompt) __nonnull ((1)); #endif /* Use BSD || X/Open. */ @@ -1015,19 +1015,19 @@ extern int getdtablesize (void) __THROW; /* Truncate FILE to LENGTH bytes. */ # ifndef __USE_FILE_OFFSET64 -extern int truncate (__const char *__file, __off_t __length) +extern int truncate (const char *__file, __off_t __length) __THROW __nonnull ((1)) __wur; # else # ifdef __REDIRECT_NTH extern int __REDIRECT_NTH (truncate, - (__const char *__file, __off64_t __length), + (const char *__file, __off64_t __length), truncate64) __nonnull ((1)) __wur; # else # define truncate truncate64 # endif # endif # ifdef __USE_LARGEFILE64 -extern int truncate64 (__const char *__file, __off64_t __length) +extern int truncate64 (const char *__file, __off64_t __length) __THROW __nonnull ((1)) __wur; # endif @@ -1141,7 +1141,7 @@ extern int fdatasync (int __fildes); be defined here. */ #ifdef __USE_XOPEN /* Encrypt at most 8 characters from KEY using salt to perturb DES. */ -extern char *crypt (__const char *__key, __const char *__salt) +extern char *crypt (const char *__key, const char *__salt) __THROW __nonnull ((1, 2)); /* Encrypt data in BLOCK in place if EDFLAG is zero; otherwise decrypt @@ -1153,7 +1153,7 @@ extern void encrypt (char *__block, int __edflag) __THROW __nonnull ((1)); FROM and copy the result to TO. The value of TO must not be in the range [FROM - N + 1, FROM - 1]. If N is odd the first byte in FROM is without partner. */ -extern void swab (__const void *__restrict __from, void *__restrict __to, +extern void swab (const void *__restrict __from, void *__restrict __to, ssize_t __n) __THROW __nonnull ((1, 2)); #endif diff --git a/posix/wordexp.h b/posix/wordexp.h index 1c40e61684..6f8b272f2a 100644 --- a/posix/wordexp.h +++ b/posix/wordexp.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1991, 92, 1996-1999, 2001, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1991,1992,1996-1999,2001,2003,2012 + 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 @@ -60,7 +61,7 @@ enum }; /* Do word expansion of WORDS into PWORDEXP. */ -extern int wordexp (__const char *__restrict __words, +extern int wordexp (const char *__restrict __words, wordexp_t *__restrict __pwordexp, int __flags); /* Free the storage allocated by a `wordexp' call. */ |