This is the mail archive of the libc-hacker@sourceware.cygnus.com mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Here're some more patches. I didn't change all header files but tried
to leave those untouched which are used by other GNU packages.
I didn't change linuxthreads since I wait for the integration of my
patch for libc-lock.h.
A happy new year to everybody,
Andreas
1999-12-31 Andreas Jaeger <aj@suse.de>
* assert/assert.h: Replace __const with const.
* catgets/nl_types.h: Likewise.
* dirent/dirent.h: Likewise.
* dlfcn/dlfcn.h: Likewise.
* grp/grp.h: Likewise.
* iconv/gconv.h: Likewise.
* iconv/iconv.h: Likewise.
* inet/arpa/inet.h: Likewise.
* intl/libintl.h: Likewise.
* io/ftw.h: Likewise.
* io/sys/stat.h: Likewise.
* libio/libio.h: Likewise.
* libio/stdio.h: Likewise.
* locale/locale.h: Likewise.
* login/utmp.h: Likewise.
* misc/err.h: Likewise.
* misc/mntent.h: Likewise.
* misc/regexp.h: Likewise.
* misc/search.h: Likewise.
* misc/sgtty.h: Likewise.
* misc/sys/syslog.h: Likewise.
* misc/sys/uio.h: Likewise.
* nss/nss.h: Likewise.
* posix/sched.h: Likewise.
* posix/unistd.h: Likewise.
* resolv/netdb.h: Likewise.
* resource/sys/resource.h: Likewise.
* rt/aio.h: Likewise.
* signal/signal.h: Likewise.
* socket/sys/socket.h: Likewise.
* stdio-common/printf.h: Likewise.
* stdio/stdio.h: Likewise.
* stdlib/fmtmsg.h: Likewise.
* stdlib/monetary.h: Likewise.
* stdlib/stdlib.h: Likewise.
* stdlib/ucontext.h: Likewise.
* streams/stropts.h: Likewise.
* string/bits/string2.h: Likewise.
* string/envz.h: Likewise.
* sysdeps/i386/bits/string.h: Likewise.
* sysdeps/i386/i486/bits/string.h: Likewise.
* sysdeps/unix/sysv/linux/sys/mount.h: Likewise.
* sysvipc/sys/msg.h: Likewise.
* sysvipc/sys/shm.h: Likewise.
* termios/termios.h: Likewise.
* time/sys/time.h: Likewise.
* time/time.h: Likewise.
* wcsmbs/wchar.h: Likewise.
============================================================
Index: dlfcn/dlfcn.h
--- dlfcn/dlfcn.h 1999/10/09 21:18:12 1.3
+++ dlfcn/dlfcn.h 1999/12/31 16:25:19
@@ -44,7 +44,7 @@
/* Open the shared object FILE and map it in; return a handle that can be
passed to `dlsym' to get symbol values from it. */
-extern void *dlopen (__const char *__file, int __mode) __THROW;
+extern void *dlopen (const char *__file, int __mode) __THROW;
/* Unmap and close a shared object opened by `dlopen'.
The handle cannot be used again after calling `dlclose'. */
@@ -53,14 +53,14 @@
/* Find the run-time address in the shared object HANDLE refers to
of the symbol called NAME. */
extern void *dlsym (void *__restrict __handle,
- __const char *__restrict __name) __THROW;
+ const char *__restrict __name) __THROW;
#ifdef __USE_GNU
/* Find the run-time address in the shared object HANDLE refers to
of the symbol called NAME with VERSION. */
extern void *dlvsym (void *__restrict __handle,
- __const char *__restrict __name,
- __const char *__restrict __version) __THROW;
+ const char *__restrict __name,
+ const char *__restrict __version) __THROW;
#endif
/* When any of the above functions fails, call this function
@@ -73,9 +73,9 @@
Returns 0 iff no shared object's segments contain that address. */
typedef struct
{
- __const char *dli_fname; /* File name of defining object. */
+ const char *dli_fname; /* File name of defining object. */
void *dli_fbase; /* Load address of that object. */
- __const char *dli_sname; /* Name of nearest symbol. */
+ const char *dli_sname; /* Name of nearest symbol. */
void *dli_saddr; /* Exact value of nearest symbol. */
} Dl_info;
extern int dladdr (const void *__address, Dl_info *__info) __THROW;
============================================================
Index: assert/assert.h
--- assert/assert.h 1999/10/09 21:17:29 1.18
+++ assert/assert.h 1999/12/31 16:25:19
@@ -58,14 +58,14 @@
__BEGIN_DECLS
/* This prints an "Assertion failed" message and aborts. */
-extern void __assert_fail (__const char *__assertion, __const char *__file,
- unsigned int __line, __const char *__function)
+extern void __assert_fail (const char *__assertion, const char *__file,
+ unsigned int __line, const char *__function)
__THROW __attribute__ ((__noreturn__));
/* Likewise, but prints the error text for ERRNUM. */
-extern void __assert_perror_fail (int __errnum, __const char *__file,
+extern void __assert_perror_fail (int __errnum, const char *__file,
unsigned int __line,
- __const char *__function)
+ const char *__function)
__THROW __attribute__ ((__noreturn__));
__END_DECLS
@@ -93,7 +93,7 @@
# if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
# define __ASSERT_FUNCTION __func__
# else
-# define __ASSERT_FUNCTION ((__const char *) 0)
+# define __ASSERT_FUNCTION ((const char *) 0)
# endif
# endif
============================================================
Index: catgets/nl_types.h
--- catgets/nl_types.h 1999/10/09 21:17:34 1.5
+++ catgets/nl_types.h 1999/12/31 16:25:19
@@ -37,12 +37,12 @@
typedef int nl_item;
/* Open message catalog for later use, returning descriptor. */
-extern nl_catd catopen (__const char *__cat_name, int __flag) __THROW;
+extern nl_catd catopen (const char *__cat_name, int __flag) __THROW;
/* Return translation with NUMBER in SET of CATALOG; if not found
return STRING. */
extern char *catgets (nl_catd __catalog, int __set, int __number,
- __const char *__string) __THROW;
+ const char *__string) __THROW;
/* Close message CATALOG. */
extern int catclose (nl_catd __catalog) __THROW;
============================================================
Index: dirent/dirent.h
--- dirent/dirent.h 1999/10/09 21:18:07 1.42
+++ dirent/dirent.h 1999/12/31 16:25:20
@@ -127,7 +127,7 @@
/* Open a directory stream on NAME.
Return a DIR stream on the directory, or NULL if it could not be opened. */
-extern DIR *opendir (__const char *__name) __THROW;
+extern DIR *opendir (const char *__name) __THROW;
/* Close the directory stream DIRP.
Return 0 if successful, -1 if not. */
@@ -222,17 +222,17 @@
sorted using qsort with CMP, and collected in a malloc'd array in
*NAMELIST. Returns the number of entries selected, or -1 on error. */
# ifndef __USE_FILE_OFFSET64
-extern int scandir (__const char *__restrict __dir,
+extern int scandir (const char *__restrict __dir,
struct dirent ***__restrict __namelist,
- int (*__selector) (__const struct dirent *),
- int (*__cmp) (__const void *, __const void *)) __THROW;
+ int (*__selector) (const struct dirent *),
+ int (*__cmp) (const void *, const void *)) __THROW;
# else
# ifdef __REDIRECT
extern int __REDIRECT (scandir,
- (__const char *__restrict __dir,
+ (const char *__restrict __dir,
struct dirent ***__restrict __namelist,
- int (*__selector) (__const struct dirent *),
- int (*__cmp) (__const void *, __const void *)) __THROW,
+ int (*__selector) (const struct dirent *),
+ int (*__cmp) (const void *, const void *)) __THROW,
scandir64);
# else
# define scandir scandir64
@@ -242,19 +242,19 @@
# if defined __USE_GNU && defined __USE_LARGEFILE64
/* This function is like `scandir' but it uses the 64bit dirent structure.
Please note that the CMP function must now work with struct dirent64 **. */
-extern int scandir64 (__const char *__restrict __dir,
+extern int scandir64 (const char *__restrict __dir,
struct dirent64 ***__restrict __namelist,
- int (*__selector) (__const struct dirent64 *),
- int (*__cmp) (__const void *, __const void *)) __THROW;
+ int (*__selector) (const struct dirent64 *),
+ int (*__cmp) (const void *, const void *)) __THROW;
# endif
/* Function to compare two `struct dirent's alphabetically. */
# ifndef __USE_FILE_OFFSET64
-extern int alphasort (__const void *__e1, __const void *__e2) __THROW;
+extern int alphasort (const void *__e1, const void *__e2) __THROW;
# else
# ifdef __REDIRECT
extern int __REDIRECT (alphasort,
- (__const void *__e1, __const void *__e2) __THROW,
+ (const void *__e1, const void *__e2) __THROW,
alphasort64);
# else
# define alphasort alphasort64
@@ -262,17 +262,17 @@
# endif
# if defined __USE_GNU && defined __USE_LARGEFILE64
-extern int alphasort64 (__const void *__e1, __const void *__e2) __THROW;
+extern int alphasort64 (const void *__e1, const void *__e2) __THROW;
# endif
# ifdef __USE_GNU
/* Function to compare two `struct dirent's by name & version. */
# ifndef __USE_FILE_OFFSET64
-extern int versionsort (__const void *__e1, __const void *__e2) __THROW;
+extern int versionsort (const void *__e1, const void *__e2) __THROW;
# else
# ifdef __REDIRECT
extern int __REDIRECT (versionsort,
- (__const void *__e1, __const void *__e2) __THROW,
+ (const void *__e1, const void *__e2) __THROW,
versionsort64);
# else
# define versionsort versionsort64
@@ -280,7 +280,7 @@
# endif
# ifdef __USE_LARGEFILE64
-extern int versionsort64 (__const void *__e1, __const void *__e2) __THROW;
+extern int versionsort64 (const void *__e1, const void *__e2) __THROW;
# endif
# endif
============================================================
Index: grp/grp.h
--- grp/grp.h 1999/10/09 21:18:44 1.27
+++ grp/grp.h 1999/12/31 16:25:20
@@ -73,7 +73,7 @@
#ifdef __USE_GNU
/* Write the given entry onto the given stream. */
-extern int putgrent (__const struct group *__restrict __p,
+extern int putgrent (const struct group *__restrict __p,
FILE *__restrict __f) __THROW;
#endif
@@ -81,7 +81,7 @@
extern struct group *getgrgid (__gid_t __gid) __THROW;
/* Search for an entry with a matching group name. */
-extern struct group *getgrnam (__const char *__name) __THROW;
+extern struct group *getgrnam (const char *__name) __THROW;
#if defined __USE_POSIX || defined __USE_MISC
@@ -111,7 +111,7 @@
struct group **__restrict __result) __THROW;
/* Search for an entry with a matching group name. */
-extern int getgrnam_r (__const char *__restrict __name,
+extern int getgrnam_r (const char *__restrict __name,
struct group *__restrict __resultbuf,
char *__restrict __buffer, size_t __buflen,
struct group **__restrict __result) __THROW;
@@ -134,12 +134,12 @@
# include <stddef.h>
/* Set the group set for the current user to GROUPS (N of them). */
-extern int setgroups (size_t __n, __const __gid_t *__groups) __THROW;
+extern int setgroups (size_t __n, const __gid_t *__groups) __THROW;
/* Initialize the group set for the current user
by reading the group database and using all groups
of which USER is a member. Also include GROUP. */
-extern int initgroups (__const char *__user, __gid_t __group) __THROW;
+extern int initgroups (const char *__user, __gid_t __group) __THROW;
#endif /* Use BSD. */
============================================================
Index: iconv/gconv.h
--- iconv/gconv.h 1999/10/09 21:18:49 1.16
+++ iconv/gconv.h 1999/12/31 16:25:20
@@ -58,7 +58,7 @@
/* Type of a conversion function. */
typedef int (*__gconv_fct) (struct __gconv_step *, struct __gconv_step_data *,
- __const unsigned char **, __const unsigned char *,
+ const unsigned char **, const unsigned char *,
size_t *, int);
/* Constructor and destructor for local data for conversion step. */
@@ -70,12 +70,12 @@
struct __gconv_step
{
struct __gconv_loaded_object *__shlib_handle;
- __const char *__modname;
+ const char *__modname;
int __counter;
- __const char *__from_name;
- __const char *__to_name;
+ const char *__from_name;
+ const char *__to_name;
__gconv_fct __fct;
__gconv_init_fct __init_fct;
============================================================
Index: iconv/iconv.h
--- iconv/iconv.h 1999/10/09 21:18:53 1.3
+++ iconv/iconv.h 1999/12/31 16:25:20
@@ -32,13 +32,13 @@
/* Allocate descriptor for code conversion from codeset FROMCODE to
codeset TOCODE. */
-extern iconv_t iconv_open (__const char *__tocode, __const char *__fromcode)
+extern iconv_t iconv_open (const char *__tocode, const char *__fromcode)
__THROW;
/* Convert at most *INBYTESLEFT bytes from *INBUF according to the
code conversion algorithm specified by CD and place up to
*OUTBYTESLEFT bytes in buffer at *OUTBUF. */
-extern size_t iconv (iconv_t cd, __const char **__restrict __inbuf,
+extern size_t iconv (iconv_t cd, const char **__restrict __inbuf,
size_t *__restrict __inbytesleft,
char **__restrict __outbuf,
size_t *__restrict __outbytesleft);
============================================================
Index: inet/arpa/inet.h
--- inet/arpa/inet.h 1999/10/19 03:04:50 1.14
+++ inet/arpa/inet.h 1999/12/31 16:25:20
@@ -28,11 +28,11 @@
/* Convert Internet host address from numbers-and-dots notation in CP
into binary data in network byte order. */
-extern u_int32_t inet_addr (__const char *__cp) __THROW;
+extern u_int32_t inet_addr (const char *__cp) __THROW;
/* Convert Internet host address from numbers-and-dots notation in CP
into binary data and store the result in the structure INP. */
-extern int inet_aton (__const char *__cp, struct in_addr *__inp) __THROW;
+extern int inet_aton (const char *__cp, struct in_addr *__inp) __THROW;
/* Return the local host address part of the Internet address in IN. */
extern u_int32_t inet_lnaof (struct in_addr __in) __THROW;
@@ -50,18 +50,18 @@
/* Extract the network number in network byte order from the address
in numbers-and-dots natation starting at CP. */
-extern u_int32_t inet_network (__const char *__cp) __THROW;
+extern u_int32_t inet_network (const char *__cp) __THROW;
/* Convert network number for interface type AF in buffer starting at
CP to presentation format. The result will specifiy BITS bits of
the number. */
-extern char *inet_net_ntop (int __af, __const void *__cp, int __bits,
+extern char *inet_net_ntop (int __af, const void *__cp, int __bits,
char *__buf, size_t __len) __THROW;
/* Convert network number for interface type AF from presentation in
buffer starting at CP to network format and store result int
buffer starting at BUF of size LEN. */
-extern int inet_net_pton (int __af, __const char *__cp,
+extern int inet_net_pton (int __af, const char *__cp,
void *__buf, size_t __len) __THROW;
/* Convert Internet number in IN to ASCII representation. The return value
@@ -71,23 +71,23 @@
/* Convert from presentation format of an Internet number in buffer
starting at CP to the binary network format and store result for
interface type AF in buffer starting at BUF. */
-extern int inet_pton (int __af, __const char *__cp, void *__buf) __THROW;
+extern int inet_pton (int __af, const char *__cp, void *__buf) __THROW;
/* Convert a Internet address in binary network format for interface
type AF in buffer starting at CP to presentation form and place
result in buffer of length LEN astarting at BUF. */
-extern __const char *inet_ntop (int __af, __const void *__cp,
+extern const char *inet_ntop (int __af, const void *__cp,
char *__buf, size_t __len) __THROW;
/* Convert ASCII representation in hexadecimal form of the Internet
address to binary form and place result in buffer of length LEN
starting at BUF. */
-extern unsigned int inet_nsap_addr (__const char *__cp,
+extern unsigned int inet_nsap_addr (const char *__cp,
unsigned char *__buf, int __len) __THROW;
/* Convert internet address in binary form in LEN bytes starting at CP
a presentation form and place result in BUF. */
-extern char *inet_nsap_ntoa (int __len, __const unsigned char *__cp,
+extern char *inet_nsap_ntoa (int __len, const unsigned char *__cp,
char *__buf) __THROW;
__END_DECLS
============================================================
Index: intl/libintl.h
--- intl/libintl.h 1999/12/24 05:33:43 1.13
+++ intl/libintl.h 1999/12/31 16:25:20
@@ -35,32 +35,32 @@
/* Look up MSGID in the current default message catalog for the current
LC_MESSAGES locale. If not found, returns MSGID itself (the default
text). */
-extern char *gettext (__const char *__msgid) __THROW;
+extern char *gettext (const char *__msgid) __THROW;
/* Look up MSGID in the DOMAINNAME message catalog for the current
LC_MESSAGES locale. */
-extern char *dgettext (__const char *__domainname,
- __const char *__msgid) __THROW;
-extern char *__dgettext (__const char *__domainname,
- __const char *__msgid) __THROW;
+extern char *dgettext (const char *__domainname,
+ const char *__msgid) __THROW;
+extern char *__dgettext (const char *__domainname,
+ const char *__msgid) __THROW;
/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
locale. */
-extern char *dcgettext (__const char *__domainname,
- __const char *__msgid, int __category) __THROW;
-extern char *__dcgettext (__const char *__domainname,
- __const char *__msgid, int __category) __THROW;
+extern char *dcgettext (const char *__domainname,
+ const char *__msgid, int __category) __THROW;
+extern char *__dcgettext (const char *__domainname,
+ const char *__msgid, int __category) __THROW;
/* Set the current default message catalog to DOMAINNAME.
If DOMAINNAME is null, return the current default.
If DOMAINNAME is "", reset to the default of "messages". */
-extern char *textdomain (__const char *__domainname) __THROW;
+extern char *textdomain (const char *__domainname) __THROW;
/* Specify that the DOMAINNAME message catalog will be found
in DIRNAME rather than in the system locale data base. */
-extern char *bindtextdomain (__const char *__domainname,
- __const char *__dirname) __THROW;
+extern char *bindtextdomain (const char *__domainname,
+ const char *__dirname) __THROW;
/* Optimized version of the function above. */
============================================================
Index: io/sys/stat.h
--- io/sys/stat.h 1999/10/09 21:20:02 1.29
+++ io/sys/stat.h 1999/12/31 16:25:21
@@ -187,7 +187,7 @@
#ifndef __USE_FILE_OFFSET64
/* Get file attributes for FILE and put them in BUF. */
-extern int stat (__const char *__file, struct stat *__buf) __THROW;
+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. */
@@ -195,7 +195,7 @@
#else
# ifdef __REDIRECT
extern int __REDIRECT (stat,
- (__const char *__file, struct stat *__buf) __THROW,
+ (const char *__file, struct stat *__buf) __THROW,
stat64);
extern int __REDIRECT (fstat, (int __fd, struct stat *__buf) __THROW, fstat64);
# else
@@ -204,7 +204,7 @@
# endif
#endif
#ifdef __USE_LARGEFILE64
-extern int stat64 (__const char *__file, struct stat64 *__buf) __THROW;
+extern int stat64 (const char *__file, struct stat64 *__buf) __THROW;
extern int fstat64 (int __fd, struct stat64 *__buf) __THROW;
#endif
@@ -212,25 +212,25 @@
# 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 *__file, struct stat *__buf) __THROW;
+extern int lstat (const char *__file, struct stat *__buf) __THROW;
# else
# ifdef __REDIRECT
extern int __REDIRECT (lstat,
- (__const char *__file, struct stat *__buf) __THROW,
+ (const char *__file, struct stat *__buf) __THROW,
lstat64);
# else
# define lstat lstat64
# endif
# endif
# ifdef __USE_LARGEFILE64
-extern int lstat64 (__const char *__file, struct stat64 *__buf) __THROW;
+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 (__const char *__file, __mode_t __mode) __THROW;
+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
@@ -249,19 +249,19 @@
#endif
/* Create a new directory named PATH, with permission bits MODE. */
-extern int mkdir (__const char *__path, __mode_t __mode) __THROW;
+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 (__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 (__const char *__path, __mode_t __mode) __THROW;
+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,
@@ -288,18 +288,18 @@
/* Wrappers for stat and mknod system calls. */
#ifndef __USE_FILE_OFFSET64
extern int __fxstat (int __ver, int __fildes, struct stat *__stat_buf) __THROW;
-extern int __xstat (int __ver, __const char *__filename,
+extern int __xstat (int __ver, const char *__filename,
struct stat *__stat_buf) __THROW;
-extern int __lxstat (int __ver, __const char *__filename,
+extern int __lxstat (int __ver, const char *__filename,
struct stat *__stat_buf) __THROW;
#else
# ifdef __REDIRECT
extern int __REDIRECT (__fxstat, (int __ver, int __fildes,
struct stat *__stat_buf) __THROW,
__fxstat64);
-extern int __REDIRECT (__xstat, (int __ver, __const char *__filename,
+extern int __REDIRECT (__xstat, (int __ver, const char *__filename,
struct stat *__stat_buf) __THROW, __xstat64);
-extern int __REDIRECT (__lxstat, (int __ver, __const char *__filename,
+extern int __REDIRECT (__lxstat, (int __ver, const char *__filename,
struct stat *__stat_buf) __THROW,
__lxstat64);
@@ -313,25 +313,25 @@
#ifdef __USE_LARGEFILE64
extern int __fxstat64 (int __ver, int __fildes, struct stat64 *__stat_buf)
__THROW;
-extern int __xstat64 (int __ver, __const char *__filename,
+extern int __xstat64 (int __ver, const char *__filename,
struct stat64 *__stat_buf) __THROW;
-extern int __lxstat64 (int __ver, __const char *__filename,
+extern int __lxstat64 (int __ver, const char *__filename,
struct stat64 *__stat_buf) __THROW;
#endif
-extern int __xmknod (int __ver, __const char *__path, __mode_t __mode,
+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. */
-extern __inline__ int stat (__const char *__path,
+extern __inline__ int stat (const char *__path,
struct stat *__statbuf) __THROW
{
return __xstat (_STAT_VER, __path, __statbuf);
}
# if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
-extern __inline__ int lstat (__const char *__path,
+extern __inline__ int lstat (const char *__path,
struct stat *__statbuf) __THROW
{
return __lxstat (_STAT_VER, __path, __statbuf);
@@ -344,7 +344,7 @@
}
# if defined __USE_MISC || defined __USE_BSD
-extern __inline__ int mknod (__const char *__path, __mode_t __mode,
+extern __inline__ int mknod (const char *__path, __mode_t __mode,
__dev_t __dev) __THROW
{
return __xmknod (_MKNOD_VER, __path, __mode, &__dev);
@@ -352,14 +352,14 @@
# endif
# ifdef __USE_LARGEFILE64
-extern __inline__ int stat64 (__const char *__path,
+extern __inline__ int stat64 (const char *__path,
struct stat64 *__statbuf) __THROW
{
return __xstat64 (_STAT_VER, __path, __statbuf);
}
# if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
-extern __inline__ int lstat64 (__const char *__path,
+extern __inline__ int lstat64 (const char *__path,
struct stat64 *__statbuf) __THROW
{
return __lxstat64 (_STAT_VER, __path, __statbuf);
============================================================
Index: io/ftw.h
--- io/ftw.h 1999/10/09 21:19:50 1.16
+++ io/ftw.h 1999/12/31 16:25:21
@@ -86,37 +86,37 @@
/* Convenient types for callback functions. */
-typedef int (*__ftw_func_t) (__const char *__filename,
- __const struct stat *__status, int __flag);
+typedef int (*__ftw_func_t) (const char *__filename,
+ const struct stat *__status, int __flag);
#ifdef __USE_LARGEFILE64
-typedef int (*__ftw64_func_t) (__const char *__filename,
- __const struct stat64 *__status, int __flag);
+typedef int (*__ftw64_func_t) (const char *__filename,
+ const struct stat64 *__status, int __flag);
#endif
#ifdef __USE_XOPEN_EXTENDED
-typedef int (*__nftw_func_t) (__const char *__filename,
- __const struct stat *__status, int __flag,
+typedef int (*__nftw_func_t) (const char *__filename,
+ const struct stat *__status, int __flag,
struct FTW *__info);
# ifdef __USE_LARGEFILE64
-typedef int (*__nftw64_func_t) (__const char *__filename,
- __const struct stat64 *__status,
+typedef int (*__nftw64_func_t) (const char *__filename,
+ const struct stat64 *__status,
int __flag, struct FTW *__info);
# endif
#endif
/* Call a function on every element in a directory tree. */
#ifndef __USE_FILE_OFFSET64
-extern int ftw (__const char *__dir, __ftw_func_t __func, int __descriptors)
+extern int ftw (const char *__dir, __ftw_func_t __func, int __descriptors)
__THROW;
#else
# ifdef __REDIRECT
-extern int __REDIRECT (ftw, (__const char *__dir, __ftw_func_t __func,
+extern int __REDIRECT (ftw, (const char *__dir, __ftw_func_t __func,
int __descriptors) __THROW, ftw64);
# else
# define ftw ftw64
# endif
#endif
#ifdef __USE_LARGEFILE64
-extern int ftw64 (__const char *__dir, __ftw64_func_t __func,
+extern int ftw64 (const char *__dir, __ftw64_func_t __func,
int __descriptors) __THROW;
#endif
@@ -124,18 +124,18 @@
/* Call a function on every element in a directory tree. FLAG allows
to specify the behaviour more detailed. */
# ifndef __USE_FILE_OFFSET64
-extern int nftw (__const char *__dir, __nftw_func_t __func, int __descriptors,
+extern int nftw (const char *__dir, __nftw_func_t __func, int __descriptors,
int __flag) __THROW;
# else
# ifdef __REDIRECT
-extern int __REDIRECT (nftw, (__const char *__dir, __nftw_func_t __func,
+extern int __REDIRECT (nftw, (const char *__dir, __nftw_func_t __func,
int __descriptors, int __flag) __THROW, nftw64);
# else
# define nftw nftw64
# endif
# endif
# ifdef __USE_LARGEFILE64
-extern int nftw64 (__const char *__dir, __nftw64_func_t __func,
+extern int nftw64 (const char *__dir, __nftw64_func_t __func,
int __descriptors, int __flag) __THROW;
# endif
#endif
============================================================
Index: libio/libio.h
--- libio/libio.h 1999/10/09 21:20:16 1.39
+++ libio/libio.h 1999/12/31 16:25:21
@@ -337,7 +337,7 @@
opened for append (__mode.__append set), then set the file pointer
to the end of the file and then do the write; if not, just write at
the current file pointer. */
-typedef __ssize_t __io_write_fn (void *__cookie, __const char *__buf,
+typedef __ssize_t __io_write_fn (void *__cookie, const char *__buf,
size_t __n);
/* Move COOKIE's file position to *POS bytes from the
============================================================
Index: libio/stdio.h
--- libio/stdio.h 1999/12/19 08:01:21 1.60
+++ libio/stdio.h 1999/12/31 16:25:22
@@ -120,9 +120,9 @@
#define stderr stderr
/* Remove file FILENAME. */
-extern int remove (__const char *__filename) __THROW;
+extern int remove (const char *__filename) __THROW;
/* Rename file OLD to NEW. */
-extern int rename (__const char *__old, __const char *__new) __THROW;
+extern int rename (const char *__old, const char *__new) __THROW;
/* Create a temporary file and open it read/write. */
@@ -156,7 +156,7 @@
If not and if DIR is not NULL, that value is checked. If that fails,
P_tmpdir is tried and finally "/tmp". The storage for the filename
is allocated by `malloc'. */
-extern char *tempnam (__const char *__dir, __const char *__pfx)
+extern char *tempnam (const char *__dir, const char *__pfx)
__THROW __attribute_malloc__;
#endif
@@ -179,19 +179,19 @@
#ifndef __USE_FILE_OFFSET64
/* Open a file and create a new stream for it. */
-extern FILE *fopen (__const char *__restrict __filename,
- __const char *__restrict __modes) __THROW;
+extern FILE *fopen (const char *__restrict __filename,
+ const char *__restrict __modes) __THROW;
/* Open a file, replacing an existing stream with it. */
-extern FILE *freopen (__const char *__restrict __filename,
- __const char *__restrict __modes,
+extern FILE *freopen (const char *__restrict __filename,
+ const char *__restrict __modes,
FILE *__restrict __stream) __THROW;
#else
# ifdef __REDIRECT
-extern FILE *__REDIRECT (fopen, (__const char *__restrict __filename,
- __const char *__restrict __modes) __THROW,
+extern FILE *__REDIRECT (fopen, (const char *__restrict __filename,
+ const char *__restrict __modes) __THROW,
fopen64);
-extern FILE *__REDIRECT (freopen, (__const char *__restrict __filename,
- __const char *__restrict __modes,
+extern FILE *__REDIRECT (freopen, (const char *__restrict __filename,
+ const char *__restrict __modes,
FILE *__restrict __stream) __THROW,
freopen64);
# else
@@ -200,23 +200,23 @@
# endif
#endif
#ifdef __USE_LARGEFILE64
-extern FILE *fopen64 (__const char *__restrict __filename,
- __const char *__restrict __modes) __THROW;
-extern FILE *freopen64 (__const char *__restrict __filename,
- __const char *__restrict __modes,
+extern FILE *fopen64 (const char *__restrict __filename,
+ const char *__restrict __modes) __THROW;
+extern FILE *freopen64 (const char *__restrict __filename,
+ const char *__restrict __modes,
FILE *__restrict __stream) __THROW;
#endif
#ifdef __USE_POSIX
/* Create a new stream that refers to an existing system file descriptor. */
-extern FILE *fdopen (int __fd, __const char *__modes) __THROW;
+extern FILE *fdopen (int __fd, const char *__modes) __THROW;
#endif
#ifdef __USE_GNU
/* Create a new stream that refers to the given magic cookie,
and uses the given functions for input and output. */
extern FILE *fopencookie (void *__restrict __magic_cookie,
- __const char *__restrict __modes,
+ const char *__restrict __modes,
_IO_cookie_io_functions_t __io_funcs) __THROW;
/* Open a stream that writes into a malloc'd buffer that is expanded as
@@ -249,81 +249,81 @@
/* Write formatted output to STREAM. */
extern int fprintf (FILE *__restrict __stream,
- __const char *__restrict __format, ...) __THROW;
+ const char *__restrict __format, ...) __THROW;
/* Write formatted output to stdout. */
-extern int printf (__const char *__restrict __format, ...) __THROW;
+extern int printf (const char *__restrict __format, ...) __THROW;
/* Write formatted output to S. */
extern int sprintf (char *__restrict __s,
- __const char *__restrict __format, ...) __THROW;
+ const char *__restrict __format, ...) __THROW;
/* Write formatted output to S from argument list ARG. */
-extern int vfprintf (FILE *__restrict __s, __const char *__restrict __format,
+extern int vfprintf (FILE *__restrict __s, const char *__restrict __format,
_G_va_list __arg) __THROW;
/* Write formatted output to stdout from argument list ARG. */
-extern int vprintf (__const char *__restrict __format, _G_va_list __arg)
+extern int vprintf (const char *__restrict __format, _G_va_list __arg)
__THROW;
/* Write formatted output to S from argument list ARG. */
-extern int vsprintf (char *__restrict __s, __const char *__restrict __format,
+extern int vsprintf (char *__restrict __s, const char *__restrict __format,
_G_va_list __arg) __THROW;
#if defined __USE_BSD || defined __USE_ISOC99 || defined __USE_UNIX98
/* Maximum chars of output to write in MAXLEN. */
extern int snprintf (char *__restrict __s, size_t __maxlen,
- __const char *__restrict __format, ...)
+ const char *__restrict __format, ...)
__THROW __attribute__ ((__format__ (__printf__, 3, 4)));
extern int __vsnprintf (char *__restrict __s, size_t __maxlen,
- __const char *__restrict __format, _G_va_list __arg)
+ const char *__restrict __format, _G_va_list __arg)
__THROW __attribute__ ((__format__ (__printf__, 3, 0)));
extern int vsnprintf (char *__restrict __s, size_t __maxlen,
- __const char *__restrict __format, _G_va_list __arg)
+ const char *__restrict __format, _G_va_list __arg)
__THROW __attribute__ ((__format__ (__printf__, 3, 0)));
#endif
#ifdef __USE_GNU
/* Write formatted output to a string dynamically allocated with `malloc'.
Store the address of the string in *PTR. */
-extern int vasprintf (char **__restrict __ptr, __const char *__restrict __f,
+extern int vasprintf (char **__restrict __ptr, const char *__restrict __f,
_G_va_list __arg)
__THROW __attribute__ ((__format__ (__printf__, 2, 0)));
extern int __asprintf (char **__restrict __ptr,
- __const char *__restrict __fmt, ...)
+ const char *__restrict __fmt, ...)
__THROW __attribute__ ((__format__ (__printf__, 2, 3)));
extern int asprintf (char **__restrict __ptr,
- __const char *__restrict __fmt, ...)
+ const char *__restrict __fmt, ...)
__THROW __attribute__ ((__format__ (__printf__, 2, 3)));
/* Write formatted output to a file descriptor. */
-extern int vdprintf (int __fd, __const char *__restrict __fmt,
+extern int vdprintf (int __fd, const char *__restrict __fmt,
_G_va_list __arg)
__THROW __attribute__ ((__format__ (__printf__, 2, 0)));
-extern int dprintf (int __fd, __const char *__restrict __fmt, ...)
+extern int dprintf (int __fd, const char *__restrict __fmt, ...)
__THROW __attribute__ ((__format__ (__printf__, 2, 3)));
#endif
/* Read formatted input from STREAM. */
extern int fscanf (FILE *__restrict __stream,
- __const char *__restrict __format, ...) __THROW;
+ const char *__restrict __format, ...) __THROW;
/* Read formatted input from stdin. */
-extern int scanf (__const char *__restrict __format, ...) __THROW;
+extern int scanf (const char *__restrict __format, ...) __THROW;
/* Read formatted input from S. */
-extern int sscanf (__const char *__restrict __s,
- __const char *__restrict __format, ...) __THROW;
+extern int sscanf (const char *__restrict __s,
+ const char *__restrict __format, ...) __THROW;
#ifdef __USE_ISOC99
/* Read formatted input from S into argument list ARG. */
-extern int vfscanf (FILE *__restrict __s, __const char *__restrict __format,
+extern int vfscanf (FILE *__restrict __s, const char *__restrict __format,
_G_va_list __arg)
__THROW __attribute__ ((__format__ (__scanf__, 2, 0)));
/* Read formatted input from stdin into argument list ARG. */
-extern int vscanf (__const char *__restrict __format, _G_va_list __arg)
+extern int vscanf (const char *__restrict __format, _G_va_list __arg)
__THROW __attribute__ ((__format__ (__scanf__, 1, 0)));
/* Read formatted input from S into argument list ARG. */
-extern int vsscanf (__const char *__restrict __s,
- __const char *__restrict __format, _G_va_list __arg)
+extern int vsscanf (const char *__restrict __s,
+ const char *__restrict __format, _G_va_list __arg)
__THROW __attribute__ ((__format__ (__scanf__, 2, 0)));
#endif /* Use ISO C9x. */
@@ -419,17 +419,17 @@
/* Write a string to STREAM. */
-extern int fputs (__const char *__restrict __s, FILE *__restrict __stream)
+extern int fputs (const char *__restrict __s, FILE *__restrict __stream)
__THROW;
#ifdef __USE_GNU
/* This function does the same as `fputs' but does not lock the stream. */
-extern int fputs_unlocked (__const char *__restrict __s,
+extern int fputs_unlocked (const char *__restrict __s,
FILE *__restrict __stream) __THROW;
#endif
/* Write a string, followed by a newline, to stdout. */
-extern int puts (__const char *__s) __THROW;
+extern int puts (const char *__s) __THROW;
/* Push a character back onto the input buffer of STREAM. */
@@ -440,14 +440,14 @@
extern size_t fread (void *__restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __stream) __THROW;
/* Write chunks of generic data to STREAM. */
-extern size_t fwrite (__const void *__restrict __ptr, size_t __size,
+extern size_t fwrite (const void *__restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __s) __THROW;
#ifdef __USE_MISC
/* Faster versions when locking is not necessary. */
extern size_t fread_unlocked (void *__restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __stream) __THROW;
-extern size_t fwrite_unlocked (__const void *__restrict __ptr, size_t __size,
+extern size_t fwrite_unlocked (const void *__restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __stream) __THROW;
#endif
@@ -492,7 +492,7 @@
extern int fgetpos (FILE *__restrict __stream, fpos_t *__restrict __pos)
__THROW;
/* Set STREAM's position. */
-extern int fsetpos (FILE *__stream, __const fpos_t *__pos) __THROW;
+extern int fsetpos (FILE *__stream, const fpos_t *__pos) __THROW;
#else
# ifdef __REDIRECT
# ifdef __USE_UNIX98
@@ -504,7 +504,7 @@
extern int __REDIRECT (fgetpos, (FILE *__restrict __stream,
fpos_t *__restrict __pos) __THROW, fgetpos64);
extern int __REDIRECT (fsetpos,
- (FILE *__stream, __const fpos_t *__pos) __THROW,
+ (FILE *__stream, const fpos_t *__pos) __THROW,
fsetpos64);
# else
# ifdef __USE_UNIX98
@@ -523,7 +523,7 @@
# endif
extern int fgetpos64 (FILE *__restrict __stream, fpos64_t *__restrict __pos)
__THROW;
-extern int fsetpos64 (FILE *__stream, __const fpos64_t *__pos) __THROW;
+extern int fsetpos64 (FILE *__stream, const fpos64_t *__pos) __THROW;
#endif
/* Clear the error and EOF indicators for STREAM. */
@@ -542,17 +542,17 @@
/* Print a message describing the meaning of the value of errno. */
-extern void perror (__const char *__s) __THROW;
+extern void perror (const char *__s) __THROW;
/* These variables normally should not be used directly. The `strerror'
function provides all the needed functionality. */
#ifdef __USE_BSD
extern int sys_nerr;
-extern __const char *__const sys_errlist[];
+extern const char *const sys_errlist[];
#endif
#ifdef __USE_GNU
extern int _sys_nerr;
-extern __const char *__const _sys_errlist[];
+extern const char *const _sys_errlist[];
#endif
@@ -570,7 +570,7 @@
#if (defined __USE_POSIX2 || defined __USE_SVID || defined __USE_BSD || \
defined __USE_MISC)
/* Create a new stream connected to a pipe running the given command. */
-extern FILE *popen (__const char *__command, __const char *__modes) __THROW;
+extern FILE *popen (const char *__command, const char *__modes) __THROW;
/* Close a stream opened by popen and return the status of its child. */
extern int pclose (FILE *__stream) __THROW;
@@ -594,9 +594,9 @@
/* Write formatted output to an obstack. */
extern int obstack_printf (struct obstack *__restrict __obstack,
- __const char *__restrict __format, ...) __THROW;
+ const char *__restrict __format, ...) __THROW;
extern int obstack_vprintf (struct obstack *__restrict __obstack,
- __const char *__restrict __format,
+ const char *__restrict __format,
_G_va_list __args) __THROW;
#endif /* Use GNU. */
============================================================
Index: locale/locale.h
--- locale/locale.h 1999/11/18 16:23:31 1.12
+++ locale/locale.h 1999/12/31 16:25:22
@@ -94,7 +94,7 @@
/* Set and/or return the current locale. */
-extern char *setlocale (int __category, __const char *__locale) __THROW;
+extern char *setlocale (int __category, const char *__locale) __THROW;
/* Return the numeric/monetary information for the current locale. */
extern struct lconv *localeconv (void) __THROW;
@@ -120,7 +120,7 @@
I.e., 1 << LC_CTYPE means to load data for this category. If
BASE is non-null the appropriate category information in the BASE
record is replaced. */
-extern __locale_t __newlocale (int __category_mask, __const char *__locale,
+extern __locale_t __newlocale (int __category_mask, const char *__locale,
__locale_t __base) __THROW;
/* Return a duplicate of the set of locale in DATASET. All usage
============================================================
Index: login/utmp.h
--- login/utmp.h 1999/10/09 21:20:42 1.16
+++ login/utmp.h 1999/12/31 16:25:22
@@ -43,21 +43,21 @@
/* Write the given entry into utmp and wtmp. */
-extern void login (__const struct utmp *__entry) __THROW;
+extern void login (const struct utmp *__entry) __THROW;
/* Write the utmp entry to say the user on UT_LINE has logged out. */
-extern int logout (__const char *__ut_line) __THROW;
+extern int logout (const char *__ut_line) __THROW;
/* Append to wtmp an entry for the current time and the given info. */
-extern void logwtmp (__const char *__ut_line, __const char *__ut_name,
- __const char *__ut_host) __THROW;
+extern void logwtmp (const char *__ut_line, const char *__ut_name,
+ const char *__ut_host) __THROW;
/* Append entry UTMP to the wtmp-like file WTMP_FILE. */
-extern void updwtmp (__const char *__wtmp_file, __const struct utmp *__utmp)
+extern void updwtmp (const char *__wtmp_file, const struct utmp *__utmp)
__THROW;
/* Change name of the utmp file to be examined. */
-extern int utmpname (__const char *__file) __THROW;
+extern int utmpname (const char *__file) __THROW;
/* Read next entry from a utmp-like file. */
extern struct utmp *getutent (void) __THROW;
@@ -70,24 +70,24 @@
/* Search forward from the current point in the utmp file until the
next entry with a ut_type matching ID->ut_type. */
-extern struct utmp *getutid (__const struct utmp *__id) __THROW;
+extern struct utmp *getutid (const struct utmp *__id) __THROW;
/* Search forward from the current point in the utmp file until the
next entry with a ut_line matching LINE->ut_line. */
-extern struct utmp *getutline (__const struct utmp *__line) __THROW;
+extern struct utmp *getutline (const struct utmp *__line) __THROW;
/* Write out entry pointed to by UTMP_PTR into the utmp file. */
-extern struct utmp *pututline (__const struct utmp *__utmp_ptr) __THROW;
+extern struct utmp *pututline (const struct utmp *__utmp_ptr) __THROW;
#ifdef __USE_MISC
/* Reentrant versions of the file for handling utmp files. */
extern int getutent_r (struct utmp *__buffer, struct utmp **__result) __THROW;
-extern int getutid_r (__const struct utmp *__id, struct utmp *__buffer,
+extern int getutid_r (const struct utmp *__id, struct utmp *__buffer,
struct utmp **__result) __THROW;
-extern int getutline_r (__const struct utmp *__line,
+extern int getutline_r (const struct utmp *__line,
struct utmp *__buffer, struct utmp **__result) __THROW;
#endif /* Use misc. */
============================================================
Index: misc/sys/syslog.h
--- misc/sys/syslog.h 1999/10/09 21:22:07 1.10
+++ misc/sys/syslog.h 1999/12/31 16:25:23
@@ -172,18 +172,18 @@
extern void closelog (void) __THROW;
/* Open connection to system logger. */
-extern void openlog (__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 (int __mask) __THROW;
/* Generate a log message using FMT string and option arguments. */
-extern void syslog (int __pri, __const char *__fmt, ...) __THROW;
+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 (int __pri, __const char *__fmt, __gnuc_va_list __ap)
+extern void vsyslog (int __pri, const char *__fmt, __gnuc_va_list __ap)
__THROW;
#endif
============================================================
Index: misc/sys/uio.h
--- misc/sys/uio.h 1999/10/09 21:22:12 1.10
+++ misc/sys/uio.h 1999/12/31 16:25:23
@@ -34,7 +34,7 @@
The buffers are filled in the order specified.
Operates just like `read' (see <unistd.h>) except that data are
put in VECTOR instead of a contiguous buffer. */
-extern ssize_t readv (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
@@ -42,7 +42,7 @@
The data is written in the order specified.
Operates just like `write' (see <unistd.h>) except that the data
are taken from VECTOR instead of a contiguous buffer. */
-extern ssize_t writev (int __fd, __const struct iovec *__vector, int __count)
+extern ssize_t writev (int __fd, const struct iovec *__vector, int __count)
__THROW;
__END_DECLS
============================================================
Index: misc/err.h
--- misc/err.h 1999/10/09 21:21:08 1.6
+++ misc/err.h 1999/12/31 16:25:23
@@ -32,25 +32,25 @@
/* Print "program: ", FORMAT, ": ", the standard error string for errno,
and a newline, on stderr. */
-extern void warn (__const char *__format, ...)
+extern void warn (const char *__format, ...)
__THROW __attribute__ ((__format__ (__printf__, 1, 2)));
-extern void vwarn (__const char *__format, __gnuc_va_list)
+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 (__const char *__format, ...)
+extern void warnx (const char *__format, ...)
__THROW __attribute__ ((__format__ (__printf__, 1, 2)));
-extern void vwarnx (__const char *__format, __gnuc_va_list)
+extern void vwarnx (const char *__format, __gnuc_va_list)
__THROW __attribute__ ((__format__ (__printf__, 1, 0)));
/* Likewise, and then exit with STATUS. */
-extern void err (int __status, __const char *__format, ...)
+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)
+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, ...)
+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)
+extern void verrx (int __status, const char *, __gnuc_va_list)
__THROW __attribute__ ((__noreturn__, __format__ (__printf__, 2, 0)));
__END_DECLS
============================================================
Index: misc/mntent.h
--- misc/mntent.h 1999/10/09 21:21:21 1.12
+++ misc/mntent.h 1999/12/31 16:25:23
@@ -64,7 +64,7 @@
/* Prepare to begin reading and/or writing mount table entries from the
beginning of FILE. MODE is as for `fopen'. */
-extern FILE *setmntent (__const char *__file, __const char *__mode) __THROW;
+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
@@ -82,15 +82,15 @@
/* Write the mount table entry described by MNT to STREAM.
Return zero on success, nonzero on failure. */
extern int addmntent (FILE *__restrict __stream,
- __const struct mntent *__restrict __mnt) __THROW;
+ const struct mntent *__restrict __mnt) __THROW;
/* Close a stream opened with `setmntent'. */
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 (__const struct mntent *__mnt,
- __const char *__opt) __THROW;
+extern char *hasmntopt (const struct mntent *__mnt,
+ const char *__opt) __THROW;
__END_DECLS
============================================================
Index: misc/regexp.h
--- misc/regexp.h 1999/10/09 21:21:26 1.10
+++ misc/regexp.h 1999/12/31 16:25:23
@@ -99,7 +99,7 @@
on the macros. */
char *
compile (char *__restrict instring, char *__restrict expbuf,
- __const char *__restrict endbuf, int eof)
+ const char *__restrict endbuf, int eof)
{
char *__input_buffer = NULL;
size_t __input_size = 0;
@@ -206,14 +206,14 @@
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 (__const char *__restrict __string,
- __const char *__restrict __expbuf) __THROW;
+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 (__const char *__restrict __string,
- __const char *__restrict __expbuf) __THROW;
+extern int advance (const char *__restrict __string,
+ const char *__restrict __expbuf) __THROW;
__END_DECLS
============================================================
Index: misc/search.h
--- misc/search.h 1999/10/09 21:21:30 1.21
+++ misc/search.h 1999/12/31 16:25:24
@@ -52,7 +52,7 @@
/* For use with hsearch(3). */
#ifndef __COMPAR_FN_T
# define __COMPAR_FN_T
-typedef int (*__compar_fn_t) (__const void *, __const void *);
+typedef int (*__compar_fn_t) (const void *, const void *);
# ifdef __USE_GNU
typedef __compar_fn_t comparison_fn_t;
@@ -127,27 +127,27 @@
/* 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 (__const void *__key, void **__rootp,
+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 (__const void *__key, void *__const *__rootp,
+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 (__const void *__key, void **__rootp,
+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) (__const void *__nodep, VISIT __value,
+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 (__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
@@ -161,12 +161,12 @@
/* Perform linear search for KEY by comparing by COMPAR in an array
[BASE,BASE+NMEMB*SIZE). */
-extern void *lfind (__const void *__key, __const void *__base,
+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 (__const void *__key, void *__base,
+extern void *lsearch (const void *__key, void *__base,
size_t *__nmemb, size_t __size, __compar_fn_t __compar);
__END_DECLS
============================================================
Index: misc/sgtty.h
--- misc/sgtty.h 1999/10/10 15:44:29 1.10
+++ misc/sgtty.h 1999/12/31 16:25:24
@@ -33,7 +33,7 @@
extern int gtty (int __fd, struct sgttyb *__params) __THROW;
/* Set the terminal parameters associated with FD to *PARAMS. */
-extern int stty (int __fd, __const struct sgttyb *__params) __THROW;
+extern int stty (int __fd, const struct sgttyb *__params) __THROW;
__END_DECLS
============================================================
Index: nss/nss.h
--- nss/nss.h 1999/10/09 21:22:20 1.7
+++ nss/nss.h 1999/12/31 16:25:24
@@ -44,8 +44,8 @@
work around non-existing services (e.e., while booting).
Attention: Using this function repeatedly will slowly eat up the
whole memory since previous selection data cannot be freed. */
-extern int __nss_configure_lookup (__const char *__dbname,
- __const char *__string) __THROW;
+extern int __nss_configure_lookup (const char *__dbname,
+ const char *__string) __THROW;
__END_DECLS
============================================================
Index: posix/sched.h
--- posix/sched.h 1999/10/09 21:22:25 1.8
+++ posix/sched.h 1999/12/31 16:25:24
@@ -34,7 +34,7 @@
__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. */
@@ -42,7 +42,7 @@
/* 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;
============================================================
Index: posix/unistd.h
--- posix/unistd.h 1999/10/09 21:22:32 1.102
+++ posix/unistd.h 1999/12/31 16:25:25
@@ -250,12 +250,12 @@
#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;
+extern int access (const char *__name, int __type) __THROW;
#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) __THROW;
+extern int euidaccess (const char *__name, int __type) __THROW;
#endif
@@ -306,8 +306,8 @@
extern ssize_t read (int __fd, void *__buf, size_t __nbytes) __THROW;
/* Write N bytes of BUF to FD. Return the number written, or -1. */
-extern ssize_t __write (int __fd, __const void *__buf, size_t __n) __THROW;
-extern ssize_t write (int __fd, __const void *__buf, size_t __n) __THROW;
+extern ssize_t __write (int __fd, const void *__buf, size_t __n) __THROW;
+extern ssize_t write (int __fd, const void *__buf, size_t __n) __THROW;
#ifdef __USE_UNIX98
/* Read NBYTES into BUF from FD at the given position OFFSET without
@@ -317,20 +317,20 @@
__off64_t __offset) __THROW;
/* 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) __THROW;
# ifndef __USE_FILE_OFFSET64
extern ssize_t pread (int __fd, void *__buf, size_t __nbytes, __off_t __offset)
__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) __THROW;
# else
# ifdef __REDIRECT
extern ssize_t __REDIRECT (pread, (int __fd, void *__buf, size_t __nbytes,
__off64_t __offset) __THROW,
pread64);
-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)
__THROW,
pwrite64);
@@ -343,7 +343,7 @@
# ifdef __USE_LARGEFILE64
extern ssize_t pread64 (int __fd, void *__buf, size_t __nbytes,
__off64_t __offset) __THROW;
-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) __THROW;
# endif
#endif
@@ -392,7 +392,7 @@
/* 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;
#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
@@ -402,13 +402,13 @@
/* 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;
#endif /* Use BSD || X/Open Unix. */
/* Change the process's working directory to PATH. */
-extern int chdir (__const char *__path) __THROW;
+extern int chdir (const char *__path) __THROW;
#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
/* Change the process's working directory to the one FD is open on. */
@@ -454,36 +454,36 @@
/* 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;
+extern int execve (const char *__path, char *const __argv[],
+ char *const __envp[]) __THROW;
#ifdef __USE_GNU
/* 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;
#endif
/* Execute PATH with arguments ARGV and environment from `environ'. */
-extern int execv (__const char *__path, char *__const __argv[]) __THROW;
+extern int execv (const char *__path, char *const __argv[]) __THROW;
/* 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, ...) __THROW;
+extern int execle (const char *__path, const char *__arg, ...) __THROW;
/* Execute PATH with all arguments after PATH until
a NULL pointer and environment from `environ'. */
-extern int execl (__const char *__path, __const char *__arg, ...) __THROW;
+extern int execl (const char *__path, const char *__arg, ...) __THROW;
/* 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[]) __THROW;
+extern int execvp (const char *__file, char *const __argv[]) __THROW;
/* 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, ...) __THROW;
+extern int execlp (const char *__file, const char *__arg, ...) __THROW;
#if defined __USE_MISC || defined __USE_XOPEN
@@ -502,7 +502,7 @@
#include <bits/confname.h>
/* Get file-specific configuration information about PATH. */
-extern long int pathconf (__const char *__path, int __name) __THROW;
+extern long int pathconf (const char *__path, int __name) __THROW;
/* Get file-specific configuration about descriptor FD. */
extern long int fpathconf (int __fd, int __name) __THROW;
@@ -680,23 +680,23 @@
/* Make a link to FROM named TO. */
-extern int link (__const char *__from, __const char *__to) __THROW;
+extern int link (const char *__from, const char *__to) __THROW;
#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
/* Make a symbolic link to FROM named TO. */
-extern int symlink (__const char *__from, __const char *__to) __THROW;
+extern int symlink (const char *__from, const char *__to) __THROW;
/* 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 int readlink (__const char *__path, char *__buf, size_t __len) __THROW;
+extern int readlink (const char *__path, char *__buf, size_t __len) __THROW;
#endif /* Use BSD. */
/* Remove the link NAME. */
-extern int unlink (__const char *__name) __THROW;
+extern int unlink (const char *__name) __THROW;
/* Remove the directory PATH. */
-extern int rmdir (__const char *__path) __THROW;
+extern int rmdir (const char *__path) __THROW;
/* Return the foreground process group ID of FD. */
@@ -717,7 +717,7 @@
#ifdef __USE_BSD
/* Set the login name returned by `getlogin'. */
-extern int setlogin (__const char *__name) __THROW;
+extern int setlogin (const char *__name) __THROW;
#endif
@@ -739,7 +739,7 @@
/* 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) __THROW;
+extern int sethostname (const char *__name, size_t __len) __THROW;
/* Set the current machine's Internet number to ID.
This call is restricted to the super-user. */
@@ -750,7 +750,7 @@
Called just like `gethostname' and `sethostname'.
The NIS domain name is usually the empty string when not using NIS. */
extern int getdomainname (char *__name, size_t __len) __THROW;
-extern int setdomainname (__const char *__name, size_t __len) __THROW;
+extern int setdomainname (const char *__name, size_t __len) __THROW;
/* Make all changes done to FD actually appear on disk. */
@@ -763,7 +763,7 @@
extern int vhangup (void) __THROW;
/* Revoke the access of all descriptors currently open on FILE. */
-extern int revoke (__const char *__file) __THROW;
+extern int revoke (const char *__file) __THROW;
/* Enable statistical profiling, writing samples of the PC into at most
@@ -778,11 +778,11 @@
/* 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;
/* 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;
+extern int chroot (const char *__path) __THROW;
/* Successive calls return the shells listed in `/etc/shells'. */
@@ -793,7 +793,7 @@
/* 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) __THROW;
+extern char *getpass (const char *__prompt) __THROW;
/* Put the program in the background, and dissociate from the controlling
terminal. If NOCHDIR is zero, do `chdir ("/")'. If NOCLOSE is zero,
@@ -820,18 +820,18 @@
/* Truncate FILE to LENGTH bytes. */
#ifndef __USE_FILE_OFFSET64
-extern int truncate (__const char *__file, __off_t __length) __THROW;
+extern int truncate (const char *__file, __off_t __length) __THROW;
#else
# ifdef __REDIRECT
extern int __REDIRECT (truncate,
- (__const char *__file, __off64_t __length) __THROW,
+ (const char *__file, __off64_t __length) __THROW,
truncate64);
# else
# define truncate truncate64
# endif
#endif
#ifdef __USE_LARGEFILE64
-extern int truncate64 (__const char *__file, __off64_t __length) __THROW;
+extern int truncate64 (const char *__file, __off64_t __length) __THROW;
#endif
/* Truncate the file FD is open on to LENGTH bytes. */
@@ -946,10 +946,10 @@
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) __THROW;
+extern char *crypt (const char *__key, const char *__salt) __THROW;
/* Setup DES tables according KEY. */
-extern void setkey (__const char *__key) __THROW;
+extern void setkey (const char *__key) __THROW;
/* Encrypt data in BLOCK in place if EDFLAG is zero; otherwise decrypt
block in place. */
@@ -960,7 +960,7 @@
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 *__from, void *__to, ssize_t __n) __THROW;
+extern void swab (const void *__from, void *__to, ssize_t __n) __THROW;
#endif
@@ -975,7 +975,7 @@
extern char *cuserid (char *__s) __THROW;
/* Rename file OLD to NEW. */
-extern int rename (__const char *__old, __const char *__new) __THROW;
+extern int rename (const char *__old, const char *__new) __THROW;
#endif
============================================================
Index: resolv/netdb.h
--- resolv/netdb.h 1999/10/09 21:23:00 1.24
+++ resolv/netdb.h 1999/12/31 16:25:26
@@ -82,10 +82,10 @@
/* Print error indicated by `h_errno' variable on standard error. STR
if non-null is printed before the error string. */
-extern void herror (__const char *__str) __THROW;
+extern void herror (const char *__str) __THROW;
/* Return string associated with error ERR_NUM. */
-extern __const char *hstrerror (int __err_num) __THROW;
+extern const char *hstrerror (int __err_num) __THROW;
@@ -113,26 +113,26 @@
/* Return entry from host data base which address match ADDR with
length LEN and type TYPE. */
-extern struct hostent *gethostbyaddr (__const char *__addr, size_t __len,
+extern struct hostent *gethostbyaddr (const char *__addr, size_t __len,
int __type) __THROW;
/* Return entry from host data base for host with NAME. */
-extern struct hostent *gethostbyname (__const char *__name) __THROW;
+extern struct hostent *gethostbyname (const char *__name) __THROW;
/* Return entry from host data base for host with NAME. AF must be
set to the address type which is `AF_INET' for IPv4 or `AF_INET6'
for IPv6. */
-extern struct hostent *gethostbyname2 (__const char *__name, int __af) __THROW;
+extern struct hostent *gethostbyname2 (const char *__name, int __af) __THROW;
#ifdef __USE_UNIX98
/* Return entry from host data base which address match ADDR with
length LEN and type TYPE in newly allocated buffer. */
-extern struct hostent *getipnodebyaddr (__const char *__addr, size_t __len,
+extern struct hostent *getipnodebyaddr (const char *__addr, size_t __len,
int __type, int *__error_num) __THROW;
/* Return entry from host data base for host with NAME and newly allocated
buffer. FLAGS is some combination of the following AI_* values. */
-extern struct hostent *getipnodebyname (__const char *__name, int __type,
+extern struct hostent *getipnodebyname (const char *__name, int __type,
int __flags, int *__error_num) __THROW;
# define AI_V4MAPPED 1 /* IPv4-mapped addresses are acceptable. */
@@ -158,20 +158,20 @@
struct hostent **__restrict __result,
int *__restrict __h_errnop) __THROW;
-extern int gethostbyaddr_r (__const char *__restrict __addr, size_t __len,
+extern int gethostbyaddr_r (const char *__restrict __addr, size_t __len,
int __type,
struct hostent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
struct hostent **__restrict __result,
int *__restrict __h_errnop) __THROW;
-extern int gethostbyname_r (__const char *__restrict __name,
+extern int gethostbyname_r (const char *__restrict __name,
struct hostent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
struct hostent **__restrict __result,
int *__restrict __h_errnop) __THROW;
-extern int gethostbyname2_r (__const char *__restrict __name, int __af,
+extern int gethostbyname2_r (const char *__restrict __name, int __af,
struct hostent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
struct hostent **__restrict __result,
@@ -207,7 +207,7 @@
__THROW;
/* Return entry from network data base for network with NAME. */
-extern struct netent *getnetbyname (__const char *__name) __THROW;
+extern struct netent *getnetbyname (const char *__name) __THROW;
#ifdef __USE_MISC
/* Reentrant versions of the functions above. The additional
@@ -226,7 +226,7 @@
struct netent **__restrict __result,
int *__restrict __h_errnop) __THROW;
-extern int getnetbyname_r (__const char *__restrict __name,
+extern int getnetbyname_r (const char *__restrict __name,
struct netent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
struct netent **__restrict __result,
@@ -256,12 +256,12 @@
/* Return entry from network data base for network with NAME and
protocol PROTO. */
-extern struct servent *getservbyname (__const char *__name,
- __const char *__proto) __THROW;
+extern struct servent *getservbyname (const char *__name,
+ const char *__proto) __THROW;
/* Return entry from service data base which matches port PORT and
protocol PROTO. */
-extern struct servent *getservbyport (int __port, __const char *__proto)
+extern struct servent *getservbyport (int __port, const char *__proto)
__THROW;
@@ -272,13 +272,13 @@
char *__restrict __buf, size_t __buflen,
struct servent **__restrict __result) __THROW;
-extern int getservbyname_r (__const char *__restrict __name,
- __const char *__restrict __proto,
+extern int getservbyname_r (const char *__restrict __name,
+ const char *__restrict __proto,
struct servent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
struct servent **__restrict __result) __THROW;
-extern int getservbyport_r (int __port, __const char *__restrict __proto,
+extern int getservbyport_r (int __port, const char *__restrict __proto,
struct servent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
struct servent **__restrict __result) __THROW;
@@ -305,7 +305,7 @@
extern struct protoent *getprotoent (void) __THROW;
/* Return entry from protocol data base for network with NAME. */
-extern struct protoent *getprotobyname (__const char *__name) __THROW;
+extern struct protoent *getprotobyname (const char *__name) __THROW;
/* Return entry from protocol data base which number is PROTO. */
extern struct protoent *getprotobynumber (int __proto) __THROW;
@@ -318,7 +318,7 @@
char *__restrict __buf, size_t __buflen,
struct protoent **__restrict __result) __THROW;
-extern int getprotobyname_r (__const char *__restrict __name,
+extern int getprotobyname_r (const char *__restrict __name,
struct protoent *__restrict __result_buf,
char *__restrict __buf, size_t __buflen,
struct protoent **__restrict __result) __THROW;
@@ -331,7 +331,7 @@
/* Establish network group NETGROUP for enumeration. */
-extern int setnetgrent (__const char *__netgroup) __THROW;
+extern int setnetgrent (const char *__netgroup) __THROW;
/* Free all space allocated by previous `setnetgrent' call. */
extern void endnetgrent (void) __THROW;
@@ -343,8 +343,8 @@
char **__restrict __domainp) __THROW;
/* Test whether NETGROUP contains the triple (HOST,USER,DOMAIN). */
-extern int innetgr (__const char *__netgroup, __const char *__host,
- __const char *__user, __const char *domain) __THROW;
+extern int innetgr (const char *__netgroup, const char *__host,
+ const char *__user, const char *domain) __THROW;
#ifdef __USE_MISC
/* Reentrant version of `getnetgrent' where result is placed in BUFFER. */
@@ -363,9 +363,9 @@
reserved port. When the function returns *AHOST contains the
official host name. */
extern int rcmd (char **__restrict __ahost, unsigned short int __rport,
- __const char *__restrict __locuser,
- __const char *__restrict __remuser,
- __const char *__restrict __cmd, int *__restrict __fd2p)
+ const char *__restrict __locuser,
+ const char *__restrict __remuser,
+ const char *__restrict __cmd, int *__restrict __fd2p)
__THROW;
/* Call `rexecd' at port RPORT on remote machine *AHOST to execute
@@ -374,16 +374,16 @@
to the socket for the connection is returned. When the function
returns *AHOST contains the official host name. */
extern int rexec (char **__restrict __ahost, int __rport,
- __const char *__restrict __name,
- __const char *__restrict __pass,
- __const char *__restrict __cmd, int *__restrict __fd2p)
+ const char *__restrict __name,
+ const char *__restrict __pass,
+ const char *__restrict __cmd, int *__restrict __fd2p)
__THROW;
/* Check whether user REMUSER on system RHOST is allowed to login as LOCUSER.
If SUSER is not zero the user tries to become superuser. Return 0 if
it is possible. */
-extern int ruserok (__const char *__rhost, int __suser,
- __const char *__remuser, __const char *__locuser) __THROW;
+extern int ruserok (const char *__rhost, int __suser,
+ const char *__remuser, const char *__locuser) __THROW;
/* Try to allocate reserved port, returning a descriptor for a socket opened
at this port or -1 if unsuccessful. The search for an available port
@@ -436,9 +436,9 @@
/* Translate name of a service location and/or a service name to set of
socket addresses. */
-extern int getaddrinfo (__const char *__restrict __name,
- __const char *__restrict __service,
- __const struct addrinfo *__restrict __req,
+extern int getaddrinfo (const char *__restrict __name,
+ const char *__restrict __service,
+ const struct addrinfo *__restrict __req,
struct addrinfo **__restrict __pai) __THROW;
/* Free `addrinfo' structure AI including associated storage. */
@@ -448,7 +448,7 @@
extern char *gai_strerror (int __ecode) __THROW;
/* Translate a socket address to a location and service name. */
-extern int getnameinfo (__const struct sockaddr *__restrict __sa,
+extern int getnameinfo (const struct sockaddr *__restrict __sa,
socklen_t __salen, char *__restrict __host,
size_t __hostlen, char *__restrict __serv,
size_t __servlen, int __flags) __THROW;
============================================================
Index: resource/sys/resource.h
--- resource/sys/resource.h 1999/10/09 21:23:18 1.20
+++ resource/sys/resource.h 1999/12/31 16:25:26
@@ -50,11 +50,11 @@
Return 0 if successful, -1 if not (and sets errno). */
#ifndef __USE_FILE_OFFSET64
extern int setrlimit (enum __rlimit_resource __resource,
- __const struct rlimit *__rlimits) __THROW;
+ const struct rlimit *__rlimits) __THROW;
#else
# ifdef __REDIRECT
extern int __REDIRECT (setrlimit, (enum __rlimit_resource __resource,
- __const struct rlimit *__rlimits) __THROW,
+ const struct rlimit *__rlimits) __THROW,
setrlimit64);
# else
# define setrlimit setrlimit64
@@ -62,7 +62,7 @@
#endif
#ifdef __USE_LARGEFILE64
extern int setrlimit64 (enum __rlimit_resource __resource,
- __const struct rlimit64 *__rlimits) __THROW;
+ const struct rlimit64 *__rlimits) __THROW;
#endif
/* Return resource usage information on process indicated by WHO
============================================================
Index: rt/aio.h
--- rt/aio.h 1999/12/18 23:40:03 1.11
+++ rt/aio.h 1999/12/31 16:25:26
@@ -134,7 +134,7 @@
/* Allow user to specify optimization. */
#ifdef __USE_GNU
-extern void aio_init (__const struct aioinit *__init) __THROW;
+extern void aio_init (const struct aioinit *__init) __THROW;
#endif
@@ -145,11 +145,11 @@
extern int aio_write (struct aiocb *__aiocbp) __THROW;
/* Initiate list of I/O requests. */
-extern int lio_listio (int __mode, struct aiocb *__const __list[],
+extern int lio_listio (int __mode, struct aiocb *const __list[],
int __nent, struct sigevent *__restrict __sig) __THROW;
/* Retrieve error status associated with AIOCBP. */
-extern int aio_error (__const struct aiocb *__aiocbp) __THROW;
+extern int aio_error (const struct aiocb *__aiocbp) __THROW;
/* Return status associated with AIOCBP. */
extern __ssize_t aio_return (struct aiocb *__aiocbp) __THROW;
@@ -159,8 +159,8 @@
/* Suspend calling thread until at least one of the asynchronous I/O
operations referenced by LIST has completed. */
-extern int aio_suspend (__const struct aiocb *__const __list[], int __nent,
- __const struct timespec *__restrict __timeout) __THROW;
+extern int aio_suspend (const struct aiocb *const __list[], int __nent,
+ const struct timespec *__restrict __timeout) __THROW;
/* Force all operations associated with file desriptor described by
`aio_fildes' member of AIOCBP. */
@@ -172,11 +172,11 @@
aio_write64);
extern int __REDIRECT (lio_listio,
- (int __mode, struct aiocb *__const __list[],
+ (int __mode, struct aiocb *const __list[],
int __nent, struct sigevent *__restrict __sig) __THROW,
lio_listio64);
-extern int __REDIRECT (aio_error, (__const struct aiocb *__aiocbp) __THROW,
+extern int __REDIRECT (aio_error, (const struct aiocb *__aiocbp) __THROW,
aio_error64);
extern __ssize_t __REDIRECT (aio_return, (struct aiocb *__aiocbp) __THROW,
aio_return64);
@@ -186,9 +186,9 @@
aio_cancel64);
extern int __REDIRECT (aio_suspend,
- (__const struct aiocb *__const __list[],
+ (const struct aiocb *const __list[],
int __nent,
- __const struct timespec *__restrict __timeout) __THROW,
+ const struct timespec *__restrict __timeout) __THROW,
aio_suspend64);
extern int __REDIRECT (aio_fsync,
@@ -211,17 +211,17 @@
extern int aio_read64 (struct aiocb64 *__aiocbp) __THROW;
extern int aio_write64 (struct aiocb64 *__aiocbp) __THROW;
-extern int lio_listio64 (int __mode, struct aiocb64 *__const __list[],
+extern int lio_listio64 (int __mode, struct aiocb64 *const __list[],
int __nent, struct sigevent *__restrict __sig)
__THROW;
-extern int aio_error64 (__const struct aiocb64 *__aiocbp) __THROW;
+extern int aio_error64 (const struct aiocb64 *__aiocbp) __THROW;
extern __ssize_t aio_return64 (struct aiocb64 *__aiocbp) __THROW;
extern int aio_cancel64 (int __fildes, struct aiocb64 *__aiocbp) __THROW;
-extern int aio_suspend64 (__const struct aiocb64 *__const __list[], int __nent,
- __const struct timespec *__restrict __timeout)
+extern int aio_suspend64 (const struct aiocb64 *const __list[], int __nent,
+ const struct timespec *__restrict __timeout)
__THROW;
extern int aio_fsync64 (int __operation, struct aiocb64 *__aiocbp) __THROW;
============================================================
Index: signal/signal.h
--- signal/signal.h 1999/10/09 21:23:45 1.55
+++ signal/signal.h 1999/12/31 16:25:26
@@ -122,7 +122,7 @@
#ifdef __USE_MISC
/* Print a message describing the meaning of the given signal number. */
-extern void psignal (int __sig, __const char *__s) __THROW;
+extern void psignal (int __sig, const char *__s) __THROW;
#endif /* Use misc. */
@@ -203,19 +203,19 @@
extern int sigdelset (sigset_t *__set, int __signo) __THROW;
/* Return 1 if SIGNO is in SET, 0 if not. */
-extern int sigismember (__const sigset_t *__set, int __signo) __THROW;
+extern int sigismember (const sigset_t *__set, int __signo) __THROW;
# ifdef __USE_GNU
/* Return non-empty value is SET is not empty. */
-extern int sigisemptyset (__const sigset_t *__set) __THROW;
+extern int sigisemptyset (const sigset_t *__set) __THROW;
/* Build new signal set by combining the two inputs set using logical AND. */
-extern int sigandset (sigset_t *__set, __const sigset_t *__left,
- __const sigset_t *__right) __THROW;
+extern int sigandset (sigset_t *__set, const sigset_t *__left,
+ const sigset_t *__right) __THROW;
/* Build new signal set by combining the two inputs set using logical OR. */
-extern int sigorset (sigset_t *__set, __const sigset_t *__left,
- __const sigset_t *__right) __THROW;
+extern int sigorset (sigset_t *__set, const sigset_t *__left,
+ const sigset_t *__right) __THROW;
# endif /* GNU */
/* Get the system-specific definitions of `struct sigaction'
@@ -223,17 +223,17 @@
# include <bits/sigaction.h>
/* Get and/or change the set of blocked signals. */
-extern int sigprocmask (int __how, __const sigset_t *__set, sigset_t *__oset)
+extern int sigprocmask (int __how, const sigset_t *__set, sigset_t *__oset)
__THROW;
/* Change the set of blocked signals to SET,
wait until a signal arrives, and restore the set of blocked signals. */
-extern int sigsuspend (__const sigset_t *__set) __THROW;
+extern int sigsuspend (const sigset_t *__set) __THROW;
/* Get and/or set the action for signal SIG. */
-extern int __sigaction (int __sig, __const struct sigaction *__act,
+extern int __sigaction (int __sig, const struct sigaction *__act,
struct sigaction *__oact) __THROW;
-extern int sigaction (int __sig, __const struct sigaction *__act,
+extern int sigaction (int __sig, const struct sigaction *__act,
struct sigaction *__oact) __THROW;
/* Put in SET all signals that are blocked and waiting to be delivered. */
@@ -241,20 +241,20 @@
/* Select any of pending signals from SET or wait for any to arrive. */
-extern int sigwait (__const sigset_t *__set, int *__sig) __THROW;
+extern int sigwait (const sigset_t *__set, int *__sig) __THROW;
# ifdef __USE_POSIX199309
/* Select any of pending signals from SET and place information in INFO. */
-extern int sigwaitinfo (__const sigset_t *__set, siginfo_t *__info) __THROW;
+extern int sigwaitinfo (const sigset_t *__set, siginfo_t *__info) __THROW;
/* Select any of pending signals from SET and place information in INFO.
Wait the imte specified by TIMEOUT if no signal is pending. */
-extern int sigtimedwait (__const sigset_t *__set, siginfo_t *__info,
- __const struct timespec *__timeout) __THROW;
+extern int sigtimedwait (const sigset_t *__set, siginfo_t *__info,
+ const struct timespec *__timeout) __THROW;
/* Send signal SIG to the process PID. Associate data in VAL with the
signal. */
-extern int sigqueue (__pid_t __pid, int __sig, __const union sigval __val)
+extern int sigqueue (__pid_t __pid, int __sig, const union sigval __val)
__THROW;
# endif /* Use POSIX 199306. */
@@ -264,8 +264,8 @@
/* Names of the signals. This variable exists only for compatibility.
Use `strsignal' instead (see <string.h>). */
-extern __const char *__const _sys_siglist[_NSIG];
-extern __const char *__const sys_siglist[_NSIG];
+extern const char *const _sys_siglist[_NSIG];
+extern const char *const sys_siglist[_NSIG];
/* Structure passed to `sigvec'. */
struct sigvec
@@ -288,7 +288,7 @@
If the SV_RESETHAND bit is set in `sv_flags', the handler for SIG will be
reset to SIG_DFL before `sv_handler' is entered. If OVEC is non-NULL,
it is filled in with the old information for SIG. */
-extern int sigvec (int __sig, __const struct sigvec *__vec,
+extern int sigvec (int __sig, const struct sigvec *__vec,
struct sigvec *__ovec) __THROW;
@@ -313,12 +313,12 @@
/* Run signals handlers on the stack specified by SS (if not NULL).
If OSS is not NULL, it is filled in with the old signal stack status.
This interface is obsolete and on many platform not implemented. */
-extern int sigstack (__const struct sigstack *__ss,
+extern int sigstack (const struct sigstack *__ss,
struct sigstack *__oss) __THROW;
/* Alternate signal handler stack interface.
This interface should always be preferred over `sigstack'. */
-extern int sigaltstack (__const struct sigaltstack *__ss,
+extern int sigaltstack (const struct sigaltstack *__ss,
struct sigaltstack *__oss) __THROW;
#endif /* use BSD or X/Open Unix. */
============================================================
Index: socket/sys/socket.h
--- socket/sys/socket.h 1999/10/17 22:42:07 1.30
+++ socket/sys/socket.h 1999/12/31 16:25:27
@@ -63,7 +63,7 @@
old-style declaration, too. */
#if defined __cplusplus || !__GNUC_PREREQ (2, 7)
# define __SOCKADDR_ARG struct sockaddr *
-# 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. */
@@ -86,7 +86,7 @@
typedef union { __SOCKADDR_ALLTYPES
} __SOCKADDR_ARG __attribute__ ((__transparent_union__));
# undef __SOCKADDR_ONETYPE
-# define __SOCKADDR_ONETYPE(type) __const struct type *__##type##__;
+# define __SOCKADDR_ONETYPE(type) const struct type *__##type##__;
typedef union { __SOCKADDR_ALLTYPES
} __CONST_SOCKADDR_ARG __attribute__ ((__transparent_union__));
# undef __SOCKADDR_ONETYPE
@@ -129,9 +129,9 @@
/* Send N bytes of BUF to socket FD. Returns the number sent or -1. */
-extern int __send (int __fd, __const void *__buf, size_t __n, int __flags)
+extern int __send (int __fd, const void *__buf, size_t __n, int __flags)
__THROW;
-extern int send (int __fd, __const void *__buf, size_t __n, int __flags)
+extern int send (int __fd, const void *__buf, size_t __n, int __flags)
__THROW;
/* Read N bytes into BUF from socket FD.
@@ -141,7 +141,7 @@
/* Send N bytes of BUF on socket FD to peer at address ADDR (which is
ADDR_LEN bytes long). Returns the number sent, or -1 for errors. */
-extern int sendto (int __fd, __const void *__buf, size_t __n,
+extern int sendto (int __fd, const void *__buf, size_t __n,
int __flags, __CONST_SOCKADDR_ARG __addr,
socklen_t __addr_len) __THROW;
@@ -155,7 +155,7 @@
/* Send a message described MESSAGE on socket FD.
Returns the number of bytes sent, or -1 for errors. */
-extern int sendmsg (int __fd, __const struct msghdr *__message, int __flags)
+extern int sendmsg (int __fd, const struct msghdr *__message, int __flags)
__THROW;
/* Receive a message as described by MESSAGE from socket FD.
@@ -174,7 +174,7 @@
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;
/* Prepare to accept connections on socket FD.
============================================================
Index: stdio/stdio.h
--- stdio/stdio.h 1999/12/02 08:15:17 1.62
+++ stdio/stdio.h 1999/12/31 16:25:28
@@ -83,7 +83,7 @@
opened for append (__mode.__append set), then set the file pointer
to the end of the file and then do the write; if not, just write at
the current file pointer. */
-typedef __ssize_t __io_write_fn (__ptr_t __cookie, __const char *__buf,
+typedef __ssize_t __io_write_fn (__ptr_t __cookie, const char *__buf,
size_t __n);
/* Move COOKIE's file position to *POS bytes from the
@@ -144,17 +144,17 @@
void (*__output) (FILE *__stream, int __c);
} __room_functions;
-extern __const __io_functions __default_io_functions;
-extern __const __room_functions __default_room_functions;
+extern const __io_functions __default_io_functions;
+extern const __room_functions __default_room_functions;
/* Default close function. */
extern __io_close_fn __stdio_close;
/* Open FILE with mode M, store cookie in *COOKIEPTR. */
-extern int __stdio_open (__const char *__file, __io_mode __m,
+extern int __stdio_open (const char *__file, __io_mode __m,
void **__cookieptr) __THROW;
/* Put out an error message for when stdio needs to die. */
-extern void __stdio_errmsg (__const char *__msg, size_t __len) __THROW;
+extern void __stdio_errmsg (const char *__msg, size_t __len) __THROW;
@@ -279,9 +279,9 @@
/* Remove file FILENAME. */
-extern int remove (__const char *__filename) __THROW;
+extern int remove (const char *__filename) __THROW;
/* Rename file OLD to NEW. */
-extern int rename (__const char *__old, __const char *__new) __THROW;
+extern int rename (const char *__old, const char *__new) __THROW;
/* Create a temporary file and open it read/write. */
@@ -307,7 +307,7 @@
If not and if DIR is not NULL, that value is checked. If that fails,
P_tmpdir is tried and finally "/tmp". The storage for the filename
is allocated by `malloc'. */
-extern char *tempnam (__const char *__dir, __const char *__pfx) __THROW;
+extern char *tempnam (const char *__dir, const char *__pfx) __THROW;
#endif
@@ -334,10 +334,10 @@
/* Open a file and create a new stream for it. */
-extern FILE *fopen (__const char *__filename, __const char *__modes) __THROW;
+extern FILE *fopen (const char *__filename, const char *__modes) __THROW;
/* Open a file, replacing an existing stream with it. */
-extern FILE *freopen (__const char *__restrict __filename,
- __const char *__restrict __modes,
+extern FILE *freopen (const char *__restrict __filename,
+ const char *__restrict __modes,
FILE *__restrict __stream) __THROW;
/* Return a new, zeroed, stream.
@@ -353,18 +353,18 @@
#ifdef __USE_POSIX
/* Create a new stream that refers to an existing system file descriptor. */
-extern FILE *__fdopen (int __fd, __const char *__modes) __THROW;
-extern FILE *fdopen (int __fd, __const char *__modes) __THROW;
+extern FILE *__fdopen (int __fd, const char *__modes) __THROW;
+extern FILE *fdopen (int __fd, const char *__modes) __THROW;
#endif
#ifdef __USE_GNU
/* Create a new stream that refers to the given magic cookie,
and uses the given functions for input and output. */
-extern FILE *fopencookie (void *__magic_cookie, __const char *__modes,
+extern FILE *fopencookie (void *__magic_cookie, const char *__modes,
__io_functions __io_funcs) __THROW;
/* Create a new stream that refers to a memory buffer. */
-extern FILE *fmemopen (void *__s, size_t __len, __const char *__modes) __THROW;
+extern FILE *fmemopen (void *__s, size_t __len, const char *__modes) __THROW;
/* Open a stream that writes into a malloc'd buffer that is expanded as
necessary. *BUFLOC and *SIZELOC are updated with the buffer's location
@@ -394,21 +394,21 @@
/* Write formatted output to STREAM. */
extern int fprintf (FILE *__restrict __stream,
- __const char *__restrict __format, ...) __THROW;
+ const char *__restrict __format, ...) __THROW;
/* Write formatted output to stdout. */
-extern int printf (__const char *__restrict __format, ...) __THROW;
+extern int printf (const char *__restrict __format, ...) __THROW;
/* Write formatted output to S. */
-extern int sprintf (char *__restrict __s, __const char *__restrict __format,
+extern int sprintf (char *__restrict __s, const char *__restrict __format,
...) __THROW;
/* Write formatted output to S from argument list ARG. */
-extern int vfprintf (FILE *__restrict __s, __const char *__restrict __format,
+extern int vfprintf (FILE *__restrict __s, const char *__restrict __format,
__gnuc_va_list __arg) __THROW;
/* Write formatted output to stdout from argument list ARG. */
-extern int vprintf (__const char *__restrict __format, __gnuc_va_list __arg)
+extern int vprintf (const char *__restrict __format, __gnuc_va_list __arg)
__THROW;
/* Write formatted output to S from argument list ARG. */
-extern int vsprintf (char *__restrict __s, __const char *__restrict __format,
+extern int vsprintf (char *__restrict __s, const char *__restrict __format,
__gnuc_va_list __arg) __THROW;
#ifdef __OPTIMIZE__
@@ -422,16 +422,16 @@
#if defined __USE_BSD || defined __USE_ISOC99
/* Maximum chars of output to write in MAXLEN. */
extern int __snprintf (char *__s, size_t __maxlen,
- __const char *__format, ...)
+ const char *__format, ...)
__THROW __attribute__ ((__format__ (__printf__, 3, 4)));
-extern int snprintf (char *__s, size_t __maxlen, __const char *__format, ...)
+extern int snprintf (char *__s, size_t __maxlen, const char *__format, ...)
__THROW __attribute__ ((__format__ (__printf__, 3, 4)));
extern int __vsnprintf (char *__s, size_t __maxlen,
- __const char *__format, __gnuc_va_list __arg)
+ const char *__format, __gnuc_va_list __arg)
__THROW __attribute__ ((__format__ (__printf__, 3, 0)));
extern int vsnprintf (char *__s, size_t __maxlen,
- __const char *__format, __gnuc_va_list __arg)
+ const char *__format, __gnuc_va_list __arg)
__THROW __attribute__ ((__format__ (__printf__, 3, 0)));
#endif
@@ -439,48 +439,48 @@
/* Write formatted output to a string dynamically allocated with `malloc'.
Store the address of the string in *PTR. */
extern int vasprintf (char **__restrict __ptr,
- __const char *__restrict __f, __gnuc_va_list __arg)
+ const char *__restrict __f, __gnuc_va_list __arg)
__THROW __attribute__ ((__format__ (__printf__, 2, 0)));
extern int __asprintf (char **__restrict __ptr,
- __const char *__restrict __fmt, ...)
+ const char *__restrict __fmt, ...)
__THROW __attribute__ ((__format__ (__printf__, 2, 3)));
extern int asprintf (char **__restrict __ptr,
- __const char *__restrict __fmt, ...)
+ const char *__restrict __fmt, ...)
__THROW __attribute__ ((__format__ (__printf__, 2, 3)));
/* Write formatted output to a file descriptor. */
-extern int vdprintf (int __fd, __const char *__restrict __fmt,
+extern int vdprintf (int __fd, const char *__restrict __fmt,
__gnuc_va_list __arg)
__THROW __attribute__ ((__format__ (__printf__, 2, 0)));
-extern int dprintf (int __fd, __const char *__restrict __fmt, ...)
+extern int dprintf (int __fd, const char *__restrict __fmt, ...)
__THROW __attribute__ ((__format__ (__printf__, 2, 3)));
#endif
/* Read formatted input from STREAM. */
extern int fscanf (FILE *__restrict __stream,
- __const char *__restrict __format, ...) __THROW;
+ const char *__restrict __format, ...) __THROW;
/* Read formatted input from stdin. */
-extern int scanf (__const char *__restrict __format, ...) __THROW;
+extern int scanf (const char *__restrict __format, ...) __THROW;
/* Read formatted input from S. */
-extern int sscanf (__const char *__restrict __s,
- __const char *__restrict __format, ...) __THROW;
+extern int sscanf (const char *__restrict __s,
+ const char *__restrict __format, ...) __THROW;
#ifdef __USE_ISOC99
/* Read formatted input from S into argument list ARG. */
-extern int __vfscanf (FILE *__s, __const char *__format,
+extern int __vfscanf (FILE *__s, const char *__format,
__gnuc_va_list __arg) __THROW;
-extern int vfscanf (FILE *__s, __const char *__format,
+extern int vfscanf (FILE *__s, const char *__format,
__gnuc_va_list __arg) __THROW;
/* Read formatted input from stdin into argument list ARG. */
-extern int __vscanf (__const char *__format, __gnuc_va_list __arg) __THROW;
-extern int vscanf (__const char *__format, __gnuc_va_list __arg) __THROW;
+extern int __vscanf (const char *__format, __gnuc_va_list __arg) __THROW;
+extern int vscanf (const char *__format, __gnuc_va_list __arg) __THROW;
/* Read formatted input from S into argument list ARG. */
-extern int __vsscanf (__const char *__s, __const char *__format,
+extern int __vsscanf (const char *__s, const char *__format,
__gnuc_va_list __arg) __THROW;
-extern int vsscanf (__const char *__s, __const char *__format,
+extern int vsscanf (const char *__s, const char *__format,
__gnuc_va_list __arg) __THROW;
@@ -668,17 +668,17 @@
/* Write a string to STREAM. */
-extern int fputs (__const char *__restrict __s, FILE *__restrict __stream)
+extern int fputs (const char *__restrict __s, FILE *__restrict __stream)
__THROW;
#ifdef __USE_GNU
/* This function does the same as `fputs' but does not lock the stream. */
-extern int fputs_unlocked (__const char *__restrict __s,
+extern int fputs_unlocked (const char *__restrict __s,
FILE *__restrict __stream) __THROW;
#endif
/* Write a string, followed by a newline, to stdout. */
-extern int puts (__const char *__s) __THROW;
+extern int puts (const char *__s) __THROW;
/* Push a character back onto the input buffer of STREAM. */
@@ -689,14 +689,14 @@
extern size_t fread (void *__restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __stream) __THROW;
/* Write chunks of generic data to STREAM. */
-extern size_t fwrite (__const void *__restrict __ptr, size_t __size,
+extern size_t fwrite (const void *__restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __s) __THROW;
#ifdef __USE_MISC
/* Faster versions when locking is not necessary. */
extern size_t fread_unlocked (void *__restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __stream) __THROW;
-extern size_t fwrite_unlocked (__const void *__restrict __ptr,
+extern size_t fwrite_unlocked (const void *__restrict __ptr,
size_t __size, size_t __n,
FILE *__restrict __stream) __THROW;
#endif
@@ -713,7 +713,7 @@
extern int fgetpos (FILE *__restrict __stream, fpos_t *__restrict __pos)
__THROW;
/* Set STREAM's position. */
-extern int fsetpos (FILE *__stream, __const fpos_t *__pos) __THROW;
+extern int fsetpos (FILE *__stream, const fpos_t *__pos) __THROW;
/* Clear the error and EOF indicators for STREAM. */
@@ -741,7 +741,7 @@
#endif
/* Print a message describing the meaning of the value of errno. */
-extern void perror (__const char *__s) __THROW;
+extern void perror (const char *__s) __THROW;
#ifdef __USE_POSIX
@@ -758,7 +758,7 @@
#if (defined __USE_POSIX2 || defined __USE_SVID || defined __USE_BSD || \
defined __USE_MISC)
/* Create a new stream connected to a pipe running the given command. */
-extern FILE *popen (__const char *__command, __const char *__modes) __THROW;
+extern FILE *popen (const char *__command, const char *__modes) __THROW;
/* Close a stream opened by popen and return the status of its child. */
extern int pclose (FILE *__stream) __THROW;
@@ -785,8 +785,8 @@
/* Write formatted output to an obstack. */
extern int obstack_printf (struct obstack *__obstack,
- __const char *__format, ...) __THROW;
-extern int obstack_vprintf (struct obstack *__obstack, __const char *__format,
+ const char *__format, ...) __THROW;
+extern int obstack_vprintf (struct obstack *__obstack, const char *__format,
__gnuc_va_list __args) __THROW;
#endif
============================================================
Index: stdio-common/printf.h
--- stdio-common/printf.h 1999/10/09 21:24:06 1.13
+++ stdio-common/printf.h 1999/12/31 16:25:28
@@ -61,14 +61,14 @@
or -1 for errors. */
typedef int printf_function (FILE *__stream,
- __const struct printf_info *__info,
- __const void *__const *__args);
+ const struct printf_info *__info,
+ const void *const *__args);
/* Type of a printf specifier-arginfo function.
INFO gives information about the format specification.
N, ARGTYPES, and return value are as for printf_parse_format. */
-typedef int printf_arginfo_function (__const struct printf_info *__info,
+typedef int printf_arginfo_function (const struct printf_info *__info,
size_t __n, int *__argtypes);
@@ -91,7 +91,7 @@
array it is passed with the types of the arguments it wants, and return
the number of arguments it wants. */
-extern size_t parse_printf_format (__const char *__restrict __fmt, size_t __n,
+extern size_t parse_printf_format (const char *__restrict __fmt, size_t __n,
int *__restrict __argtypes) __THROW;
@@ -130,11 +130,11 @@
the format specifier is a uppercase character powers of 1000 are
used. Otherwise powers of 1024. */
extern int printf_size (FILE *__restrict __fp,
- __const struct printf_info *__info,
- __const void *__const *__restrict __args) __THROW;
+ const struct printf_info *__info,
+ const void *const *__restrict __args) __THROW;
/* This is the appropriate argument information function for `printf_size'. */
-extern int printf_size_info (__const struct printf_info *__restrict
+extern int printf_size_info (const struct printf_info *__restrict
__info, size_t __n, int *__restrict __argtypes)
__THROW;
============================================================
Index: stdlib/fmtmsg.h
--- stdlib/fmtmsg.h 1999/10/09 21:24:15 1.5
+++ stdlib/fmtmsg.h 1999/12/31 16:25:28
@@ -92,13 +92,13 @@
/* Print message with given CLASSIFICATION, LABEL, SEVERITY, TEXT, ACTION
and TAG to console or standard error. */
-extern int fmtmsg (long int __classification, __const char *__label,
- int __severity, __const char *__text,
- __const char *__action, __const char *__tag) __THROW;
+extern int fmtmsg (long int __classification, const char *__label,
+ int __severity, const char *__text,
+ const char *__action, const char *__tag) __THROW;
#ifdef __USE_SVID
/* Add or remove severity level. */
-extern int addseverity (int __severity, __const char *__string) __THROW;
+extern int addseverity (int __severity, const char *__string) __THROW;
#endif
__END_DECLS
============================================================
Index: stdlib/monetary.h
--- stdlib/monetary.h 1999/10/09 21:24:18 1.7
+++ stdlib/monetary.h 1999/12/31 16:25:28
@@ -37,7 +37,7 @@
/* Formatting a monetary value according to the current locale. */
extern ssize_t strfmon (char *__restrict __s, size_t __maxsize,
- __const char *__restrict __format, ...) __THROW;
+ const char *__restrict __format, ...) __THROW;
#ifdef __USE_GNU
# include <xlocale.h>
@@ -45,7 +45,7 @@
/* Formatting a monetary value according to the current locale. */
extern ssize_t __strfmon_l (char *__restrict __s, size_t __maxsize,
__locale_t loc,
- __const char *__restrict __format, ...) __THROW;
+ const char *__restrict __format, ...) __THROW;
#endif
__END_DECLS
============================================================
Index: stdlib/stdlib.h
--- stdlib/stdlib.h 1999/12/19 07:54:05 1.80
+++ stdlib/stdlib.h 1999/12/31 16:25:29
@@ -81,46 +81,46 @@
/* Convert a string to a floating-point number. */
-extern double atof (__const char *__nptr) __THROW;
+extern double atof (const char *__nptr) __THROW;
/* Convert a string to an integer. */
-extern int atoi (__const char *__nptr) __THROW;
+extern int atoi (const char *__nptr) __THROW;
/* Convert a string to a long integer. */
-extern long int atol (__const char *__nptr) __THROW;
+extern long int atol (const char *__nptr) __THROW;
#if defined __USE_ISOC99 || (defined __GNUC__ && defined __USE_MISC)
/* These functions will part of the standard C library in ISO C99. */
-__extension__ extern long long int atoll (__const char *__nptr) __THROW;
+__extension__ extern long long int atoll (const char *__nptr) __THROW;
#endif
/* Convert a string to a floating-point number. */
-extern double strtod (__const char *__restrict __nptr,
+extern double strtod (const char *__restrict __nptr,
char **__restrict __endptr) __THROW;
#ifdef __USE_ISOC99
/* Likewise for `float' and `long double' sizes of floating-point numbers. */
-extern float strtof (__const char *__restrict __nptr,
+extern float strtof (const char *__restrict __nptr,
char **__restrict __endptr) __THROW;
-extern long double strtold (__const char *__restrict __nptr,
+extern long double strtold (const char *__restrict __nptr,
char **__restrict __endptr) __THROW;
#endif
/* Convert a string to a long integer. */
-extern long int strtol (__const char *__restrict __nptr,
+extern long int strtol (const char *__restrict __nptr,
char **__restrict __endptr, int __base) __THROW;
/* Convert a string to an unsigned long integer. */
-extern unsigned long int strtoul (__const char *__restrict __nptr,
+extern unsigned long int strtoul (const char *__restrict __nptr,
char **__restrict __endptr, int __base)
__THROW;
#if defined __GNUC__ && defined __USE_BSD
/* Convert a string to a quadword integer. */
__extension__
-extern long long int strtoq (__const char *__restrict __nptr,
+extern long long int strtoq (const char *__restrict __nptr,
char **__restrict __endptr, int __base) __THROW;
/* Convert a string to an unsigned quadword integer. */
__extension__
-extern unsigned long long int strtouq (__const char *__restrict __nptr,
+extern unsigned long long int strtouq (const char *__restrict __nptr,
char **__restrict __endptr, int __base)
__THROW;
#endif /* GCC and use BSD. */
@@ -130,11 +130,11 @@
/* Convert a string to a quadword integer. */
__extension__
-extern long long int strtoll (__const char *__restrict __nptr,
+extern long long int strtoll (const char *__restrict __nptr,
char **__restrict __endptr, int __base) __THROW;
/* Convert a string to an unsigned quadword integer. */
__extension__
-extern unsigned long long int strtoull (__const char *__restrict __nptr,
+extern unsigned long long int strtoull (const char *__restrict __nptr,
char **__restrict __endptr, int __base)
__THROW;
#endif /* ISO C99 or GCC and use MISC. */
@@ -158,33 +158,33 @@
/* Special versions of the functions above which take the locale to
use as an additional parameter. */
-extern long int __strtol_l (__const char *__restrict __nptr,
+extern long int __strtol_l (const char *__restrict __nptr,
char **__restrict __endptr, int __base,
__locale_t __loc) __THROW;
-extern unsigned long int __strtoul_l (__const char *__restrict __nptr,
+extern unsigned long int __strtoul_l (const char *__restrict __nptr,
char **__restrict __endptr,
int __base, __locale_t __loc) __THROW;
__extension__
-extern long long int __strtoll_l (__const char *__restrict __nptr,
+extern long long int __strtoll_l (const char *__restrict __nptr,
char **__restrict __endptr, int __base,
__locale_t __loc) __THROW;
__extension__
-extern unsigned long long int __strtoull_l (__const char *__restrict __nptr,
+extern unsigned long long int __strtoull_l (const char *__restrict __nptr,
char **__restrict __endptr,
int __base, __locale_t __loc)
__THROW;
-extern double __strtod_l (__const char *__restrict __nptr,
+extern double __strtod_l (const char *__restrict __nptr,
char **__restrict __endptr, __locale_t __loc)
__THROW;
-extern float __strtof_l (__const char *__restrict __nptr,
+extern float __strtof_l (const char *__restrict __nptr,
char **__restrict __endptr, __locale_t __loc) __THROW;
-extern long double __strtold_l (__const char *__restrict __nptr,
+extern long double __strtold_l (const char *__restrict __nptr,
char **__restrict __endptr,
__locale_t __loc) __THROW;
#endif /* GNU */
@@ -193,23 +193,23 @@
/* The internal entry points for `strtoX' take an extra flag argument
saying whether or not to parse locale-dependent number grouping. */
-extern double __strtod_internal (__const char *__restrict __nptr,
+extern double __strtod_internal (const char *__restrict __nptr,
char **__restrict __endptr, int __group)
__THROW;
-extern float __strtof_internal (__const char *__restrict __nptr,
+extern float __strtof_internal (const char *__restrict __nptr,
char **__restrict __endptr, int __group)
__THROW;
-extern long double __strtold_internal (__const char *__restrict __nptr,
+extern long double __strtold_internal (const char *__restrict __nptr,
char **__restrict __endptr,
int __group) __THROW;
#ifndef __strtol_internal_defined
-extern long int __strtol_internal (__const char *__restrict __nptr,
+extern long int __strtol_internal (const char *__restrict __nptr,
char **__restrict __endptr,
int __base, int __group) __THROW;
# define __strtol_internal_defined 1
#endif
#ifndef __strtoul_internal_defined
-extern unsigned long int __strtoul_internal (__const char *__restrict __nptr,
+extern unsigned long int __strtoul_internal (const char *__restrict __nptr,
char **__restrict __endptr,
int __base, int __group) __THROW;
# define __strtoul_internal_defined 1
@@ -217,14 +217,14 @@
#if defined __GNUC__ || defined __USE_ISOC99
# ifndef __strtoll_internal_defined
__extension__
-extern long long int __strtoll_internal (__const char *__restrict __nptr,
+extern long long int __strtoll_internal (const char *__restrict __nptr,
char **__restrict __endptr,
int __base, int __group) __THROW;
# define __strtoll_internal_defined 1
# endif
# ifndef __strtoull_internal_defined
__extension__
-extern unsigned long long int __strtoull_internal (__const char *
+extern unsigned long long int __strtoull_internal (const char *
__restrict __nptr,
char **__restrict __endptr,
int __base, int __group)
@@ -238,18 +238,18 @@
/* Define inline functions which call the internal entry points. */
extern __inline double
-strtod (__const char *__restrict __nptr, char **__restrict __endptr) __THROW
+strtod (const char *__restrict __nptr, char **__restrict __endptr) __THROW
{
return __strtod_internal (__nptr, __endptr, 0);
}
extern __inline long int
-strtol (__const char *__restrict __nptr, char **__restrict __endptr,
+strtol (const char *__restrict __nptr, char **__restrict __endptr,
int __base) __THROW
{
return __strtol_internal (__nptr, __endptr, __base, 0);
}
extern __inline unsigned long int
-strtoul (__const char *__restrict __nptr, char **__restrict __endptr,
+strtoul (const char *__restrict __nptr, char **__restrict __endptr,
int __base) __THROW
{
return __strtoul_internal (__nptr, __endptr, __base, 0);
@@ -257,12 +257,12 @@
# ifdef __USE_ISOC99
extern __inline float
-strtof (__const char *__restrict __nptr, char **__restrict __endptr) __THROW
+strtof (const char *__restrict __nptr, char **__restrict __endptr) __THROW
{
return __strtof_internal (__nptr, __endptr, 0);
}
extern __inline long double
-strtold (__const char *__restrict __nptr, char **__restrict __endptr) __THROW
+strtold (const char *__restrict __nptr, char **__restrict __endptr) __THROW
{
return __strtold_internal (__nptr, __endptr, 0);
}
@@ -270,13 +270,13 @@
# ifdef __USE_BSD
__extension__ extern __inline long long int
-strtoq (__const char *__restrict __nptr, char **__restrict __endptr,
+strtoq (const char *__restrict __nptr, char **__restrict __endptr,
int __base) __THROW
{
return __strtoll_internal (__nptr, __endptr, __base, 0);
}
__extension__ extern __inline unsigned long long int
-strtouq (__const char *__restrict __nptr, char **__restrict __endptr,
+strtouq (const char *__restrict __nptr, char **__restrict __endptr,
int __base) __THROW
{
return __strtoull_internal (__nptr, __endptr, __base, 0);
@@ -285,13 +285,13 @@
# if defined __USE_MISC || defined __USE_ISOC99
__extension__ extern __inline long long int
-strtoll (__const char *__restrict __nptr, char **__restrict __endptr,
+strtoll (const char *__restrict __nptr, char **__restrict __endptr,
int __base) __THROW
{
return __strtoll_internal (__nptr, __endptr, __base, 0);
}
__extension__ extern __inline unsigned long long int
-strtoull (__const char * __restrict __nptr, char **__restrict __endptr,
+strtoull (const char * __restrict __nptr, char **__restrict __endptr,
int __base) __THROW
{
return __strtoull_internal (__nptr, __endptr, __base, 0);
@@ -299,24 +299,24 @@
# endif
extern __inline double
-atof (__const char *__nptr) __THROW
+atof (const char *__nptr) __THROW
{
return strtod (__nptr, (char **) NULL);
}
extern __inline int
-atoi (__const char *__nptr) __THROW
+atoi (const char *__nptr) __THROW
{
return (int) strtol (__nptr, (char **) NULL, 10);
}
extern __inline long int
-atol (__const char *__nptr) __THROW
+atol (const char *__nptr) __THROW
{
return strtol (__nptr, (char **) NULL, 10);
}
# if defined __USE_MISC || defined __USE_ISOC99
__extension__ extern __inline long long int
-atoll (__const char *__nptr) __THROW
+atoll (const char *__nptr) __THROW
{
return strtoll (__nptr, (char **) NULL, 10);
}
@@ -331,7 +331,7 @@
extern char *l64a (long int __n) __THROW;
/* Read a number from a string S in base 64 as above. */
-extern long int a64l (__const char *__s) __THROW;
+extern long int a64l (const char *__s) __THROW;
# include <sys/types.h> /* we need int32_t... */
@@ -526,11 +526,11 @@
/* Return the value of envariable NAME, or NULL if it doesn't exist. */
-extern char *getenv (__const char *__name) __THROW;
+extern char *getenv (const char *__name) __THROW;
/* This function is similar to the above but returns NULL if the
programs is running with SUID or SGID enabled. */
-extern char *__secure_getenv (__const char *__name) __THROW;
+extern char *__secure_getenv (const char *__name) __THROW;
#if defined __USE_SVID || defined __USE_XOPEN
/* The SVID says this is in <stdio.h>, but this seems a better place. */
@@ -542,11 +542,11 @@
#ifdef __USE_BSD
/* Set NAME to VALUE in the environment.
If REPLACE is nonzero, overwrite an existing value. */
-extern int setenv (__const char *__name, __const char *__value, int __replace)
+extern int setenv (const char *__name, const char *__value, int __replace)
__THROW;
/* Remove the variable NAME from the environment. */
-extern void unsetenv (__const char *__name) __THROW;
+extern void unsetenv (const char *__name) __THROW;
#endif
#ifdef __USE_MISC
@@ -583,14 +583,14 @@
/* Execute the given line as a shell command. */
-extern int system (__const char *__command) __THROW;
+extern int system (const char *__command) __THROW;
#ifdef __USE_GNU
/* Return a malloc'd string containing the canonical absolute name of the
named file. The last file name component need not exist, and may be a
symlink to a nonexistent file. */
-extern char *canonicalize_file_name (__const char *__name) __THROW;
+extern char *canonicalize_file_name (const char *__name) __THROW;
#endif
#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
@@ -600,7 +600,7 @@
name is PATH_MAX chars or more, returns null with `errno' set to
ENAMETOOLONG; if the name fits in fewer than PATH_MAX chars, returns the
name in RESOLVED. */
-extern char *realpath (__const char *__restrict __name,
+extern char *realpath (const char *__restrict __name,
char *__restrict __resolved) __THROW;
#endif
@@ -608,7 +608,7 @@
/* Shorthand for type of comparison functions. */
#ifndef __COMPAR_FN_T
# define __COMPAR_FN_T
-typedef int (*__compar_fn_t) (__const void *, __const void *);
+typedef int (*__compar_fn_t) (const void *, const void *);
# ifdef __USE_GNU
typedef __compar_fn_t comparison_fn_t;
@@ -617,7 +617,7 @@
/* Do a binary search for KEY in BASE, which consists of NMEMB elements
of SIZE bytes each, using COMPAR to perform the comparisons. */
-extern void *bsearch (__const void *__key, __const void *__base,
+extern void *bsearch (const void *__key, const void *__base,
size_t __nmemb, size_t __size, __compar_fn_t __compar);
/* Sort NMEMB elements of BASE, of SIZE bytes each,
@@ -700,11 +700,11 @@
/* Return the length of the multibyte character
in S, which is no longer than N. */
-extern int mblen (__const char *__s, size_t __n) __THROW;
+extern int mblen (const char *__s, size_t __n) __THROW;
/* Return the length of the given multibyte character,
putting its `wchar_t' representation in *PWC. */
extern int mbtowc (wchar_t *__restrict __pwc,
- __const char *__restrict __s, size_t __n) __THROW;
+ const char *__restrict __s, size_t __n) __THROW;
/* Put the multibyte character represented
by WCHAR in S, returning its length. */
extern int wctomb (char *__s, wchar_t __wchar) __THROW;
@@ -712,10 +712,10 @@
/* Convert a multibyte string to a wide char string. */
extern size_t mbstowcs (wchar_t *__restrict __pwcs,
- __const char *__restrict __s, size_t __n) __THROW;
+ const char *__restrict __s, size_t __n) __THROW;
/* Convert a wide char string to multibyte string. */
extern size_t wcstombs (char *__restrict __s,
- __const wchar_t *__restrict __pwcs, size_t __n)
+ const wchar_t *__restrict __pwcs, size_t __n)
__THROW;
@@ -724,7 +724,7 @@
or negative response expression as specified by the LC_MESSAGES category
in the program's current locale. Returns 1 if affirmative, 0 if
negative, and -1 if not matching. */
-extern int rpmatch (__const char *__response) __THROW;
+extern int rpmatch (const char *__response) __THROW;
#endif
@@ -736,7 +736,7 @@
suboption. On exit *OPTIONP is set to the beginning of the next
token or at the terminating NUL character. */
extern int getsubopt (char **__restrict __optionp,
- char *__const *__restrict __tokens,
+ char *const *__restrict __tokens,
char **__restrict __valuep) __THROW;
#endif
@@ -744,7 +744,7 @@
#ifdef __USE_XOPEN
/* Setup DES tables according KEY. */
-extern void setkey (__const char *__key) __THROW;
+extern void setkey (const char *__key) __THROW;
/* X/Open pseudo terminal handling. */
============================================================
Index: stdlib/ucontext.h
--- stdlib/ucontext.h 1999/10/09 21:24:29 1.3
+++ stdlib/ucontext.h 1999/12/31 16:25:29
@@ -32,11 +32,11 @@
extern int getcontext (ucontext_t *__ucp) __THROW;
/* Set user context from information of variable pointed to by UCP. */
-extern int setcontext (__const ucontext_t *__ucp) __THROW;
+extern int setcontext (const ucontext_t *__ucp) __THROW;
/* Save current context in context variable pointed to by OUCP and set
context from variable pointed to by UCP. */
-extern int swapcontext (ucontext_t *__oucp, __const ucontext_t *__ucp) __THROW;
+extern int swapcontext (ucontext_t *__oucp, const ucontext_t *__ucp) __THROW;
/* Manipulate user context UCP to continue with calling functions FUNC
and the ARGC-1 parameters following ARGC when the context is used
============================================================
Index: string/bits/string2.h
--- string/bits/string2.h 1999/12/18 19:30:19 1.45
+++ string/bits/string2.h 1999/12/31 16:25:30
@@ -54,22 +54,22 @@
# if __BYTE_ORDER == __LITTLE_ENDIAN
# define __STRING2_SMALL_GET16(src, idx) \
- (((__const unsigned char *) (__const char *) (src))[idx + 1] << 8 \
- | ((__const unsigned char *) (__const char *) (src))[idx])
+ (((const unsigned char *) (const char *) (src))[idx + 1] << 8 \
+ | ((const unsigned char *) (const char *) (src))[idx])
# define __STRING2_SMALL_GET32(src, idx) \
- (((((__const unsigned char *) (__const char *) (src))[idx + 3] << 8 \
- | ((__const unsigned char *) (__const char *) (src))[idx + 2]) << 8 \
- | ((__const unsigned char *) (__const char *) (src))[idx + 1]) << 8 \
- | ((__const unsigned char *) (__const char *) (src))[idx])
+ (((((const unsigned char *) (const char *) (src))[idx + 3] << 8 \
+ | ((const unsigned char *) (const char *) (src))[idx + 2]) << 8 \
+ | ((const unsigned char *) (const char *) (src))[idx + 1]) << 8 \
+ | ((const unsigned char *) (const char *) (src))[idx])
# else
# define __STRING2_SMALL_GET16(src, idx) \
- (((__const unsigned char *) (__const char *) (src))[idx] << 8 \
- | ((__const unsigned char *) (__const char *) (src))[idx + 1])
+ (((const unsigned char *) (const char *) (src))[idx] << 8 \
+ | ((const unsigned char *) (const char *) (src))[idx + 1])
# define __STRING2_SMALL_GET32(src, idx) \
- (((((__const unsigned char *) (__const char *) (src))[idx] << 8 \
- | ((__const unsigned char *) (__const char *) (src))[idx + 1]) << 8 \
- | ((__const unsigned char *) (__const char *) (src))[idx + 2]) << 8 \
- | ((__const unsigned char *) (__const char *) (src))[idx + 3])
+ (((((const unsigned char *) (const char *) (src))[idx] << 8 \
+ | ((const unsigned char *) (const char *) (src))[idx + 1]) << 8 \
+ | ((const unsigned char *) (const char *) (src))[idx + 2]) << 8 \
+ | ((const unsigned char *) (const char *) (src))[idx + 3])
# endif
#else
/* These are a few types we need for the optimizations if we cannot
@@ -281,33 +281,33 @@
}
# else
# define __mempcpy_args(src) \
- ((__const char *) (src))[0], \
+ ((const char *) (src))[0], \
__extension__ ((__STRING2_COPY_ARR2) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1] } }), \
+ { { ((const char *) (src))[0], ((const char *) (src))[1] } }), \
__extension__ ((__STRING2_COPY_ARR3) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
- ((__const char *) (src))[2] } }), \
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
+ ((const char *) (src))[2] } }), \
__extension__ ((__STRING2_COPY_ARR4) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
- ((__const char *) (src))[2], ((__const char *) (src))[3] } }), \
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
+ ((const char *) (src))[2], ((const char *) (src))[3] } }), \
__extension__ ((__STRING2_COPY_ARR5) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
- ((__const char *) (src))[2], ((__const char *) (src))[3], \
- ((__const char *) (src))[4] } }), \
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
+ ((const char *) (src))[2], ((const char *) (src))[3], \
+ ((const char *) (src))[4] } }), \
__extension__ ((__STRING2_COPY_ARR6) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
- ((__const char *) (src))[2], ((__const char *) (src))[3], \
- ((__const char *) (src))[4], ((__const char *) (src))[5] } }), \
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
+ ((const char *) (src))[2], ((const char *) (src))[3], \
+ ((const char *) (src))[4], ((const char *) (src))[5] } }), \
__extension__ ((__STRING2_COPY_ARR7) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
- ((__const char *) (src))[2], ((__const char *) (src))[3], \
- ((__const char *) (src))[4], ((__const char *) (src))[5], \
- ((__const char *) (src))[6] } }), \
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
+ ((const char *) (src))[2], ((const char *) (src))[3], \
+ ((const char *) (src))[4], ((const char *) (src))[5], \
+ ((const char *) (src))[6] } }), \
__extension__ ((__STRING2_COPY_ARR8) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
- ((__const char *) (src))[2], ((__const char *) (src))[3], \
- ((__const char *) (src))[4], ((__const char *) (src))[5], \
- ((__const char *) (src))[6], ((__const char *) (src))[7] } })
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
+ ((const char *) (src))[2], ((const char *) (src))[3], \
+ ((const char *) (src))[4], ((const char *) (src))[5], \
+ ((const char *) (src))[6], ((const char *) (src))[7] } })
__STRING_INLINE void *__mempcpy_small (void *, char, __STRING2_COPY_ARR2,
__STRING2_COPY_ARR3,
__STRING2_COPY_ARR4,
@@ -449,31 +449,31 @@
# else
# define __strcpy_args(src) \
__extension__ ((__STRING2_COPY_ARR2) \
- { { ((__const char *) (src))[0], '\0' } }), \
+ { { ((const char *) (src))[0], '\0' } }), \
__extension__ ((__STRING2_COPY_ARR3) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
'\0' } }), \
__extension__ ((__STRING2_COPY_ARR4) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
- ((__const char *) (src))[2], '\0' } }), \
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
+ ((const char *) (src))[2], '\0' } }), \
__extension__ ((__STRING2_COPY_ARR5) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
- ((__const char *) (src))[2], ((__const char *) (src))[3], \
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
+ ((const char *) (src))[2], ((const char *) (src))[3], \
'\0' } }), \
__extension__ ((__STRING2_COPY_ARR6) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
- ((__const char *) (src))[2], ((__const char *) (src))[3], \
- ((__const char *) (src))[4], '\0' } }), \
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
+ ((const char *) (src))[2], ((const char *) (src))[3], \
+ ((const char *) (src))[4], '\0' } }), \
__extension__ ((__STRING2_COPY_ARR7) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
- ((__const char *) (src))[2], ((__const char *) (src))[3], \
- ((__const char *) (src))[4], ((__const char *) (src))[5], \
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
+ ((const char *) (src))[2], ((const char *) (src))[3], \
+ ((const char *) (src))[4], ((const char *) (src))[5], \
'\0' } }), \
__extension__ ((__STRING2_COPY_ARR8) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
- ((__const char *) (src))[2], ((__const char *) (src))[3], \
- ((__const char *) (src))[4], ((__const char *) (src))[5], \
- ((__const char *) (src))[6], '\0' } })
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
+ ((const char *) (src))[2], ((const char *) (src))[3], \
+ ((const char *) (src))[4], ((const char *) (src))[5], \
+ ((const char *) (src))[6], '\0' } })
__STRING_INLINE char *__strcpy_small (char *, __STRING2_COPY_ARR2,
__STRING2_COPY_ARR3,
__STRING2_COPY_ARR4,
@@ -613,31 +613,31 @@
# else
# define __stpcpy_args(src) \
__extension__ ((__STRING2_COPY_ARR2) \
- { { ((__const char *) (src))[0], '\0' } }), \
+ { { ((const char *) (src))[0], '\0' } }), \
__extension__ ((__STRING2_COPY_ARR3) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
'\0' } }), \
__extension__ ((__STRING2_COPY_ARR4) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
- ((__const char *) (src))[2], '\0' } }), \
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
+ ((const char *) (src))[2], '\0' } }), \
__extension__ ((__STRING2_COPY_ARR5) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
- ((__const char *) (src))[2], ((__const char *) (src))[3], \
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
+ ((const char *) (src))[2], ((const char *) (src))[3], \
'\0' } }), \
__extension__ ((__STRING2_COPY_ARR6) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
- ((__const char *) (src))[2], ((__const char *) (src))[3], \
- ((__const char *) (src))[4], '\0' } }), \
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
+ ((const char *) (src))[2], ((const char *) (src))[3], \
+ ((const char *) (src))[4], '\0' } }), \
__extension__ ((__STRING2_COPY_ARR7) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
- ((__const char *) (src))[2], ((__const char *) (src))[3], \
- ((__const char *) (src))[4], ((__const char *) (src))[5], \
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
+ ((const char *) (src))[2], ((const char *) (src))[3], \
+ ((const char *) (src))[4], ((const char *) (src))[5], \
'\0' } }), \
__extension__ ((__STRING2_COPY_ARR8) \
- { { ((__const char *) (src))[0], ((__const char *) (src))[1], \
- ((__const char *) (src))[2], ((__const char *) (src))[3], \
- ((__const char *) (src))[4], ((__const char *) (src))[5], \
- ((__const char *) (src))[6], '\0' } })
+ { { ((const char *) (src))[0], ((const char *) (src))[1], \
+ ((const char *) (src))[2], ((const char *) (src))[3], \
+ ((const char *) (src))[4], ((const char *) (src))[5], \
+ ((const char *) (src))[6], '\0' } })
__STRING_INLINE char *__stpcpy_small (char *, __STRING2_COPY_ARR2,
__STRING2_COPY_ARR3,
__STRING2_COPY_ARR4,
@@ -749,7 +749,7 @@
&& (__s1_len = strlen (s1), __s2_len = strlen (s2), \
(!__string2_1bptr_p (s1) || __s1_len >= 4) \
&& (!__string2_1bptr_p (s2) || __s2_len >= 4)) \
- ? memcmp ((__const char *) (s1), (__const char *) (s2), \
+ ? memcmp ((const char *) (s1), (const char *) (s2), \
(__s1_len < __s2_len ? __s1_len : __s2_len) + 1) \
: (__builtin_constant_p (s1) && __string2_1bptr_p (s1) \
&& (__s1_len = strlen (s1), __s1_len < 4) \
@@ -765,74 +765,74 @@
# define __strcmp_cc(s1, s2, l) \
(__extension__ ({ register int __result = \
- (((__const unsigned char *) (__const char *) (s1))[0] \
- - ((__const unsigned char *) (__const char *)(s2))[0]);\
+ (((const unsigned char *) (const char *) (s1))[0] \
+ - ((const unsigned char *) (const char *)(s2))[0]); \
if (l > 0 && __result == 0) \
{ \
- __result = (((__const unsigned char *) \
- (__const char *) (s1))[1] \
- - ((__const unsigned char *) \
- (__const char *) (s2))[1]); \
+ __result = (((const unsigned char *) \
+ (const char *) (s1))[1] \
+ - ((const unsigned char *) \
+ (const char *) (s2))[1]); \
if (l > 1 && __result == 0) \
{ \
__result = \
- (((__const unsigned char *) \
- (__const char *) (s1))[2] \
- - ((__const unsigned char *) \
- (__const char *) (s2))[2]); \
+ (((const unsigned char *) \
+ (const char *) (s1))[2] \
+ - ((const unsigned char *) \
+ (const char *) (s2))[2]); \
if (l > 2 && __result == 0) \
__result = \
- (((__const unsigned char *) \
- (__const char *) (s1))[3] \
- - ((__const unsigned char *) \
- (__const char *) (s2))[3]); \
+ (((const unsigned char *) \
+ (const char *) (s1))[3] \
+ - ((const unsigned char *) \
+ (const char *) (s2))[3]); \
} \
} \
__result; }))
# define __strcmp_cg(s1, s2, l1) \
- (__extension__ ({ __const unsigned char *__s2 = \
- (__const unsigned char *) (__const char *) (s2); \
+ (__extension__ ({ const unsigned char *__s2 = \
+ (const unsigned char *) (const char *) (s2); \
register int __result = \
- (((__const unsigned char *) (__const char *) (s1))[0] \
+ (((const unsigned char *) (const char *) (s1))[0] \
- __s2[0]); \
if (l1 > 0 && __result == 0) \
{ \
- __result = (((__const unsigned char *) \
- (__const char *) (s1))[1] - __s2[1]); \
+ __result = (((const unsigned char *) \
+ (const char *) (s1))[1] - __s2[1]); \
if (l1 > 1 && __result == 0) \
{ \
- __result = (((__const unsigned char *) \
- (__const char *) (s1))[2] - __s2[2]);\
+ __result = (((const unsigned char *) \
+ (const char *) (s1))[2] - __s2[2]); \
if (l1 > 2 && __result == 0) \
- __result = (((__const unsigned char *) \
- (__const char *) (s1))[3] \
+ __result = (((const unsigned char *) \
+ (const char *) (s1))[3] \
- __s2[3]); \
} \
} \
__result; }))
# define __strcmp_gc(s1, s2, l2) \
- (__extension__ ({ __const unsigned char *__s1 = \
- (__const unsigned char *) (__const char *) (s1); \
+ (__extension__ ({ const unsigned char *__s1 = \
+ (const unsigned char *) (const char *) (s1); \
register int __result = \
- __s1[0] - ((__const unsigned char *) \
- (__const char *) (s2))[0]; \
+ __s1[0] - ((const unsigned char *) \
+ (const char *) (s2))[0]; \
if (l2 > 0 && __result == 0) \
{ \
__result = (__s1[1] \
- - ((__const unsigned char *) \
- (__const char *) (s2))[1]); \
+ - ((const unsigned char *) \
+ (const char *) (s2))[1]); \
if (l2 > 1 && __result == 0) \
{ \
__result = \
- (__s1[2] - ((__const unsigned char *) \
- (__const char *) (s2))[2]); \
+ (__s1[2] - ((const unsigned char *) \
+ (const char *) (s2))[2]); \
if (l2 > 2 && __result == 0) \
__result = \
(__s1[3] \
- - ((__const unsigned char *) \
- (__const char *) (s2))[3]); \
+ - ((const unsigned char *) \
+ (const char *) (s2))[3]); \
} \
} \
__result; }))
@@ -858,20 +858,20 @@
__extension__ \
({ char __r0, __r1, __r2; \
(__builtin_constant_p (reject) && __string2_1bptr_p (reject) \
- ? ((__r0 = ((__const char *) (reject))[0], __r0 == '\0') \
+ ? ((__r0 = ((const char *) (reject))[0], __r0 == '\0') \
? strlen (s) \
- : ((__r1 = ((__const char *) (reject))[1], __r1 == '\0') \
+ : ((__r1 = ((const char *) (reject))[1], __r1 == '\0') \
? __strcspn_c1 (s, __r0) \
- : ((__r2 = ((__const char *) (reject))[2], __r2 == '\0') \
+ : ((__r2 = ((const char *) (reject))[2], __r2 == '\0') \
? __strcspn_c2 (s, __r0, __r1) \
- : (((__const char *) (reject))[3] == '\0' \
+ : (((const char *) (reject))[3] == '\0' \
? __strcspn_c3 (s, __r0, __r1, __r2) \
: strcspn (s, reject))))) \
: strcspn (s, reject)); })
-__STRING_INLINE size_t __strcspn_c1 (__const char *__s, char __reject);
+__STRING_INLINE size_t __strcspn_c1 (const char *__s, char __reject);
__STRING_INLINE size_t
-__strcspn_c1 (__const char *__s, char __reject)
+__strcspn_c1 (const char *__s, char __reject)
{
register size_t __result = 0;
while (__s[__result] != '\0' && __s[__result] != __reject)
@@ -879,10 +879,10 @@
return __result;
}
-__STRING_INLINE size_t __strcspn_c2 (__const char *__s, char __reject1,
+__STRING_INLINE size_t __strcspn_c2 (const char *__s, char __reject1,
char __reject2);
__STRING_INLINE size_t
-__strcspn_c2 (__const char *__s, char __reject1, char __reject2)
+__strcspn_c2 (const char *__s, char __reject1, char __reject2)
{
register size_t __result = 0;
while (__s[__result] != '\0' && __s[__result] != __reject1
@@ -891,10 +891,10 @@
return __result;
}
-__STRING_INLINE size_t __strcspn_c3 (__const char *__s, char __reject1,
+__STRING_INLINE size_t __strcspn_c3 (const char *__s, char __reject1,
char __reject2, char __reject3);
__STRING_INLINE size_t
-__strcspn_c3 (__const char *__s, char __reject1, char __reject2,
+__strcspn_c3 (const char *__s, char __reject1, char __reject2,
char __reject3)
{
register size_t __result = 0;
@@ -913,20 +913,20 @@
__extension__ \
({ char __a0, __a1, __a2; \
(__builtin_constant_p (accept) && __string2_1bptr_p (accept) \
- ? ((__a0 = ((__const char *) (accept))[0], __a0 == '\0') \
+ ? ((__a0 = ((const char *) (accept))[0], __a0 == '\0') \
? 0 \
- : ((__a1 = ((__const char *) (accept))[1], __a1 == '\0') \
+ : ((__a1 = ((const char *) (accept))[1], __a1 == '\0') \
? __strspn_c1 (s, __a0) \
- : ((__a2 = ((__const char *) (accept))[2], __a2 == '\0') \
+ : ((__a2 = ((const char *) (accept))[2], __a2 == '\0') \
? __strspn_c2 (s, __a0, __a1) \
- : (((__const char *) (accept))[3] == '\0' \
+ : (((const char *) (accept))[3] == '\0' \
? __strspn_c3 (s, __a0, __a1, __a2) \
: strspn (s, accept))))) \
: strspn (s, accept)); })
-__STRING_INLINE size_t __strspn_c1 (__const char *__s, char __accept);
+__STRING_INLINE size_t __strspn_c1 (const char *__s, char __accept);
__STRING_INLINE size_t
-__strspn_c1 (__const char *__s, char __accept)
+__strspn_c1 (const char *__s, char __accept)
{
register size_t __result = 0;
/* Please note that __accept never can be '\0'. */
@@ -935,10 +935,10 @@
return __result;
}
-__STRING_INLINE size_t __strspn_c2 (__const char *__s, char __accept1,
+__STRING_INLINE size_t __strspn_c2 (const char *__s, char __accept1,
char __accept2);
__STRING_INLINE size_t
-__strspn_c2 (__const char *__s, char __accept1, char __accept2)
+__strspn_c2 (const char *__s, char __accept1, char __accept2)
{
register size_t __result = 0;
/* Please note that __accept1 and __accept2 never can be '\0'. */
@@ -947,10 +947,10 @@
return __result;
}
-__STRING_INLINE size_t __strspn_c3 (__const char *__s, char __accept1,
+__STRING_INLINE size_t __strspn_c3 (const char *__s, char __accept1,
char __accept2, char __accept3);
__STRING_INLINE size_t
-__strspn_c3 (__const char *__s, char __accept1, char __accept2, char __accept3)
+__strspn_c3 (const char *__s, char __accept1, char __accept2, char __accept3)
{
register size_t __result = 0;
/* Please note that __accept1 to __accept3 never can be '\0'. */
@@ -968,21 +968,21 @@
__extension__ \
({ char __a0, __a1, __a2; \
(__builtin_constant_p (accept) && __string2_1bptr_p (accept) \
- ? ((__a0 = ((__const char *) (accept))[0], __a0 == '\0') \
+ ? ((__a0 = ((const char *) (accept))[0], __a0 == '\0') \
? NULL \
- : ((__a1 = ((__const char *) (accept))[1], __a1 == '\0') \
+ : ((__a1 = ((const char *) (accept))[1], __a1 == '\0') \
? strchr (s, __a0) \
- : ((__a2 = ((__const char *) (accept))[2], __a2 == '\0') \
+ : ((__a2 = ((const char *) (accept))[2], __a2 == '\0') \
? __strpbrk_c2 (s, __a0, __a1) \
- : (((__const char *) (accept))[3] == '\0' \
+ : (((const char *) (accept))[3] == '\0' \
? __strpbrk_c3 (s, __a0, __a1, __a2) \
: strpbrk (s, accept))))) \
: strpbrk (s, accept)); })
-__STRING_INLINE char *__strpbrk_c2 (__const char *__s, char __accept1,
+__STRING_INLINE char *__strpbrk_c2 (const char *__s, char __accept1,
char __accept2);
__STRING_INLINE char *
-__strpbrk_c2 (__const char *__s, char __accept1, char __accept2)
+__strpbrk_c2 (const char *__s, char __accept1, char __accept2)
{
/* Please note that __accept1 and __accept2 never can be '\0'. */
while (*__s != '\0' && *__s != __accept1 && *__s != __accept2)
@@ -990,10 +990,10 @@
return *__s == '\0' ? NULL : (char *) (size_t) __s;
}
-__STRING_INLINE char *__strpbrk_c3 (__const char *__s, char __accept1,
+__STRING_INLINE char *__strpbrk_c3 (const char *__s, char __accept1,
char __accept2, char __accept3);
__STRING_INLINE char *
-__strpbrk_c3 (__const char *__s, char __accept1, char __accept2,
+__strpbrk_c3 (const char *__s, char __accept1, char __accept2,
char __accept3)
{
/* Please note that __accept1 to __accept3 never can be '\0'. */
@@ -1009,11 +1009,11 @@
#ifndef _HAVE_STRING_ARCH_strstr
# define strstr(haystack, needle) \
(__extension__ (__builtin_constant_p (needle) && __string2_1bptr_p (needle) \
- ? (((__const char *) (needle))[0] == '\0' \
+ ? (((const char *) (needle))[0] == '\0' \
? (char *) (size_t) (haystack) \
- : (((__const char *) (needle))[1] == '\0' \
+ : (((const char *) (needle))[1] == '\0' \
? strchr (haystack, \
- ((__const char *) (needle))[0]) \
+ ((const char *) (needle))[0]) \
: strstr (haystack, needle))) \
: strstr (haystack, needle)))
#endif
@@ -1022,9 +1022,9 @@
#if defined __USE_GNU && !defined _FORCE_INLINES
# ifndef _HAVE_STRING_ARCH_strnlen
__STRING_INLINE size_t
-strnlen (__const char *__string, size_t __maxlen)
+strnlen (const char *__string, size_t __maxlen)
{
- __const char *__end = (__const char *) memchr (__string, '\0', __maxlen);
+ const char *__end = (const char *) memchr (__string, '\0', __maxlen);
return __end ? __end - __string : __maxlen;
}
# endif
@@ -1034,9 +1034,9 @@
#ifndef _HAVE_STRING_ARCH_strtok_r
# define __strtok_r(s, sep, nextp) \
(__extension__ (__builtin_constant_p (sep) && __string2_1bptr_p (sep) \
- ? (((__const char *) (sep))[0] != '\0' \
- && ((__const char *) (sep))[1] == '\0' \
- ? __strtok_r_1c (s, ((__const char *) (sep))[0], nextp) \
+ ? (((const char *) (sep))[0] != '\0' \
+ && ((const char *) (sep))[1] == '\0' \
+ ? __strtok_r_1c (s, ((const char *) (sep))[0], nextp) \
: __strtok_r (s, sep, nextp)) \
: __strtok_r (s, sep, nextp)))
@@ -1078,14 +1078,14 @@
__extension__ \
({ char __r0, __r1, __r2; \
(__builtin_constant_p (reject) && __string2_1bptr_p (reject) \
- && (__r0 = ((__const char *) (reject))[0], \
- ((__const char *) (reject))[0] != '\0') \
- ? ((__r1 = ((__const char *) (reject))[1], \
- ((__const char *) (reject))[1] == '\0') \
+ && (__r0 = ((const char *) (reject))[0], \
+ ((const char *) (reject))[0] != '\0') \
+ ? ((__r1 = ((const char *) (reject))[1], \
+ ((const char *) (reject))[1] == '\0') \
? __strsep_1c (s, __r0) \
- : ((__r2 = ((__const char *) (reject))[2], __r2 == '\0') \
+ : ((__r2 = ((const char *) (reject))[2], __r2 == '\0') \
? __strsep_2c (s, __r0, __r1) \
- : (((__const char *) (reject))[3] == '\0' \
+ : (((const char *) (reject))[3] == '\0' \
? __strsep_3c (s, __r0, __r1, __r2) \
: __strsep_g (s, reject)))) \
: __strsep_g (s, reject)); })
@@ -1160,9 +1160,9 @@
return __retval;
}
-__STRING_INLINE char *__strsep_g (char **__s, __const char *__reject);
+__STRING_INLINE char *__strsep_g (char **__s, const char *__reject);
__STRING_INLINE char *
-__strsep_g (char **__s, __const char *__reject)
+__strsep_g (char **__s, const char *__reject)
{
register char *__retval = *__s;
if (__retval == NULL || *__retval == '\0')
@@ -1190,7 +1190,7 @@
# define __strdup(s) \
(__extension__ (__builtin_constant_p (s) && __string2_1bptr_p (s) \
- ? (((__const char *) (s))[0] == '\0' \
+ ? (((const char *) (s))[0] == '\0' \
? (char *) calloc (1, 1) \
: ({ size_t __len = strlen (s) + 1; \
char *__retval = (char *) malloc (__len); \
@@ -1208,7 +1208,7 @@
# define __strndup(s, n) \
(__extension__ (__builtin_constant_p (s) && __string2_1bptr_p (s) \
- ? (((__const char *) (s))[0] == '\0' \
+ ? (((const char *) (s))[0] == '\0' \
? (char *) calloc (1, 1) \
: ({ size_t __len = strlen (s) + 1; \
size_t __n = (n); \
============================================================
Index: string/envz.h
--- string/envz.h 1999/10/09 21:24:43 1.12
+++ string/envz.h 1999/12/31 16:25:30
@@ -30,13 +30,13 @@
__BEGIN_DECLS
/* Returns a pointer to the entry in ENVZ for NAME, or 0 if there is none. */
-extern char *envz_entry (__const char *__restrict __envz, size_t __envz_len,
- __const char *__restrict __name) __THROW;
+extern char *envz_entry (const char *__restrict __envz, size_t __envz_len,
+ const char *__restrict __name) __THROW;
/* Returns a pointer to the value portion of the entry in ENVZ for NAME, or 0
if there is none. */
-extern char *envz_get (__const char *__restrict __envz, size_t __envz_len,
- __const char *__restrict __name) __THROW;
+extern char *envz_get (const char *__restrict __envz, size_t __envz_len,
+ const char *__restrict __name) __THROW;
/* Adds an entry for NAME with value VALUE to ENVZ & ENVZ_LEN. If an entry
with the same name already exists in ENVZ, it is removed. If VALUE is
@@ -46,21 +46,21 @@
entry in the other one. Null entries can be removed with envz_strip (). */
extern error_t envz_add (char **__restrict __envz,
size_t *__restrict __envz_len,
- __const char *__restrict __name,
- __const char *__restrict __value) __THROW;
+ const char *__restrict __name,
+ const char *__restrict __value) __THROW;
/* Adds each entry in ENVZ2 to ENVZ & ENVZ_LEN, as if with envz_add(). If
OVERRIDE is true, then values in ENVZ2 will supersede those with the same
name in ENV, otherwise not. */
extern error_t envz_merge (char **__restrict __envz,
size_t *__restrict __envz_len,
- __const char *__restrict __envz2,
+ const char *__restrict __envz2,
size_t __envz2_len, int __override) __THROW;
/* Remove the entry for NAME from ENVZ & ENVZ_LEN, if any. */
extern void envz_remove (char **__restrict __envz,
size_t *__restrict __envz_len,
- __const char *__restrict __name) __THROW;
+ const char *__restrict __name) __THROW;
/* Remove null entries. */
extern void envz_strip (char **__restrict __envz,
============================================================
Index: sysdeps/i386/bits/string.h
--- sysdeps/i386/bits/string.h 1999/10/04 07:26:50 1.17
+++ sysdeps/i386/bits/string.h 1999/12/31 16:25:31
@@ -47,11 +47,11 @@
: memcpy (dest, src, n)))
/* This looks horribly ugly, but the compiler can optimize it totally,
as the count is constant. */
-__STRING_INLINE void *__memcpy_c (void *__dest, __const void *__src,
+__STRING_INLINE void *__memcpy_c (void *__dest, const void *__src,
size_t __n);
__STRING_INLINE void *
-__memcpy_c (void *__dest, __const void *__src, size_t __n)
+__memcpy_c (void *__dest, const void *__src, size_t __n)
{
register unsigned long int __d0, __d1, __d2;
union {
@@ -149,7 +149,7 @@
#define _HAVE_STRING_ARCH_memmove 1
#ifndef _FORCE_INLINES
__STRING_INLINE void *
-memmove (void *__dest, __const void *__src, size_t __n)
+memmove (void *__dest, const void *__src, size_t __n)
{
register unsigned long int __d0, __d1, __d2;
if (__dest < __src)
@@ -287,7 +287,7 @@
#define _HAVE_STRING_ARCH_memchr 1
#ifndef _FORCE_INLINES
__STRING_INLINE void *
-memchr (__const void *__s, int __c, size_t __n)
+memchr (const void *__s, int __c, size_t __n)
{
register unsigned long int __d0;
register void *__res;
@@ -309,7 +309,7 @@
#define _HAVE_STRING_ARCH_memrchr 1
#ifndef _FORCE_INLINES
__STRING_INLINE void *
-__memrchr (__const void *__s, int __c, size_t __n)
+__memrchr (const void *__s, int __c, size_t __n)
{
register unsigned long int __d0;
register void *__res;
@@ -335,7 +335,7 @@
#define _HAVE_STRING_ARCH_strlen 1
#ifndef _FORCE_INLINES
__STRING_INLINE size_t
-strlen (__const char *__str)
+strlen (const char *__str)
{
register unsigned long int __d0;
register size_t __res;
@@ -354,7 +354,7 @@
#define _HAVE_STRING_ARCH_strcpy 1
#ifndef _FORCE_INLINES
__STRING_INLINE char *
-strcpy (char *__dest, __const char *__src)
+strcpy (char *__dest, const char *__src)
{
register unsigned long int __d0, __d1;
__asm__ __volatile__
@@ -375,7 +375,7 @@
#define _HAVE_STRING_ARCH_strncpy 1
#ifndef _FORCE_INLINES
__STRING_INLINE char *
-strncpy (char *__dest, __const char *__src, size_t __n)
+strncpy (char *__dest, const char *__src, size_t __n)
{
register unsigned long int __d0, __d1, __d2;
__asm__ __volatile__
@@ -400,7 +400,7 @@
#define _HAVE_STRING_ARCH_strcat 1
#ifndef _FORCE_INLINES
__STRING_INLINE char *
-strcat (char *__dest, __const char *__src)
+strcat (char *__dest, const char *__src)
{
register unsigned long int __d0, __d1, __d2, __d3;
__asm__ __volatile__
@@ -423,7 +423,7 @@
#define _HAVE_STRING_ARCH_strncat 1
#ifndef _FORCE_INLINES
__STRING_INLINE char *
-strncat (char *__dest, __const char *__src, size_t __n)
+strncat (char *__dest, const char *__src, size_t __n)
{
register unsigned long int __d0, __d1, __d2, __d3;
__asm__ __volatile__
@@ -454,7 +454,7 @@
#define _HAVE_STRING_ARCH_strcmp 1
#ifndef _FORCE_INLINES
__STRING_INLINE int
-strcmp (__const char *__s1, __const char *__s2)
+strcmp (const char *__s1, const char *__s2)
{
register unsigned long int __d0, __d1;
register int __res;
@@ -483,7 +483,7 @@
#define _HAVE_STRING_ARCH_strncmp 1
#ifndef _FORCE_INLINES
__STRING_INLINE int
-strncmp (__const char *__s1, __const char *__s2, size_t __n)
+strncmp (const char *__s1, const char *__s2, size_t __n)
{
register unsigned long int __d0, __d1, __d2;
register int __res;
@@ -518,10 +518,10 @@
? __strchr_c (s, ((c) & 0xff) << 8) \
: __strchr_g (s, c)))
-__STRING_INLINE char *__strchr_g (__const char *__s, int __c);
+__STRING_INLINE char *__strchr_g (const char *__s, int __c);
__STRING_INLINE char *
-__strchr_g (__const char *__s, int __c)
+__strchr_g (const char *__s, int __c)
{
register unsigned long int __d0;
register char *__res;
@@ -543,10 +543,10 @@
return __res - 1;
}
-__STRING_INLINE char *__strchr_c (__const char *__s, int __c);
+__STRING_INLINE char *__strchr_c (const char *__s, int __c);
__STRING_INLINE char *
-__strchr_c (__const char *__s, int __c)
+__strchr_c (const char *__s, int __c)
{
register unsigned long int __d0;
register char *__res;
@@ -577,10 +577,10 @@
: __strchrnul_c (s, ((c) & 0xff) << 8)) \
: __strchrnul_g (s, c)))
-__STRING_INLINE char *__strchrnul_g (__const char *__s, int __c);
+__STRING_INLINE char *__strchrnul_g (const char *__s, int __c);
__STRING_INLINE char *
-__strchrnul_g (__const char *__s, int __c)
+__strchrnul_g (const char *__s, int __c)
{
register unsigned long int __d0;
register char *__res;
@@ -601,10 +601,10 @@
return __res - 1;
}
-__STRING_INLINE char *__strchrnul_c (__const char *__s, int __c);
+__STRING_INLINE char *__strchrnul_c (const char *__s, int __c);
__STRING_INLINE char *
-__strchrnul_c (__const char *__s, int __c)
+__strchrnul_c (const char *__s, int __c)
{
register unsigned long int __d0;
register char *__res;
@@ -634,7 +634,7 @@
#ifndef _FORCE_INLINES
# ifdef __PIC__
__STRING_INLINE size_t
-strcspn (__const char *__s, __const char *__reject)
+strcspn (const char *__s, const char *__reject)
{
register unsigned long int __d0, __d1, __d2;
register char *__res;
@@ -663,7 +663,7 @@
}
# else
__STRING_INLINE size_t
-strcspn (__const char *__s, __const char *__reject)
+strcspn (const char *__s, const char *__reject)
{
register unsigned long int __d0, __d1, __d2, __d3;
register char *__res;
@@ -698,7 +698,7 @@
#ifndef _FORCE_INLINES
# ifdef __PIC__
__STRING_INLINE size_t
-strspn (__const char *__s, __const char *__accept)
+strspn (const char *__s, const char *__accept)
{
register unsigned long int __d0, __d1, __d2;
register char *__res;
@@ -727,7 +727,7 @@
}
# else
__STRING_INLINE size_t
-strspn (__const char *__s, __const char *__accept)
+strspn (const char *__s, const char *__accept)
{
register unsigned long int __d0, __d1, __d2, __d3;
register char *__res;
@@ -761,7 +761,7 @@
#ifndef _FORCE_INLINES
# ifdef __PIC__
__STRING_INLINE char *
-strpbrk (__const char *__s, __const char *__accept)
+strpbrk (const char *__s, const char *__accept)
{
unsigned long int __d0, __d1, __d2;
register char *__res;
@@ -794,7 +794,7 @@
}
# else
__STRING_INLINE char *
-strpbrk (__const char *__s, __const char *__accept)
+strpbrk (const char *__s, const char *__accept)
{
register unsigned long int __d0, __d1, __d2, __d3;
register char *__res;
@@ -832,7 +832,7 @@
#ifndef _FORCE_INLINES
# ifdef __PIC__
__STRING_INLINE char *
-strstr (__const char *__haystack, __const char *__needle)
+strstr (const char *__haystack, const char *__needle)
{
register unsigned long int __d0, __d1, __d2;
register char *__res;
@@ -864,7 +864,7 @@
}
# else
__STRING_INLINE char *
-strstr (__const char *__haystack, __const char *__needle)
+strstr (const char *__haystack, const char *__needle)
{
register unsigned long int __d0, __d1, __d2, __d3;
register char *__res;
============================================================
Index: sysdeps/i386/i486/bits/string.h
--- sysdeps/i386/i486/bits/string.h 1999/10/04 07:26:58 1.35
+++ sysdeps/i386/i486/bits/string.h 1999/12/31 16:25:32
@@ -61,11 +61,11 @@
? __memcpy_by2 (dest, src, n) \
: __memcpy_g (dest, src, n))))
-__STRING_INLINE void *__memcpy_by4 (void *__dest, __const void *__src,
+__STRING_INLINE void *__memcpy_by4 (void *__dest, const void *__src,
size_t __n);
__STRING_INLINE void *
-__memcpy_by4 (void *__dest, __const void *__src, size_t __n)
+__memcpy_by4 (void *__dest, const void *__src, size_t __n)
{
register unsigned long int __d0, __d1;
register void *__tmp = __dest;
@@ -83,11 +83,11 @@
return __dest;
}
-__STRING_INLINE void *__memcpy_by2 (void *__dest, __const void *__src,
+__STRING_INLINE void *__memcpy_by2 (void *__dest, const void *__src,
size_t __n);
__STRING_INLINE void *
-__memcpy_by2 (void *__dest, __const void *__src, size_t __n)
+__memcpy_by2 (void *__dest, const void *__src, size_t __n)
{
register unsigned long int __d0, __d1;
register void *__tmp = __dest;
@@ -110,11 +110,11 @@
return __dest;
}
-__STRING_INLINE void *__memcpy_g (void *__dest, __const void *__src,
+__STRING_INLINE void *__memcpy_g (void *__dest, const void *__src,
size_t __n);
__STRING_INLINE void *
-__memcpy_g (void *__dest, __const void *__src, size_t __n)
+__memcpy_g (void *__dest, const void *__src, size_t __n)
{
register unsigned long int __d0, __d1, __d2;
register void *__tmp = __dest;
@@ -140,7 +140,7 @@
/* Copy N bytes of SRC to DEST, guaranteeing
correct behavior for overlapping strings. */
__STRING_INLINE void *
-memmove (void *__dest, __const void *__src, size_t __n)
+memmove (void *__dest, const void *__src, size_t __n)
{
register unsigned long int __d0, __d1, __d2;
register void *__tmp = __dest;
@@ -157,7 +157,7 @@
"rep; movsb\n\t"
"cld"
: "=&c" (__d0), "=&S" (__d1), "=&D" (__d2)
- : "0" (__n), "1" (__n - 1 + (__const char *) __src),
+ : "0" (__n), "1" (__n - 1 + (const char *) __src),
"2" (__n - 1 + (char *) __tmp)
: "memory");
return __dest;
@@ -170,7 +170,7 @@
# ifndef __PIC__
/* gcc has problems to spill registers when using PIC. */
__STRING_INLINE int
-memcmp (__const void *__s1, __const void *__s2, size_t __n)
+memcmp (const void *__s1, const void *__s2, size_t __n)
{
register unsigned long int __d0, __d1, __d2;
register int __res;
@@ -414,7 +414,7 @@
#define _HAVE_STRING_ARCH_memchr 1
#ifndef _FORCE_INLINES
__STRING_INLINE void *
-memchr (__const void *__s, int __c, size_t __n)
+memchr (const void *__s, int __c, size_t __n)
{
register unsigned long int __d0;
#ifdef __i686__
@@ -449,7 +449,7 @@
#define _HAVE_STRING_ARCH_memrchr 1
#ifndef _FORCE_INLINES
__STRING_INLINE void *
-__memrchr (__const void *__s, int __c, size_t __n)
+__memrchr (const void *__s, int __c, size_t __n)
{
register unsigned long int __d0;
# ifdef __i686__
@@ -519,13 +519,13 @@
(__extension__ (__builtin_constant_p (str) \
? __builtin_strlen (str) \
: __strlen_g (str)))
-__STRING_INLINE size_t __strlen_g (__const char *__str);
+__STRING_INLINE size_t __strlen_g (const char *__str);
__STRING_INLINE size_t
-__strlen_g (__const char *__str)
+__strlen_g (const char *__str)
{
register char __dummy;
- register __const char *__tmp = __str;
+ register const char *__tmp = __str;
__asm__ __volatile__
("1:\n\t"
"movb (%0),%b1\n\t"
@@ -546,7 +546,7 @@
? (sizeof ((src)[0]) == 1 && strlen (src) + 1 <= 8 \
? __strcpy_small (dest, src, strlen (src) + 1) \
: (char *) memcpy ((char *) dest, \
- (__const char *) src, \
+ (const char *) src, \
strlen (src) + 1)) \
: __strcpy_g (dest, src)))
@@ -599,10 +599,10 @@
} \
(char *) __dest; }))
-__STRING_INLINE char *__strcpy_g (char *__dest, __const char *__src);
+__STRING_INLINE char *__strcpy_g (char *__dest, const char *__src);
__STRING_INLINE char *
-__strcpy_g (char *__dest, __const char *__src)
+__strcpy_g (char *__dest, const char *__src)
{
register char *__tmp = __dest;
register char __dummy;
@@ -693,11 +693,11 @@
} \
(char *) __u; }))
-__STRING_INLINE char *__mempcpy_by4 (char *__dest, __const char *__src,
+__STRING_INLINE char *__mempcpy_by4 (char *__dest, const char *__src,
size_t __srclen);
__STRING_INLINE char *
-__mempcpy_by4 (char *__dest, __const char *__src, size_t __srclen)
+__mempcpy_by4 (char *__dest, const char *__src, size_t __srclen)
{
register char *__tmp = __dest;
register unsigned long int __d0, __d1;
@@ -715,11 +715,11 @@
return __tmp;
}
-__STRING_INLINE char *__mempcpy_by2 (char *__dest, __const char *__src,
+__STRING_INLINE char *__mempcpy_by2 (char *__dest, const char *__src,
size_t __srclen);
__STRING_INLINE char *
-__mempcpy_by2 (char *__dest, __const char *__src, size_t __srclen)
+__mempcpy_by2 (char *__dest, const char *__src, size_t __srclen)
{
register char *__tmp = __dest;
register unsigned long int __d0, __d1;
@@ -742,11 +742,11 @@
return __tmp + 2;
}
-__STRING_INLINE char *__mempcpy_byn (char *__dest, __const char *__src,
+__STRING_INLINE char *__mempcpy_byn (char *__dest, const char *__src,
size_t __srclen);
__STRING_INLINE char *
-__mempcpy_byn (char *__dest, __const char *__src, size_t __srclen)
+__mempcpy_byn (char *__dest, const char *__src, size_t __srclen)
{
register unsigned long __d0, __d1;
register char *__tmp = __dest;
@@ -767,10 +767,10 @@
return __tmp;
}
-__STRING_INLINE char *__stpcpy_g (char *__dest, __const char *__src);
+__STRING_INLINE char *__stpcpy_g (char *__dest, const char *__src);
__STRING_INLINE char *
-__stpcpy_g (char *__dest, __const char *__src)
+__stpcpy_g (char *__dest, const char *__src)
{
register char *__tmp = __dest;
register char __dummy;
@@ -797,7 +797,7 @@
(__extension__ (__builtin_constant_p (src) \
? ((strlen (src) + 1 >= ((size_t) (n)) \
? (char *) memcpy ((char *) dest, \
- (__const char *) src, n) \
+ (const char *) src, n) \
: __strncpy_cg (dest, src, strlen (src) + 1, n))) \
: __strncpy_gg (dest, src, n)))
#define __strncpy_cg(dest, src, srclen, n) \
@@ -807,11 +807,11 @@
? __strncpy_by2 (dest, src, srclen, n) \
: __strncpy_byn (dest, src, srclen, n)))
-__STRING_INLINE char *__strncpy_by4 (char *__dest, __const char __src[],
+__STRING_INLINE char *__strncpy_by4 (char *__dest, const char __src[],
size_t __srclen, size_t __n);
__STRING_INLINE char *
-__strncpy_by4 (char *__dest, __const char __src[], size_t __srclen, size_t __n)
+__strncpy_by4 (char *__dest, const char __src[], size_t __srclen, size_t __n)
{
register char *__tmp = __dest;
register int __dummy1, __dummy2;
@@ -830,11 +830,11 @@
return __dest;
}
-__STRING_INLINE char *__strncpy_by2 (char *__dest, __const char __src[],
+__STRING_INLINE char *__strncpy_by2 (char *__dest, const char __src[],
size_t __srclen, size_t __n);
__STRING_INLINE char *
-__strncpy_by2 (char *__dest, __const char __src[], size_t __srclen, size_t __n)
+__strncpy_by2 (char *__dest, const char __src[], size_t __srclen, size_t __n)
{
register char *__tmp = __dest;
register int __dummy1, __dummy2;
@@ -858,11 +858,11 @@
return __dest;
}
-__STRING_INLINE char *__strncpy_byn (char *__dest, __const char __src[],
+__STRING_INLINE char *__strncpy_byn (char *__dest, const char __src[],
size_t __srclen, size_t __n);
__STRING_INLINE char *
-__strncpy_byn (char *__dest, __const char __src[], size_t __srclen, size_t __n)
+__strncpy_byn (char *__dest, const char __src[], size_t __srclen, size_t __n)
{
register unsigned long int __d0, __d1;
register char *__tmp = __dest;
@@ -884,11 +884,11 @@
return __dest;
}
-__STRING_INLINE char *__strncpy_gg (char *__dest, __const char *__src,
+__STRING_INLINE char *__strncpy_gg (char *__dest, const char *__src,
size_t __n);
__STRING_INLINE char *
-__strncpy_gg (char *__dest, __const char *__src, size_t __n)
+__strncpy_gg (char *__dest, const char *__src, size_t __n)
{
register char *__tmp = __dest;
register char __dummy;
@@ -924,11 +924,11 @@
? __strcat_c (dest, src, strlen (src) + 1) \
: __strcat_g (dest, src)))
-__STRING_INLINE char *__strcat_c (char *__dest, __const char __src[],
+__STRING_INLINE char *__strcat_c (char *__dest, const char __src[],
size_t __srclen);
__STRING_INLINE char *
-__strcat_c (char *__dest, __const char __src[], size_t __srclen)
+__strcat_c (char *__dest, const char __src[], size_t __srclen)
{
#ifdef __i686__
register unsigned long int __d0;
@@ -954,10 +954,10 @@
return __dest;
}
-__STRING_INLINE char *__strcat_g (char *__dest, __const char *__src);
+__STRING_INLINE char *__strcat_g (char *__dest, const char *__src);
__STRING_INLINE char *
-__strcat_g (char *__dest, __const char *__src)
+__strcat_g (char *__dest, const char *__src)
{
register char *__tmp = __dest - 1;
register char __dummy;
@@ -988,14 +988,14 @@
? (strlen (src) < ((size_t) (n)) \
? strcat (__dest, src) \
: (memcpy (strchr (__dest, '\0'), \
- (__const char *) src, n), __dest)) \
+ (const char *) src, n), __dest)) \
: __strncat_g (__dest, src, n); }))
-__STRING_INLINE char *__strncat_g (char *__dest, __const char __src[],
+__STRING_INLINE char *__strncat_g (char *__dest, const char __src[],
size_t __n);
__STRING_INLINE char *
-__strncat_g (char *__dest, __const char __src[], size_t __n)
+__strncat_g (char *__dest, const char __src[], size_t __n)
{
register char *__tmp = __dest;
register char __dummy;
@@ -1049,7 +1049,7 @@
(__extension__ (__builtin_constant_p (s1) && __builtin_constant_p (s2) \
&& (sizeof ((s1)[0]) != 1 || strlen (s1) >= 4) \
&& (sizeof ((s2)[0]) != 1 || strlen (s2) >= 4) \
- ? memcmp ((__const char *) s1, (__const char *) s2, \
+ ? memcmp ((const char *) s1, (const char *) s2, \
(strlen (s1) < strlen (s2) \
? strlen (s1) : strlen (s2)) + 1) \
: (__builtin_constant_p (s1) && sizeof ((s1)[0]) == 1 \
@@ -1083,7 +1083,7 @@
__result; }))
#define __strcmp_cg(s1, s2, l1) \
- (__extension__ ({ __const unsigned char *__s2 = (unsigned char *) (s2); \
+ (__extension__ ({ const unsigned char *__s2 = (unsigned char *) (s2); \
register int __result = (unsigned char) (s1)[0] - __s2[0];\
if (l1 > 0 && __result == 0) \
{ \
@@ -1098,7 +1098,7 @@
__result; }))
#define __strcmp_gc(s1, s2, l2) \
- (__extension__ ({ __const unsigned char *__s1 = (unsigned char *) (s1); \
+ (__extension__ ({ const unsigned char *__s1 = (unsigned char *) (s1); \
register int __result = __s1[0] - (unsigned char) (s2)[0];\
if (l2 > 0 && __result == 0) \
{ \
@@ -1112,10 +1112,10 @@
} \
__result; }))
-__STRING_INLINE int __strcmp_gg (__const char *__s1, __const char *__s2);
+__STRING_INLINE int __strcmp_gg (const char *__s1, const char *__s2);
__STRING_INLINE int
-__strcmp_gg (__const char *__s1, __const char *__s2)
+__strcmp_gg (const char *__s1, const char *__s2)
{
register int __res;
__asm__ __volatile__
@@ -1150,11 +1150,11 @@
? strcmp (s1, s2) \
: __strncmp_g (s1, s2, n))))
-__STRING_INLINE int __strncmp_g (__const char *__s1, __const char *__s2,
+__STRING_INLINE int __strncmp_g (const char *__s1, const char *__s2,
size_t __n);
__STRING_INLINE int
-__strncmp_g (__const char *__s1, __const char *__s2, size_t __n)
+__strncmp_g (const char *__s1, const char *__s2, size_t __n)
{
register int __res;
__asm__ __volatile__
@@ -1192,10 +1192,10 @@
: __strchr_c (s, ((c) & 0xff) << 8)) \
: __strchr_g (s, c)))
-__STRING_INLINE char *__strchr_c (__const char *__s, int __c);
+__STRING_INLINE char *__strchr_c (const char *__s, int __c);
__STRING_INLINE char *
-__strchr_c (__const char *__s, int __c)
+__strchr_c (const char *__s, int __c)
{
register unsigned long int __d0;
register char *__res;
@@ -1215,10 +1215,10 @@
return __res;
}
-__STRING_INLINE char *__strchr_g (__const char *__s, int __c);
+__STRING_INLINE char *__strchr_g (const char *__s, int __c);
__STRING_INLINE char *
-__strchr_g (__const char *__s, int __c)
+__strchr_g (const char *__s, int __c)
{
register unsigned long int __d0;
register char *__res;
@@ -1249,10 +1249,10 @@
: __strchrnul_c (s, ((c) & 0xff) << 8)) \
: __strchrnul_g (s, c)))
-__STRING_INLINE char *__strchrnul_c (__const char *__s, int __c);
+__STRING_INLINE char *__strchrnul_c (const char *__s, int __c);
__STRING_INLINE char *
-__strchrnul_c (__const char *__s, int __c)
+__strchrnul_c (const char *__s, int __c)
{
register unsigned long int __d0;
register char *__res;
@@ -1272,10 +1272,10 @@
return __res;
}
-__STRING_INLINE char *__strchrnul_g (__const char *__s, int __c);
+__STRING_INLINE char *__strchrnul_g (const char *__s, int __c);
__STRING_INLINE char *
-__strchrnul_g (__const char *__s, int __c)
+__strchrnul_g (const char *__s, int __c)
{
register unsigned long int __d0;
register char *__res;
@@ -1318,10 +1318,10 @@
: __strrchr_g (s, c)))
#ifdef __i686__
-__STRING_INLINE char *__strrchr_c (__const char *__s, int __c);
+__STRING_INLINE char *__strrchr_c (const char *__s, int __c);
__STRING_INLINE char *
-__strrchr_c (__const char *__s, int __c)
+__strrchr_c (const char *__s, int __c)
{
register unsigned long int __d0, __d1;
register char *__res;
@@ -1339,10 +1339,10 @@
return __res - 1;
}
-__STRING_INLINE char *__strrchr_g (__const char *__s, int __c);
+__STRING_INLINE char *__strrchr_g (const char *__s, int __c);
__STRING_INLINE char *
-__strrchr_g (__const char *__s, int __c)
+__strrchr_g (const char *__s, int __c)
{
register unsigned long int __d0, __d1;
register char *__res;
@@ -1361,10 +1361,10 @@
return __res - 1;
}
#else
-__STRING_INLINE char *__strrchr_c (__const char *__s, int __c);
+__STRING_INLINE char *__strrchr_c (const char *__s, int __c);
__STRING_INLINE char *
-__strrchr_c (__const char *__s, int __c)
+__strrchr_c (const char *__s, int __c)
{
register unsigned long int __d0, __d1;
register char *__res;
@@ -1384,10 +1384,10 @@
return __res;
}
-__STRING_INLINE char *__strrchr_g (__const char *__s, int __c);
+__STRING_INLINE char *__strrchr_g (const char *__s, int __c);
__STRING_INLINE char *
-__strrchr_g (__const char *__s, int __c)
+__strrchr_g (const char *__s, int __c)
{
register unsigned long int __d0, __d1;
register char *__res;
@@ -1432,10 +1432,10 @@
: __strcspn_cg (s, reject, strlen (reject)))) \
: __strcspn_g (s, reject)))
-__STRING_INLINE size_t __strcspn_c1 (__const char *__s, int __reject);
+__STRING_INLINE size_t __strcspn_c1 (const char *__s, int __reject);
__STRING_INLINE size_t
-__strcspn_c1 (__const char *__s, int __reject)
+__strcspn_c1 (const char *__s, int __reject)
{
register unsigned long int __d0;
register char *__res;
@@ -1454,14 +1454,14 @@
return (__res - 1) - __s;
}
-__STRING_INLINE size_t __strcspn_cg (__const char *__s, __const char __reject[],
+__STRING_INLINE size_t __strcspn_cg (const char *__s, const char __reject[],
size_t __reject_len);
__STRING_INLINE size_t
-__strcspn_cg (__const char *__s, __const char __reject[], size_t __reject_len)
+__strcspn_cg (const char *__s, const char __reject[], size_t __reject_len)
{
register unsigned long int __d0, __d1, __d2;
- register __const char *__res;
+ register const char *__res;
__asm__ __volatile__
("cld\n"
"1:\n\t"
@@ -1479,14 +1479,14 @@
return (__res - 1) - __s;
}
-__STRING_INLINE size_t __strcspn_g (__const char *__s, __const char *__reject);
+__STRING_INLINE size_t __strcspn_g (const char *__s, const char *__reject);
#ifdef __PIC__
__STRING_INLINE size_t
-__strcspn_g (__const char *__s, __const char *__reject)
+__strcspn_g (const char *__s, const char *__reject)
{
register unsigned long int __d0, __d1, __d2;
- register __const char *__res;
+ register const char *__res;
__asm__ __volatile__
("pushl %%ebx\n\t"
"movl %4,%%edi\n\t"
@@ -1511,10 +1511,10 @@
}
#else
__STRING_INLINE size_t
-__strcspn_g (__const char *__s, __const char *__reject)
+__strcspn_g (const char *__s, const char *__reject)
{
register unsigned long int __d0, __d1, __d2, __d3;
- register __const char *__res;
+ register const char *__res;
__asm__ __volatile__
("cld\n\t"
"repne; scasb\n\t"
@@ -1549,10 +1549,10 @@
: __strspn_cg (s, accept, strlen (accept)))) \
: __strspn_g (s, accept)))
-__STRING_INLINE size_t __strspn_c1 (__const char *__s, int __accept);
+__STRING_INLINE size_t __strspn_c1 (const char *__s, int __accept);
__STRING_INLINE size_t
-__strspn_c1 (__const char *__s, int __accept)
+__strspn_c1 (const char *__s, int __accept)
{
register unsigned long int __d0;
register char *__res;
@@ -1569,14 +1569,14 @@
return (__res - 1) - __s;
}
-__STRING_INLINE size_t __strspn_cg (__const char *__s, __const char __accept[],
+__STRING_INLINE size_t __strspn_cg (const char *__s, const char __accept[],
size_t __accept_len);
__STRING_INLINE size_t
-__strspn_cg (__const char *__s, __const char __accept[], size_t __accept_len)
+__strspn_cg (const char *__s, const char __accept[], size_t __accept_len)
{
register unsigned long int __d0, __d1, __d2;
- register __const char *__res;
+ register const char *__res;
__asm__ __volatile__
("cld\n"
"1:\n\t"
@@ -1594,14 +1594,14 @@
return (__res - 1) - __s;
}
-__STRING_INLINE size_t __strspn_g (__const char *__s, __const char *__accept);
+__STRING_INLINE size_t __strspn_g (const char *__s, const char *__accept);
#ifdef __PIC__
__STRING_INLINE size_t
-__strspn_g (__const char *__s, __const char *__accept)
+__strspn_g (const char *__s, const char *__accept)
{
register unsigned long int __d0, __d1, __d2;
- register __const char *__res;
+ register const char *__res;
__asm__ __volatile__
("pushl %%ebx\n\t"
"cld\n\t"
@@ -1625,10 +1625,10 @@
}
#else
__STRING_INLINE size_t
-__strspn_g (__const char *__s, __const char *__accept)
+__strspn_g (const char *__s, const char *__accept)
{
register unsigned long int __d0, __d1, __d2, __d3;
- register __const char *__res;
+ register const char *__res;
__asm__ __volatile__
("cld\n\t"
"repne; scasb\n\t"
@@ -1662,11 +1662,11 @@
: __strpbrk_cg (s, accept, strlen (accept)))) \
: __strpbrk_g (s, accept)))
-__STRING_INLINE char *__strpbrk_cg (__const char *__s, __const char __accept[],
+__STRING_INLINE char *__strpbrk_cg (const char *__s, const char __accept[],
size_t __accept_len);
__STRING_INLINE char *
-__strpbrk_cg (__const char *__s, __const char __accept[], size_t __accept_len)
+__strpbrk_cg (const char *__s, const char __accept[], size_t __accept_len)
{
register unsigned long int __d0, __d1, __d2;
register char *__res;
@@ -1691,11 +1691,11 @@
return __res;
}
-__STRING_INLINE char *__strpbrk_g (__const char *__s, __const char *__accept);
+__STRING_INLINE char *__strpbrk_g (const char *__s, const char *__accept);
#ifdef __PIC__
__STRING_INLINE char *
-__strpbrk_g (__const char *__s, __const char *__accept)
+__strpbrk_g (const char *__s, const char *__accept)
{
register unsigned long int __d0, __d1, __d2;
register char *__res;
@@ -1727,7 +1727,7 @@
}
#else
__STRING_INLINE char *
-__strpbrk_g (__const char *__s, __const char *__accept)
+__strpbrk_g (const char *__s, const char *__accept)
{
register unsigned long int __d0, __d1, __d2, __d3;
register char *__res;
@@ -1771,11 +1771,11 @@
/* Please note that this function need not handle NEEDLEs with a
length shorter than two. */
-__STRING_INLINE char *__strstr_cg (__const char *__haystack, __const char __needle[],
+__STRING_INLINE char *__strstr_cg (const char *__haystack, const char __needle[],
size_t __needle_len);
__STRING_INLINE char *
-__strstr_cg (__const char *__haystack, __const char __needle[],
+__strstr_cg (const char *__haystack, const char __needle[],
size_t __needle_len)
{
register unsigned long int __d0, __d1, __d2;
@@ -1799,11 +1799,11 @@
return __res;
}
-__STRING_INLINE char *__strstr_g (__const char *__haystack, __const char *__needle);
+__STRING_INLINE char *__strstr_g (const char *__haystack, const char *__needle);
#ifdef __PIC__
__STRING_INLINE char *
-__strstr_g (__const char *__haystack, __const char *__needle)
+__strstr_g (const char *__haystack, const char *__needle)
{
register unsigned long int __d0, __d1, __d2;
register char *__res;
@@ -1834,7 +1834,7 @@
}
#else
__STRING_INLINE char *
-__strstr_g (__const char *__haystack, __const char *__needle)
+__strstr_g (const char *__haystack, const char *__needle)
{
register unsigned long int __d0, __d1, __d2, __d3;
register char *__res;
============================================================
Index: sysdeps/unix/sysv/linux/sys/mount.h
--- sysdeps/unix/sysv/linux/sys/mount.h 1999/10/19 03:05:21 1.10
+++ sysdeps/unix/sysv/linux/sys/mount.h 1999/12/31 16:25:32
@@ -93,15 +93,15 @@
__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;
/* 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;
__END_DECLS
============================================================
Index: sysvipc/sys/msg.h
--- sysvipc/sys/msg.h 1999/10/09 21:26:15 1.6
+++ sysvipc/sys/msg.h 1999/12/31 16:25:32
@@ -52,7 +52,7 @@
long int __msgtyp, int __msgflg) __THROW;
/* Send message to message queue. */
-extern int msgsnd (int __msqid, __const void *__msgp, size_t __msgsz,
+extern int msgsnd (int __msqid, const void *__msgp, size_t __msgsz,
int __msgflg) __THROW;
__END_DECLS
============================================================
Index: sysvipc/sys/shm.h
--- sysvipc/sys/shm.h 1999/10/09 21:26:23 1.9
+++ sysvipc/sys/shm.h 1999/12/31 16:25:32
@@ -48,11 +48,11 @@
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
============================================================
Index: termios/termios.h
--- termios/termios.h 1999/10/09 21:26:29 1.18
+++ termios/termios.h 1999/12/31 16:25:32
@@ -46,10 +46,10 @@
#endif
/* Return the output baud rate stored in *TERMIOS_P. */
-extern speed_t cfgetospeed (__const struct termios *__termios_p) __THROW;
+extern speed_t cfgetospeed (const struct termios *__termios_p) __THROW;
/* Return the input baud rate stored in *TERMIOS_P. */
-extern speed_t cfgetispeed (__const struct termios *__termios_p) __THROW;
+extern speed_t cfgetispeed (const struct termios *__termios_p) __THROW;
/* Set the output baud rate stored in *TERMIOS_P to SPEED. */
extern int cfsetospeed (struct termios *__termios_p, speed_t __speed) __THROW;
@@ -69,7 +69,7 @@
/* Set the state of FD to *TERMIOS_P.
Values for OPTIONAL_ACTIONS (TCSA*) are in <bits/termios.h>. */
extern int tcsetattr (int __fd, int __optional_actions,
- __const struct termios *__termios_p) __THROW;
+ const struct termios *__termios_p) __THROW;
#ifdef __USE_BSD
============================================================
Index: time/sys/time.h
--- time/sys/time.h 1999/10/09 21:26:39 1.24
+++ time/sys/time.h 1999/12/31 16:25:32
@@ -58,14 +58,14 @@
/* 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) __THROW;
+extern int settimeofday (const struct timeval *__tv,
+ const struct timezone *__tz) __THROW;
/* Adjust the current time of day by the amount in DELTA.
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;
@@ -103,12 +103,12 @@
set *OLD to the old value of timer WHICH.
Returns 0 on success, -1 on errors. */
extern int setitimer (enum __itimer_which __which,
- __const struct itimerval *__new,
+ const struct itimerval *__new,
struct itimerval *__old) __THROW;
/* Change the access time of FILE to TVP[0] and
the modification time of FILE to TVP[1]. */
-extern int utimes (__const char *__file, struct timeval __tvp[2]) __THROW;
+extern int utimes (const char *__file, struct timeval __tvp[2]) __THROW;
/* Convenience macros for operations on timevals.
============================================================
Index: time/time.h
--- time/time.h 1999/10/09 21:26:34 1.51
+++ time/time.h 1999/12/31 16:25:33
@@ -106,10 +106,10 @@
# ifdef __USE_BSD
long int tm_gmtoff; /* Seconds east of UTC. */
- __const char *tm_zone; /* Timezone abbreviation. */
+ const char *tm_zone; /* Timezone abbreviation. */
# else
long int __tm_gmtoff; /* Seconds east of UTC. */
- __const char *__tm_zone; /* Timezone abbreviation. */
+ const char *__tm_zone; /* Timezone abbreviation. */
# endif
};
@@ -153,54 +153,54 @@
Write no more than MAXSIZE characters and return the number
of characters written, or 0 if it would exceed MAXSIZE. */
extern size_t strftime (char *__restrict __s, size_t __maxsize,
- __const char *__restrict __format,
- __const struct tm *__restrict __tp) __THROW;
+ const char *__restrict __format,
+ const struct tm *__restrict __tp) __THROW;
# ifdef __USE_XOPEN
/* Parse S according to FORMAT and store binary time information in TP.
The return value is a pointer to the first unparsed character in S. */
-extern char *strptime (__const char *__s, __const char *__fmt, struct tm *__tp)
+extern char *strptime (const char *__s, const char *__fmt, struct tm *__tp)
__THROW;
# endif
/* Return the `struct tm' representation of *TIMER
in Universal Coordinated Time (aka Greenwich Mean Time). */
-extern struct tm *gmtime (__const time_t *__timer) __THROW;
+extern struct tm *gmtime (const time_t *__timer) __THROW;
/* Return the `struct tm' representation
of *TIMER in the local timezone. */
-extern struct tm *localtime (__const time_t *__timer) __THROW;
+extern struct tm *localtime (const time_t *__timer) __THROW;
# if defined __USE_POSIX || defined __USE_MISC
/* Return the `struct tm' representation of *TIMER in UTC,
using *TP to store the result. */
-extern struct tm *gmtime_r (__const time_t *__restrict __timer,
+extern struct tm *gmtime_r (const time_t *__restrict __timer,
struct tm *__restrict __tp) __THROW;
/* Return the `struct tm' representation of *TIMER in local time,
using *TP to store the result. */
-extern struct tm *localtime_r (__const time_t *__restrict __timer,
+extern struct tm *localtime_r (const time_t *__restrict __timer,
struct tm *__restrict __tp) __THROW;
# endif /* POSIX or misc */
/* Return a string of the form "Day Mon dd hh:mm:ss yyyy\n"
that is the representation of TP in this format. */
-extern char *asctime (__const struct tm *__tp) __THROW;
+extern char *asctime (const struct tm *__tp) __THROW;
/* Equivalent to `asctime (localtime (timer))'. */
-extern char *ctime (__const time_t *__timer) __THROW;
+extern char *ctime (const time_t *__timer) __THROW;
# if defined __USE_POSIX || defined __USE_MISC
/* Reentrant versions of the above functions. */
/* Return in BUF a string of the form "Day Mon dd hh:mm:ss yyyy\n"
that is the representation of TP in this format. */
-extern char *asctime_r (__const struct tm *__restrict __tp,
+extern char *asctime_r (const struct tm *__restrict __tp,
char *__restrict __buf) __THROW;
/* Equivalent to `asctime_r (localtime_r (timer, *TMP*), buf)'. */
-extern char *ctime_r (__const time_t *__restrict __timer,
+extern char *ctime_r (const time_t *__restrict __timer,
char *__restrict __buf) __THROW;
# endif /* POSIX or misc */
@@ -228,7 +228,7 @@
# ifdef __USE_SVID
/* Set the system time to *WHEN.
This call is restricted to the superuser. */
-extern int stime (__const time_t *__when) __THROW;
+extern int stime (const time_t *__when) __THROW;
# endif
@@ -255,7 +255,7 @@
# ifdef __USE_POSIX199309
/* Pause execution for a number of nanoseconds. */
-extern int nanosleep (__const struct timespec *__requested_time,
+extern int nanosleep (const struct timespec *__requested_time,
struct timespec *__remaining) __THROW;
@@ -266,7 +266,7 @@
extern int clock_gettime (clockid_t __clock_id, struct timespec *__tp) __THROW;
/* Set clock CLOCK_ID to value TP. */
-extern int clock_settime (clockid_t __clock_id, __const struct timespec *__tp)
+extern int clock_settime (clockid_t __clock_id, const struct timespec *__tp)
__THROW;
@@ -279,7 +279,7 @@
/* Set timer TIMERID to VALUE, returning old value in OVLAUE. */
extern int timer_settime (timer_t __timerid, int __flags,
- __const struct itimerspec *__value,
+ const struct itimerspec *__value,
struct itimerspec *__ovalue) __THROW;
/* Get current value of timer TIMERID and store it in VLAUE. */
@@ -309,7 +309,7 @@
representing the value. The templates from the file identified by
the environment variable DATEMSK are used. In case of an error
`getdate_err' is set. */
-extern struct tm *getdate (__const char *__string) __THROW;
+extern struct tm *getdate (const char *__string) __THROW;
# endif
# ifdef __USE_GNU
@@ -318,7 +318,7 @@
variant. The functionality is the same. The result is returned in
the buffer pointed to by RESBUFP and in case of an error the return
value is != 0 with the same values as given above for `getdate_err'. */
-extern int getdate_r (__const char *__restrict __string,
+extern int getdate_r (const char *__restrict __string,
struct tm *__restrict __resbufp) __THROW;
# endif
============================================================
Index: wcsmbs/wchar.h
--- wcsmbs/wchar.h 1999/10/31 17:31:46 1.37
+++ wcsmbs/wchar.h 1999/12/31 16:25:34
@@ -100,53 +100,53 @@
/* Copy SRC to DEST. */
extern wchar_t *wcscpy (wchar_t *__restrict __dest,
- __const wchar_t *__restrict __src) __THROW;
+ const wchar_t *__restrict __src) __THROW;
/* Copy no more than N wide-characters of SRC to DEST. */
extern wchar_t *wcsncpy (wchar_t *__restrict __dest,
- __const wchar_t *__restrict __src, size_t __n)
+ const wchar_t *__restrict __src, size_t __n)
__THROW;
/* Append SRC onto DEST. */
extern wchar_t *wcscat (wchar_t *__restrict __dest,
- __const wchar_t *__restrict __src) __THROW;
+ const wchar_t *__restrict __src) __THROW;
/* Append no more than N wide-characters of SRC onto DEST. */
extern wchar_t *wcsncat (wchar_t *__restrict __dest,
- __const wchar_t *__restrict __src, size_t __n)
+ const wchar_t *__restrict __src, size_t __n)
__THROW;
/* Compare S1 and S2. */
-extern int wcscmp (__const wchar_t *__s1, __const wchar_t *__s2) __THROW;
+extern int wcscmp (const wchar_t *__s1, const wchar_t *__s2) __THROW;
/* Compare N wide-characters of S1 and S2. */
-extern int wcsncmp (__const wchar_t *__s1, __const wchar_t *__s2, size_t __n)
+extern int wcsncmp (const wchar_t *__s1, const wchar_t *__s2, size_t __n)
__THROW;
#ifdef __USE_GNU
/* Compare S1 and S2, ignoring case. */
-extern int wcscasecmp (__const wchar_t *__s1, __const wchar_t *__s2) __THROW;
+extern int wcscasecmp (const wchar_t *__s1, const wchar_t *__s2) __THROW;
/* Compare no more than N chars of S1 and S2, ignoring case. */
-extern int wcsncasecmp (__const wchar_t *__s1, __const wchar_t *__s2,
+extern int wcsncasecmp (const wchar_t *__s1, const wchar_t *__s2,
size_t __n) __THROW;
/* Similar to the two functions above but take the information from
the provided locale and not the global locale. */
# include <xlocale.h>
-extern int __wcscasecmp_l (__const wchar_t *__s1, __const wchar_t *__s2,
+extern int __wcscasecmp_l (const wchar_t *__s1, const wchar_t *__s2,
__locale_t __loc) __THROW;
-extern int __wcsncasecmp_l (__const wchar_t *__s1, __const wchar_t *__s2,
+extern int __wcsncasecmp_l (const wchar_t *__s1, const wchar_t *__s2,
size_t __n, __locale_t __loc) __THROW;
#endif
/* Compare S1 and S2, both interpreted as appropriate to the
LC_COLLATE category of the current locale. */
-extern int wcscoll (__const wchar_t *__s1, __const wchar_t *__s2) __THROW;
+extern int wcscoll (const wchar_t *__s1, const wchar_t *__s2) __THROW;
/* Transform S2 into array pointed to by S1 such that if wcscmp is
applied to two transformed strings the result is the as applying
`wcscoll' to the original strings. */
extern size_t wcsxfrm (wchar_t *__restrict __s1,
- __const wchar_t *__restrict __s2, size_t __n) __THROW;
+ const wchar_t *__restrict __s2, size_t __n) __THROW;
#ifdef __USE_GNU
/* Similar to the two functions above but take the information from
@@ -154,80 +154,80 @@
/* Compare S1 and S2, both interpreted as appropriate to the
LC_COLLATE category of the given locale. */
-extern int __wcscoll_l (__const wchar_t *__s1, __const wchar_t *__s2,
+extern int __wcscoll_l (const wchar_t *__s1, const wchar_t *__s2,
__locale_t __loc) __THROW;
/* Transform S2 into array pointed to by S1 such that if wcscmp is
applied to two transformed strings the result is the as applying
`wcscoll' to the original strings. */
-extern size_t __wcsxfrm_l (wchar_t *__s1, __const wchar_t *__s2,
+extern size_t __wcsxfrm_l (wchar_t *__s1, const wchar_t *__s2,
size_t __n, __locale_t __loc) __THROW;
/* Duplicate S, returning an identical malloc'd string. */
-extern wchar_t *wcsdup (__const wchar_t *__s) __THROW;
+extern wchar_t *wcsdup (const wchar_t *__s) __THROW;
#endif
/* Find the first occurrence of WC in WCS. */
-extern wchar_t *wcschr (__const wchar_t *__wcs, wchar_t __wc) __THROW;
+extern wchar_t *wcschr (const wchar_t *__wcs, wchar_t __wc) __THROW;
/* Find the last occurrence of WC in WCS. */
-extern wchar_t *wcsrchr (__const wchar_t *__wcs, wchar_t __wc) __THROW;
+extern wchar_t *wcsrchr (const wchar_t *__wcs, wchar_t __wc) __THROW;
#ifdef __USE_GNU
/* This funciton is similar to `wcschr'. But it returns a pointer to
the closing NUL wide character in case C is not found in S. */
-extern wchar_t *wcschrnul (__const wchar_t *__s, wchar_t __wc) __THROW;
+extern wchar_t *wcschrnul (const wchar_t *__s, wchar_t __wc) __THROW;
#endif
/* Return the length of the initial segmet of WCS which
consists entirely of wide characters not in REJECT. */
-extern size_t wcscspn (__const wchar_t *__wcs, __const wchar_t *__reject)
+extern size_t wcscspn (const wchar_t *__wcs, const wchar_t *__reject)
__THROW;
/* Return the length of the initial segmet of WCS which
consists entirely of wide characters in ACCEPT. */
-extern size_t wcsspn (__const wchar_t *__wcs, __const wchar_t *__accept)
+extern size_t wcsspn (const wchar_t *__wcs, const wchar_t *__accept)
__THROW;
/* Find the first occurrence in WCS of any character in ACCEPT. */
-extern wchar_t *wcspbrk (__const wchar_t *__wcs, __const wchar_t *__accept)
+extern wchar_t *wcspbrk (const wchar_t *__wcs, const wchar_t *__accept)
__THROW;
/* Find the first occurrence of NEEDLE in HAYSTACK. */
-extern wchar_t *wcsstr (__const wchar_t *__haystack, __const wchar_t *__needle)
+extern wchar_t *wcsstr (const wchar_t *__haystack, const wchar_t *__needle)
__THROW;
#if defined __USE_XOPEN && !defined __USE_UNIX98
/* Another name for `wcsstr' from XPG4. */
-extern wchar_t *wcswcs (__const wchar_t *__haystack, __const wchar_t *__needle)
+extern wchar_t *wcswcs (const wchar_t *__haystack, const wchar_t *__needle)
__THROW;
#endif
/* Divide WCS into tokens separated by characters in DELIM. */
extern wchar_t *wcstok (wchar_t *__restrict __s,
- __const wchar_t *__restrict __delim,
+ const wchar_t *__restrict __delim,
wchar_t **__restrict __ptr) __THROW;
/* Return the number of wide characters in S. */
-extern size_t __wcslen (__const wchar_t *__s) __THROW;
-extern size_t wcslen (__const wchar_t *__s) __THROW;
+extern size_t __wcslen (const wchar_t *__s) __THROW;
+extern size_t wcslen (const wchar_t *__s) __THROW;
#ifdef __USE_GNU
/* Return the number of wide characters in S, but at most MAXLEN. */
-extern size_t wcsnlen (__const wchar_t *__s, size_t __maxlen) __THROW;
+extern size_t wcsnlen (const wchar_t *__s, size_t __maxlen) __THROW;
#endif
/* Search N wide characters of S for C. */
-extern wchar_t *wmemchr (__const wchar_t *__s, wchar_t __c, size_t __n)
+extern wchar_t *wmemchr (const wchar_t *__s, wchar_t __c, size_t __n)
__THROW;
/* Compare N wide characters of S1 and S2. */
-extern int wmemcmp (__const wchar_t *__restrict __s1,
- __const wchar_t *__restrict __s2, size_t __n) __THROW;
+extern int wmemcmp (const wchar_t *__restrict __s1,
+ const wchar_t *__restrict __s2, size_t __n) __THROW;
/* Copy N wide characters of SRC to DEST. */
extern wchar_t *wmemcpy (wchar_t *__restrict __s1,
- __const wchar_t *__restrict __s2, size_t __n) __THROW;
+ const wchar_t *__restrict __s2, size_t __n) __THROW;
/* Copy N wide characters of SRC to DEST, guaranteeing
correct behavior for overlapping strings. */
-extern wchar_t *wmemmove (wchar_t *__s1, __const wchar_t *__s2, size_t __n)
+extern wchar_t *wmemmove (wchar_t *__s1, const wchar_t *__s2, size_t __n)
__THROW;
/* Set N wide characters of S to C. */
@@ -237,7 +237,7 @@
/* Copy N wide characters of SRC to DEST and return pointer to following
wide character. */
extern wchar_t *wmempcpy (wchar_t *__restrict __s1,
- __const wchar_t *__restrict __s2, size_t __n)
+ const wchar_t *__restrict __s2, size_t __n)
__THROW;
#endif
@@ -252,12 +252,12 @@
/* Determine whether PS points to an object representing the initial
state. */
-extern int mbsinit (__const mbstate_t *__ps) __THROW;
+extern int mbsinit (const mbstate_t *__ps) __THROW;
/* Write wide character representation of multibyte character pointed
to by S to PWC. */
extern size_t mbrtowc (wchar_t *__restrict __pwc,
- __const char *__restrict __s, size_t __n,
+ const char *__restrict __s, size_t __n,
mbstate_t *__p) __THROW;
/* Write multibyte representation of wide character WC to S. */
@@ -265,15 +265,15 @@
mbstate_t *__restrict __ps) __THROW;
/* Return number of bytes in multibyte character pointed to by S. */
-extern size_t __mbrlen (__const char *__restrict __s, size_t __n,
+extern size_t __mbrlen (const char *__restrict __s, size_t __n,
mbstate_t *__restrict __ps) __THROW;
-extern size_t mbrlen (__const char *__restrict __s, size_t __n,
+extern size_t mbrlen (const char *__restrict __s, size_t __n,
mbstate_t *__restrict __ps) __THROW;
#if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ \
&& defined __USE_EXTERN_INLINES
/* Define inline function as optimization. */
-extern __inline size_t mbrlen (__const char *__restrict __s, size_t __n,
+extern __inline size_t mbrlen (const char *__restrict __s, size_t __n,
mbstate_t *__restrict __ps) __THROW
{ return (__ps != NULL
? mbrtowc (NULL, __s, __n, __ps) : __mbrlen (__s, __n, NULL)); }
@@ -282,13 +282,13 @@
/* Write wide character representation of multibyte character string
SRC to DST. */
extern size_t mbsrtowcs (wchar_t *__restrict __dst,
- __const char **__restrict __src, size_t __len,
+ const char **__restrict __src, size_t __len,
mbstate_t *__restrict __ps) __THROW;
/* Write multibyte character representation of wide character string
SRC to DST. */
extern size_t wcsrtombs (char *__restrict __dst,
- __const wchar_t **__restrict __src, size_t __len,
+ const wchar_t **__restrict __src, size_t __len,
mbstate_t *__restrict __ps) __THROW;
@@ -296,13 +296,13 @@
/* Write wide character representation of at most NMC bytes of the
multibyte character string SRC to DST. */
extern size_t mbsnrtowcs (wchar_t *__restrict __dst,
- __const char **__restrict __src, size_t __nmc,
+ const char **__restrict __src, size_t __nmc,
size_t __len, mbstate_t *__restrict __ps) __THROW;
/* Write multibyte character representation of at most NWC characters
from the wide character string SRC to DST. */
extern size_t wcsnrtombs (char *__restrict __dst,
- __const wchar_t **__restrict __src,
+ const wchar_t **__restrict __src,
size_t __nwc, size_t __len,
mbstate_t *__restrict __ps) __THROW;
#endif /* use GNU */
@@ -315,32 +315,32 @@
/* Determine number of column positions required for first N wide
characters (or fewer if S ends before this) in S. */
-extern int wcswidth (__const wchar_t *__s, size_t __n) __THROW;
+extern int wcswidth (const wchar_t *__s, size_t __n) __THROW;
#endif /* Use X/Open. */
/* Convert initial portion of the wide string NPTR to `double'
representation. */
-extern double wcstod (__const wchar_t *__restrict __nptr,
+extern double wcstod (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr) __THROW;
#ifdef __USE_ISOC99
/* Likewise for `float' and `long double' sizes of floating-point numbers. */
-extern float wcstof (__const wchar_t *__restrict __nptr,
+extern float wcstof (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr) __THROW;
-extern long double wcstold (__const wchar_t *__restrict __nptr,
+extern long double wcstold (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr) __THROW;
#endif /* C9x */
/* Convert initial portion of wide string NPTR to `long int'
representation. */
-extern long int wcstol (__const wchar_t *__restrict __nptr,
+extern long int wcstol (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr, int __base) __THROW;
/* Convert initial portion of wide string NPTR to `unsigned long int'
representation. */
-extern unsigned long int wcstoul (__const wchar_t *__restrict __nptr,
+extern unsigned long int wcstoul (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr, int __base)
__THROW;
@@ -348,14 +348,14 @@
/* Convert initial portion of wide string NPTR to `long int'
representation. */
__extension__
-extern long long int wcstoq (__const wchar_t *__restrict __nptr,
+extern long long int wcstoq (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr, int __base)
__THROW;
/* Convert initial portion of wide string NPTR to `unsigned long long int'
representation. */
__extension__
-extern unsigned long long int wcstouq (__const wchar_t *__restrict __nptr,
+extern unsigned long long int wcstouq (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr,
int __base) __THROW;
#endif /* GCC and use GNU. */
@@ -364,14 +364,14 @@
/* Convert initial portion of wide string NPTR to `long int'
representation. */
__extension__
-extern long long int wcstoll (__const wchar_t *__restrict __nptr,
+extern long long int wcstoll (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr, int __base)
__THROW;
/* Convert initial portion of wide string NPTR to `unsigned long long int'
representation. */
__extension__
-extern unsigned long long int wcstoull (__const wchar_t *__restrict __nptr,
+extern unsigned long long int wcstoull (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr,
int __base) __THROW;
#endif /* ISO C99 or GCC and GNU. */
@@ -394,34 +394,34 @@
/* Special versions of the functions above which take the locale to
use as an additional parameter. */
-extern long int __wcstol_l (__const wchar_t *__restrict __nptr,
+extern long int __wcstol_l (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr, int __base,
__locale_t __loc) __THROW;
-extern unsigned long int __wcstoul_l (__const wchar_t *__restrict __nptr,
+extern unsigned long int __wcstoul_l (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr,
int __base, __locale_t __loc) __THROW;
__extension__
-extern long long int __wcstoll_l (__const wchar_t *__restrict __nptr,
+extern long long int __wcstoll_l (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr,
int __base, __locale_t __loc) __THROW;
__extension__
-extern unsigned long long int __wcstoull_l (__const wchar_t *__restrict __nptr,
+extern unsigned long long int __wcstoull_l (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr,
int __base, __locale_t __loc)
__THROW;
-extern double __wcstod_l (__const wchar_t *__restrict __nptr,
+extern double __wcstod_l (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr, __locale_t __loc)
__THROW;
-extern float __wcstof_l (__const wchar_t *__restrict __nptr,
+extern float __wcstof_l (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr, __locale_t __loc)
__THROW;
-extern long double __wcstold_l (__const wchar_t *__restrict __nptr,
+extern long double __wcstold_l (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr,
__locale_t __loc) __THROW;
#endif /* GNU */
@@ -429,38 +429,38 @@
/* The internal entry points for `wcstoX' take an extra flag argument
saying whether or not to parse locale-dependent number grouping. */
-extern double __wcstod_internal (__const wchar_t *__restrict __nptr,
+extern double __wcstod_internal (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr, int __group)
__THROW;
-extern float __wcstof_internal (__const wchar_t *__restrict __nptr,
+extern float __wcstof_internal (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr, int __group)
__THROW;
-extern long double __wcstold_internal (__const wchar_t *__restrict __nptr,
+extern long double __wcstold_internal (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr,
int __group) __THROW;
#ifndef __wcstol_internal_defined
-extern long int __wcstol_internal (__const wchar_t *__restrict __nptr,
+extern long int __wcstol_internal (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr,
int __base, int __group) __THROW;
# define __wcstol_internal_defined 1
#endif
#ifndef __wcstoul_internal_defined
-extern unsigned long int __wcstoul_internal (__const wchar_t *__restrict __npt,
+extern unsigned long int __wcstoul_internal (const wchar_t *__restrict __npt,
wchar_t **__restrict __endptr,
int __base, int __group) __THROW;
# define __wcstoul_internal_defined 1
#endif
#ifndef __wcstoll_internal_defined
__extension__
-extern long long int __wcstoll_internal (__const wchar_t *__restrict __nptr,
+extern long long int __wcstoll_internal (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr,
int __base, int __group) __THROW;
# define __wcstoll_internal_defined 1
#endif
#ifndef __wcstoull_internal_defined
__extension__
-extern unsigned long long int __wcstoull_internal (__const wchar_t *
+extern unsigned long long int __wcstoull_internal (const wchar_t *
__restrict __nptr,
wchar_t **
__restrict __endptr,
@@ -473,34 +473,34 @@
#if defined __OPTIMIZE__ && __GNUC__ >= 2
/* Define inline functions which call the internal entry points. */
-extern __inline double wcstod (__const wchar_t *__restrict __nptr,
+extern __inline double wcstod (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr) __THROW
{ return __wcstod_internal (__nptr, __endptr, 0); }
-extern __inline long int wcstol (__const wchar_t *__restrict __nptr,
+extern __inline long int wcstol (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr,
int __base) __THROW
{ return __wcstol_internal (__nptr, __endptr, __base, 0); }
-extern __inline unsigned long int wcstoul (__const wchar_t *__restrict __nptr,
+extern __inline unsigned long int wcstoul (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr,
int __base) __THROW
{ return __wcstoul_internal (__nptr, __endptr, __base, 0); }
# ifdef __USE_GNU
-extern __inline float wcstof (__const wchar_t *__restrict __nptr,
+extern __inline float wcstof (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr) __THROW
{ return __wcstof_internal (__nptr, __endptr, 0); }
-extern __inline long double wcstold (__const wchar_t *__restrict __nptr,
+extern __inline long double wcstold (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr) __THROW
{ return __wcstold_internal (__nptr, __endptr, 0); }
__extension__
-extern __inline long long int wcstoq (__const wchar_t *__restrict __nptr,
+extern __inline long long int wcstoq (const wchar_t *__restrict __nptr,
wchar_t **__restrict __endptr,
int __base) __THROW
{ return __wcstoll_internal (__nptr, __endptr, __base, 0); }
__extension__
-extern __inline unsigned long long int wcstouq (__const wchar_t *
+extern __inline unsigned long long int wcstouq (const wchar_t *
__restrict __nptr,
wchar_t **__restrict __endptr,
int __base) __THROW
@@ -512,11 +512,11 @@
#ifdef __USE_GNU
/* Copy SRC to DEST, returning the address of the terminating L'\0' in
DEST. */
-extern wchar_t *wcpcpy (wchar_t *__dest, __const wchar_t *__src) __THROW;
+extern wchar_t *wcpcpy (wchar_t *__dest, const wchar_t *__src) __THROW;
/* Copy no more than N characters of SRC to DEST, returning the address of
the last character written into DEST. */
-extern wchar_t *wcpncpy (wchar_t *__dest, __const wchar_t *__src, size_t __n)
+extern wchar_t *wcpncpy (wchar_t *__dest, const wchar_t *__src, size_t __n)
__THROW;
#endif /* use GNU */
@@ -530,57 +530,57 @@
/* Write formatted output to STREAM. */
extern int fwprintf (FILE *__restrict __stream,
- __const wchar_t *__restrict __format, ...)
+ const wchar_t *__restrict __format, ...)
__THROW /* __attribute__ ((__format__ (__wprintf__, 2, 3))) */;
/* Write formatted output to stdout. */
-extern int wprintf (__const wchar_t *__restrict __format, ...)
+extern int wprintf (const wchar_t *__restrict __format, ...)
__THROW /* __attribute__ ((__format__ (__wprintf__, 1, 2))) */;
/* Write formatted output of at most N characters to S. */
extern int swprintf (wchar_t *__restrict __s, size_t __n,
- __const wchar_t *__restrict __format, ...)
+ const wchar_t *__restrict __format, ...)
__THROW /* __attribute__ ((__format__ (__wprintf__, 3, 4))) */;
/* Write formatted output to S from argument list ARG. */
extern int vfwprintf (FILE *__restrict __s,
- __const wchar_t *__restrict __format,
+ const wchar_t *__restrict __format,
__gnuc_va_list __arg)
__THROW /* __attribute__ ((__format__ (__wprintf__, 2, 0))) */;
/* Write formatted output to stdout from argument list ARG. */
-extern int vwprintf (__const wchar_t *__restrict __format,
+extern int vwprintf (const wchar_t *__restrict __format,
__gnuc_va_list __arg)
__THROW /* __attribute__ ((__format__ (__wprintf__, 1, 0))) */;
/* Write formatted output of at most N character to S from argument
list ARG. */
extern int vswprintf (wchar_t *__restrict __s, size_t __n,
- __const wchar_t *__restrict __format,
+ const wchar_t *__restrict __format,
__gnuc_va_list __arg)
__THROW /* __attribute__ ((__format__ (__wprintf__, 3, 0))) */;
/* Read formatted input from STREAM. */
extern int fwscanf (FILE *__restrict __stream,
- __const wchar_t *__restrict __format, ...)
+ const wchar_t *__restrict __format, ...)
__THROW /* __attribute__ ((__format__ (__wscanf__, 2, 3))) */;
/* Read formatted input from stdin. */
-extern int wscanf (__const wchar_t *__restrict __format, ...)
+extern int wscanf (const wchar_t *__restrict __format, ...)
__THROW /* __attribute__ ((__format__ (__wscanf__, 1, 2))) */;
/* Read formatted input from S. */
-extern int swscanf (__const wchar_t *__restrict __s,
- __const wchar_t *__restrict __format, ...)
+extern int swscanf (const wchar_t *__restrict __s,
+ const wchar_t *__restrict __format, ...)
__THROW /* __attribute__ ((__format__ (__wscanf__, 2, 3))) */;
/* Read formatted input from S into argument list ARG. */
extern int vfwscanf (FILE *__restrict __s,
- __const wchar_t *__restrict __format,
+ const wchar_t *__restrict __format,
__gnuc_va_list __arg)
__THROW /* __attribute__ ((__format__ (__wscanf__, 2, 0))) */;
/* Read formatted input from stdin into argument list ARG. */
-extern int vwscanf (__const wchar_t *__restrict __format,
+extern int vwscanf (const wchar_t *__restrict __format,
__gnuc_va_list __arg)
__THROW /* __attribute__ ((__format__ (__wscanf__, 1, 0))) */;
/* Read formatted input from S into argument list ARG. */
-extern int vswscanf (__const wchar_t *__restrict __s,
- __const wchar_t *__restrict __format,
+extern int vswscanf (const wchar_t *__restrict __s,
+ const wchar_t *__restrict __format,
__gnuc_va_list __arg)
__THROW /* __attribute__ ((__format__ (__wscanf__, 2, 0))) */;
@@ -634,12 +634,12 @@
/* Write a string to STREAM. */
-extern int fputws (__const wchar_t *__restrict __ws,
+extern int fputws (const wchar_t *__restrict __ws,
FILE *__restrict __stream);
#ifdef __USE_GNU
/* This function does the same as `fputws' but does not lock the stream. */
-extern int fputws_unlocked (__const wchar_t *__restrict __ws,
+extern int fputws_unlocked (const wchar_t *__restrict __ws,
FILE *__restrict __stream);
#endif
@@ -652,8 +652,8 @@
Write no more than MAXSIZE wide characters and return the number
of wide characters written, or 0 if it would exceed MAXSIZE. */
extern size_t wcsftime (wchar_t *__restrict __s, size_t __maxsize,
- __const wchar_t *__restrict __format,
- __const struct tm *__restrict __tp);
+ const wchar_t *__restrict __format,
+ const struct tm *__restrict __tp);
#endif /* Use ISO C9x. */
/* The X/Open standard demands that most of the functions defined in
============================================================
Index: streams/stropts.h
--- streams/stropts.h 1999/10/09 21:24:33 1.2
+++ streams/stropts.h 1999/12/31 16:25:34
@@ -47,20 +47,20 @@
extern int ioctl (int __fd, unsigned long int __request, ...) __THROW;
/* Send a message on a STREAM. */
-extern int putmsg (int __fildes, __const struct strbuf *__ctlptr,
- __const struct strbuf *__dataptr, int __flags) __THROW;
+extern int putmsg (int __fildes, const struct strbuf *__ctlptr,
+ const struct strbuf *__dataptr, int __flags) __THROW;
/* Send a message on a STREAM to the BAND. */
-extern int putpmsg (int __fildes, __const struct strbuf *__ctlptr,
- __const struct strbuf *__dataptr, int __band, int __flags)
+extern int putpmsg (int __fildes, const struct strbuf *__ctlptr,
+ const struct strbuf *__dataptr, int __band, int __flags)
__THROW;
/* Attach a STREAMS-based file descriptor FILDES to a file PATH in the
file system name space. */
-extern int fattach (int __fildes, __const char *__path) __THROW;
+extern int fattach (int __fildes, const char *__path) __THROW;
/* Detach a name PATH from a STREAMS-based file descriptor. */
-extern int fdetach (__const char *__path) __THROW;
+extern int fdetach (const char *__path) __THROW;
__END_DECLS
--
Andreas Jaeger
SuSE Labs aj@suse.de
private aj@arthur.rhein-neckar.de
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |