summaryrefslogtreecommitdiff
path: root/stdlib
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-07 23:57:22 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-07 23:57:22 -0500
commita784e502472fb3a1afa4d01a47c66b52d23e00f6 (patch)
tree5ebaa084119dcffe41671a62e2e799b172c57d24 /stdlib
parent33808bf1164be2e7c8535bdd5ac398c75c33ed49 (diff)
downloadglibc-a784e502472fb3a1afa4d01a47c66b52d23e00f6.tar.gz
Remove pre-ISO C support
No more __const.
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/bits/stdlib.h26
-rw-r--r--stdlib/fmtmsg.h10
-rw-r--r--stdlib/monetary.h6
-rw-r--r--stdlib/stdlib.h86
-rw-r--r--stdlib/ucontext.h6
5 files changed, 67 insertions, 67 deletions
diff --git a/stdlib/bits/stdlib.h b/stdlib/bits/stdlib.h
index f6af5e518c..e90bc99f9f 100644
--- a/stdlib/bits/stdlib.h
+++ b/stdlib/bits/stdlib.h
@@ -1,5 +1,5 @@
/* Checking macros for stdlib functions.
- Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2007, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -21,21 +21,21 @@
# error "Never include <bits/stdlib.h> directly; use <stdlib.h> instead."
#endif
-extern char *__realpath_chk (__const char *__restrict __name,
+extern char *__realpath_chk (const char *__restrict __name,
char *__restrict __resolved,
size_t __resolvedlen) __THROW __wur;
extern char *__REDIRECT_NTH (__realpath_alias,
- (__const char *__restrict __name,
+ (const char *__restrict __name,
char *__restrict __resolved), realpath) __wur;
extern char *__REDIRECT_NTH (__realpath_chk_warn,
- (__const char *__restrict __name,
+ (const char *__restrict __name,
char *__restrict __resolved,
size_t __resolvedlen), __realpath_chk) __wur
__warnattr ("second argument of realpath must be either NULL or at "
"least PATH_MAX bytes long buffer");
__extern_always_inline __wur char *
-__NTH (realpath (__const char *__restrict __name, char *__restrict __resolved))
+__NTH (realpath (const char *__restrict __name, char *__restrict __resolved))
{
if (__bos (__resolved) != (size_t) -1)
{
@@ -97,21 +97,21 @@ __NTH (wctomb (char *__s, wchar_t __wchar))
extern size_t __mbstowcs_chk (wchar_t *__restrict __dst,
- __const char *__restrict __src,
+ const char *__restrict __src,
size_t __len, size_t __dstlen) __THROW;
extern size_t __REDIRECT_NTH (__mbstowcs_alias,
(wchar_t *__restrict __dst,
- __const char *__restrict __src,
+ const char *__restrict __src,
size_t __len), mbstowcs);
extern size_t __REDIRECT_NTH (__mbstowcs_chk_warn,
(wchar_t *__restrict __dst,
- __const char *__restrict __src,
+ const char *__restrict __src,
size_t __len, size_t __dstlen), __mbstowcs_chk)
__warnattr ("mbstowcs called with dst buffer smaller than len "
"* sizeof (wchar_t)");
__extern_always_inline size_t
-__NTH (mbstowcs (wchar_t *__restrict __dst, __const char *__restrict __src,
+__NTH (mbstowcs (wchar_t *__restrict __dst, const char *__restrict __src,
size_t __len))
{
if (__bos (__dst) != (size_t) -1)
@@ -129,20 +129,20 @@ __NTH (mbstowcs (wchar_t *__restrict __dst, __const char *__restrict __src,
extern size_t __wcstombs_chk (char *__restrict __dst,
- __const wchar_t *__restrict __src,
+ const wchar_t *__restrict __src,
size_t __len, size_t __dstlen) __THROW;
extern size_t __REDIRECT_NTH (__wcstombs_alias,
(char *__restrict __dst,
- __const wchar_t *__restrict __src,
+ const wchar_t *__restrict __src,
size_t __len), wcstombs);
extern size_t __REDIRECT_NTH (__wcstombs_chk_warn,
(char *__restrict __dst,
- __const wchar_t *__restrict __src,
+ const wchar_t *__restrict __src,
size_t __len, size_t __dstlen), __wcstombs_chk)
__warnattr ("wcstombs called with dst buffer smaller than len");
__extern_always_inline size_t
-__NTH (wcstombs (char *__restrict __dst, __const wchar_t *__restrict __src,
+__NTH (wcstombs (char *__restrict __dst, const wchar_t *__restrict __src,
size_t __len))
{
if (__bos (__dst) != (size_t) -1)
diff --git a/stdlib/fmtmsg.h b/stdlib/fmtmsg.h
index 53e3e53d89..da53eb404e 100644
--- a/stdlib/fmtmsg.h
+++ b/stdlib/fmtmsg.h
@@ -1,5 +1,5 @@
/* Message display handling.
- Copyright (C) 1997, 1999, 2000, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2000, 2003, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -92,13 +92,13 @@ enum
/* 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);
+extern int fmtmsg (long int __classification, const char *__label,
+ int __severity, const char *__text,
+ const char *__action, const char *__tag);
#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
diff --git a/stdlib/monetary.h b/stdlib/monetary.h
index 7f0c0ec208..66a817a62c 100644
--- a/stdlib/monetary.h
+++ b/stdlib/monetary.h
@@ -1,5 +1,5 @@
/* Header file for monetary value formatting functions.
- Copyright (C) 1996,1997,1998,1999,2000,2002,2006,2009
+ Copyright (C) 1996,1997,1998,1999,2000,2002,2006,2009,2012
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -38,7 +38,7 @@ __BEGIN_DECLS
/* Formatting a monetary value according to the current locale. */
extern ssize_t strfmon (char *__restrict __s, size_t __maxsize,
- __const char *__restrict __format, ...)
+ const char *__restrict __format, ...)
__THROW __attribute_format_strfmon__ (3, 4);
#ifdef __USE_XOPEN2K8
@@ -47,7 +47,7 @@ extern ssize_t strfmon (char *__restrict __s, size_t __maxsize,
/* 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, ...)
+ const char *__restrict __format, ...)
__THROW __attribute_format_strfmon__ (4, 5);
#endif
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h
index 99c34a4ee5..442f77cc2d 100644
--- a/stdlib/stdlib.h
+++ b/stdlib/stdlib.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2007, 2009-2011, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -142,27 +142,27 @@ extern size_t __ctype_get_mb_cur_max (void) __THROW __wur;
__BEGIN_NAMESPACE_STD
/* Convert a string to a floating-point number. */
-extern double atof (__const char *__nptr)
+extern double atof (const char *__nptr)
__THROW __attribute_pure__ __nonnull ((1)) __wur;
/* Convert a string to an integer. */
-extern int atoi (__const char *__nptr)
+extern int atoi (const char *__nptr)
__THROW __attribute_pure__ __nonnull ((1)) __wur;
/* Convert a string to a long integer. */
-extern long int atol (__const char *__nptr)
+extern long int atol (const char *__nptr)
__THROW __attribute_pure__ __nonnull ((1)) __wur;
__END_NAMESPACE_STD
#if defined __USE_ISOC99 || (defined __GLIBC_HAVE_LONG_LONG && defined __USE_MISC)
__BEGIN_NAMESPACE_C99
/* Convert a string to a long long integer. */
-__extension__ extern long long int atoll (__const char *__nptr)
+__extension__ extern long long int atoll (const char *__nptr)
__THROW __attribute_pure__ __nonnull ((1)) __wur;
__END_NAMESPACE_C99
#endif
__BEGIN_NAMESPACE_STD
/* 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 __nonnull ((1)) __wur;
__END_NAMESPACE_STD
@@ -170,10 +170,10 @@ __END_NAMESPACE_STD
#ifdef __USE_ISOC99
__BEGIN_NAMESPACE_C99
/* 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 __nonnull ((1)) __wur;
-extern long double strtold (__const char *__restrict __nptr,
+extern long double strtold (const char *__restrict __nptr,
char **__restrict __endptr)
__THROW __nonnull ((1)) __wur;
__END_NAMESPACE_C99
@@ -181,11 +181,11 @@ __END_NAMESPACE_C99
__BEGIN_NAMESPACE_STD
/* 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 __nonnull ((1)) __wur;
/* 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 __nonnull ((1)) __wur;
__END_NAMESPACE_STD
@@ -193,12 +193,12 @@ __END_NAMESPACE_STD
#if defined __GLIBC_HAVE_LONG_LONG && 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 __nonnull ((1)) __wur;
/* 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 __nonnull ((1)) __wur;
#endif /* GCC and use BSD. */
@@ -207,12 +207,12 @@ extern unsigned long long int strtouq (__const char *__restrict __nptr,
__BEGIN_NAMESPACE_C99
/* 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 __nonnull ((1)) __wur;
/* 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 __nonnull ((1)) __wur;
__END_NAMESPACE_C99
@@ -237,36 +237,36 @@ __END_NAMESPACE_C99
/* 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 __nonnull ((1, 4)) __wur;
-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 __nonnull ((1, 4)) __wur;
__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 __nonnull ((1, 4)) __wur;
__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 __nonnull ((1, 4)) __wur;
-extern double strtod_l (__const char *__restrict __nptr,
+extern double strtod_l (const char *__restrict __nptr,
char **__restrict __endptr, __locale_t __loc)
__THROW __nonnull ((1, 3)) __wur;
-extern float strtof_l (__const char *__restrict __nptr,
+extern float strtof_l (const char *__restrict __nptr,
char **__restrict __endptr, __locale_t __loc)
__THROW __nonnull ((1, 3)) __wur;
-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 __nonnull ((1, 3)) __wur;
@@ -276,17 +276,17 @@ extern long double strtold_l (__const char *__restrict __nptr,
#ifdef __USE_EXTERN_INLINES
__BEGIN_NAMESPACE_STD
__extern_inline double
-__NTH (atof (__const char *__nptr))
+__NTH (atof (const char *__nptr))
{
return strtod (__nptr, (char **) NULL);
}
__extern_inline int
-__NTH (atoi (__const char *__nptr))
+__NTH (atoi (const char *__nptr))
{
return (int) strtol (__nptr, (char **) NULL, 10);
}
__extern_inline long int
-__NTH (atol (__const char *__nptr))
+__NTH (atol (const char *__nptr))
{
return strtol (__nptr, (char **) NULL, 10);
}
@@ -295,7 +295,7 @@ __END_NAMESPACE_STD
# if defined __USE_MISC || defined __USE_ISOC99
__BEGIN_NAMESPACE_C99
__extension__ __extern_inline long long int
-__NTH (atoll (__const char *__nptr))
+__NTH (atoll (const char *__nptr))
{
return strtoll (__nptr, (char **) NULL, 10);
}
@@ -311,7 +311,7 @@ __END_NAMESPACE_C99
extern char *l64a (long int __n) __THROW __wur;
/* Read a number from a string S in base 64 as above. */
-extern long int a64l (__const char *__s)
+extern long int a64l (const char *__s)
__THROW __attribute_pure__ __nonnull ((1)) __wur;
#endif /* Use SVID || extended X/Open. */
@@ -566,12 +566,12 @@ __END_NAMESPACE_C99
__BEGIN_NAMESPACE_STD
/* Return the value of envariable NAME, or NULL if it doesn't exist. */
-extern char *getenv (__const char *__name) __THROW __nonnull ((1)) __wur;
+extern char *getenv (const char *__name) __THROW __nonnull ((1)) __wur;
__END_NAMESPACE_STD
/* 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)
+extern char *__secure_getenv (const char *__name)
__THROW __nonnull ((1)) __wur;
#if defined __USE_SVID || defined __USE_XOPEN
@@ -584,11 +584,11 @@ extern int putenv (char *__string) __THROW __nonnull ((1));
#if defined __USE_BSD || defined __USE_XOPEN2K
/* 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 __nonnull ((2));
/* Remove the variable NAME from the environment. */
-extern int unsetenv (__const char *__name) __THROW __nonnull ((1));
+extern int unsetenv (const char *__name) __THROW __nonnull ((1));
#endif
#ifdef __USE_MISC
@@ -716,14 +716,14 @@ __BEGIN_NAMESPACE_STD
This function is a cancellation point and therefore not marked with
__THROW. */
-extern int system (__const char *__command) __wur;
+extern int system (const char *__command) __wur;
__END_NAMESPACE_STD
#ifdef __USE_GNU
/* Return a malloc'd string containing the canonical absolute name of the
existing named file. */
-extern char *canonicalize_file_name (__const char *__name)
+extern char *canonicalize_file_name (const char *__name)
__THROW __nonnull ((1)) __wur;
#endif
@@ -733,7 +733,7 @@ extern char *canonicalize_file_name (__const char *__name)
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 __wur;
#endif
@@ -741,20 +741,20 @@ extern char *realpath (__const char *__restrict __name,
/* 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;
# endif
#endif
#ifdef __USE_GNU
-typedef int (*__compar_d_fn_t) (__const void *, __const void *, void *);
+typedef int (*__compar_d_fn_t) (const void *, const void *, void *);
#endif
__BEGIN_NAMESPACE_STD
/* 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)
__nonnull ((1, 2, 5)) __wur;
@@ -859,11 +859,11 @@ extern int qfcvt_r (long double __value, int __ndigit,
__BEGIN_NAMESPACE_STD
/* 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 __wur;
+extern int mblen (const char *__s, size_t __n) __THROW __wur;
/* 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 __wur;
+ const char *__restrict __s, size_t __n) __THROW __wur;
/* Put the multibyte character represented
by WCHAR in S, returning its length. */
extern int wctomb (char *__s, wchar_t __wchar) __THROW __wur;
@@ -871,10 +871,10 @@ extern int wctomb (char *__s, wchar_t __wchar) __THROW __wur;
/* 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;
__END_NAMESPACE_STD
@@ -884,7 +884,7 @@ __END_NAMESPACE_STD
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 __nonnull ((1)) __wur;
+extern int rpmatch (const char *__response) __THROW __nonnull ((1)) __wur;
#endif
@@ -896,7 +896,7 @@ extern int rpmatch (__const char *__response) __THROW __nonnull ((1)) __wur;
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 __nonnull ((1, 2, 3)) __wur;
#endif
@@ -904,7 +904,7 @@ extern int getsubopt (char **__restrict __optionp,
#ifdef __USE_XOPEN
/* Setup DES tables according KEY. */
-extern void setkey (__const char *__key) __THROW __nonnull ((1));
+extern void setkey (const char *__key) __THROW __nonnull ((1));
#endif
diff --git a/stdlib/ucontext.h b/stdlib/ucontext.h
index abeb6471da..e5c12e8acf 100644
--- a/stdlib/ucontext.h
+++ b/stdlib/ucontext.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999, 2000, 2011, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -32,12 +32,12 @@ __BEGIN_DECLS
extern int getcontext (ucontext_t *__ucp) __THROWNL;
/* Set user context from information of variable pointed to by UCP. */
-extern int setcontext (__const ucontext_t *__ucp) __THROWNL;
+extern int setcontext (const ucontext_t *__ucp) __THROWNL;
/* Save current context in context variable pointed to by OUCP and set
context from variable pointed to by UCP. */
extern int swapcontext (ucontext_t *__restrict __oucp,
- __const ucontext_t *__restrict __ucp) __THROWNL;
+ const ucontext_t *__restrict __ucp) __THROWNL;
/* Manipulate user context UCP to continue with calling functions FUNC
and the ARGC-1 parameters following ARGC when the context is used