diff options
Diffstat (limited to 'sysdeps')
40 files changed, 291 insertions, 297 deletions
diff --git a/sysdeps/generic/inttypes.h b/sysdeps/generic/inttypes.h index bf0fffa..c231c51 100644 --- a/sysdeps/generic/inttypes.h +++ b/sysdeps/generic/inttypes.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997-2001, 2004, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1997-2001, 2004, 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 @@ -302,20 +302,20 @@ extern imaxdiv_t imaxdiv (intmax_t __numer, intmax_t __denom) __THROW __attribute__ ((__const__)); /* Like `strtol' but convert to `intmax_t'. */ -extern intmax_t strtoimax (__const char *__restrict __nptr, +extern intmax_t strtoimax (const char *__restrict __nptr, char **__restrict __endptr, int __base) __THROW; /* Like `strtoul' but convert to `uintmax_t'. */ -extern uintmax_t strtoumax (__const char *__restrict __nptr, +extern uintmax_t strtoumax (const char *__restrict __nptr, char ** __restrict __endptr, int __base) __THROW; /* Like `wcstol' but convert to `intmax_t'. */ -extern intmax_t wcstoimax (__const __gwchar_t *__restrict __nptr, +extern intmax_t wcstoimax (const __gwchar_t *__restrict __nptr, __gwchar_t **__restrict __endptr, int __base) __THROW; /* Like `wcstoul' but convert to `uintmax_t'. */ -extern uintmax_t wcstoumax (__const __gwchar_t *__restrict __nptr, +extern uintmax_t wcstoumax (const __gwchar_t *__restrict __nptr, __gwchar_t ** __restrict __endptr, int __base) __THROW; @@ -323,44 +323,43 @@ extern uintmax_t wcstoumax (__const __gwchar_t *__restrict __nptr, # if __WORDSIZE == 64 -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 __nonnull ((1)) __wur; /* Like `strtol' but convert to `intmax_t'. */ __extern_inline intmax_t -__NTH (strtoimax (__const char *__restrict nptr, char **__restrict endptr, +__NTH (strtoimax (const char *__restrict nptr, char **__restrict endptr, int base)) { return __strtol_internal (nptr, endptr, base, 0); } -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 __nonnull ((1)) __wur; /* Like `strtoul' but convert to `uintmax_t'. */ __extern_inline uintmax_t -__NTH (strtoumax (__const char *__restrict nptr, char **__restrict endptr, +__NTH (strtoumax (const char *__restrict nptr, char **__restrict endptr, int base)) { return __strtoul_internal (nptr, endptr, base, 0); } -extern long int __wcstol_internal (__const __gwchar_t * __restrict __nptr, +extern long int __wcstol_internal (const __gwchar_t * __restrict __nptr, __gwchar_t **__restrict __endptr, int __base, int __group) __THROW __nonnull ((1)) __wur; /* Like `wcstol' but convert to `intmax_t'. */ __extern_inline intmax_t -__NTH (wcstoimax (__const __gwchar_t *__restrict nptr, +__NTH (wcstoimax (const __gwchar_t *__restrict nptr, __gwchar_t **__restrict endptr, int base)) { return __wcstol_internal (nptr, endptr, base, 0); } -extern unsigned long int __wcstoul_internal (__const __gwchar_t * +extern unsigned long int __wcstoul_internal (const __gwchar_t * __restrict __nptr, __gwchar_t ** __restrict __endptr, @@ -368,7 +367,7 @@ extern unsigned long int __wcstoul_internal (__const __gwchar_t * __THROW __nonnull ((1)) __wur; /* Like `wcstoul' but convert to `uintmax_t'. */ __extern_inline uintmax_t -__NTH (wcstoumax (__const __gwchar_t *__restrict nptr, +__NTH (wcstoumax (const __gwchar_t *__restrict nptr, __gwchar_t **__restrict endptr, int base)) { return __wcstoul_internal (nptr, endptr, base, 0); @@ -377,20 +376,20 @@ __NTH (wcstoumax (__const __gwchar_t *__restrict nptr, # else /* __WORDSIZE == 32 */ __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 __nonnull ((1)) __wur; /* Like `strtol' but convert to `intmax_t'. */ __extern_inline intmax_t -__NTH (strtoimax (__const char *__restrict nptr, char **__restrict endptr, +__NTH (strtoimax (const char *__restrict nptr, char **__restrict endptr, int base)) { return __strtoll_internal (nptr, endptr, base, 0); } __extension__ -extern unsigned long long int __strtoull_internal (__const char * +extern unsigned long long int __strtoull_internal (const char * __restrict __nptr, char ** __restrict __endptr, @@ -399,21 +398,20 @@ extern unsigned long long int __strtoull_internal (__const char * __THROW __nonnull ((1)) __wur; /* Like `strtoul' but convert to `uintmax_t'. */ __extern_inline uintmax_t -__NTH (strtoumax (__const char *__restrict nptr, char **__restrict endptr, +__NTH (strtoumax (const char *__restrict nptr, char **__restrict endptr, int base)) { return __strtoull_internal (nptr, endptr, base, 0); } __extension__ -extern long long int __wcstoll_internal (__const __gwchar_t * - __restrict __nptr, +extern long long int __wcstoll_internal (const __gwchar_t *__restrict __nptr, __gwchar_t **__restrict __endptr, int __base, int __group) __THROW __nonnull ((1)) __wur; /* Like `wcstol' but convert to `intmax_t'. */ __extern_inline intmax_t -__NTH (wcstoimax (__const __gwchar_t *__restrict nptr, +__NTH (wcstoimax (const __gwchar_t *__restrict nptr, __gwchar_t **__restrict endptr, int base)) { return __wcstoll_internal (nptr, endptr, base, 0); @@ -421,7 +419,7 @@ __NTH (wcstoimax (__const __gwchar_t *__restrict nptr, __extension__ -extern unsigned long long int __wcstoull_internal (__const __gwchar_t * +extern unsigned long long int __wcstoull_internal (const __gwchar_t * __restrict __nptr, __gwchar_t ** __restrict __endptr, @@ -430,7 +428,7 @@ extern unsigned long long int __wcstoull_internal (__const __gwchar_t * __THROW __nonnull ((1)) __wur; /* Like `wcstoul' but convert to `uintmax_t'. */ __extern_inline uintmax_t -__NTH (wcstoumax (__const __gwchar_t *__restrict nptr, +__NTH (wcstoumax (const __gwchar_t *__restrict nptr, __gwchar_t **__restrict endptr, int base)) { return __wcstoull_internal (nptr, endptr, base, 0); diff --git a/sysdeps/generic/net/if.h b/sysdeps/generic/net/if.h index a497d08..86ada0f 100644 --- a/sysdeps/generic/net/if.h +++ b/sysdeps/generic/net/if.h @@ -1,5 +1,5 @@ /* net/if.h -- declarations for inquiring about network interfaces - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 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 @@ -27,7 +27,7 @@ __BEGIN_DECLS /* Convert an interface name to an index, and vice versa. */ -extern unsigned int if_nametoindex (__const char *__ifname) __THROW; +extern unsigned int if_nametoindex (const char *__ifname) __THROW; extern char *if_indextoname (unsigned int __ifindex, char *__ifname) __THROW; /* Return a list of all interfaces and their indices. */ diff --git a/sysdeps/generic/sys/swap.h b/sysdeps/generic/sys/swap.h index c7b58b9..82af5d3 100644 --- a/sysdeps/generic/sys/swap.h +++ b/sysdeps/generic/sys/swap.h @@ -1,5 +1,5 @@ /* Calls to enable and disable swapping on specified locations. Unix version. - Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 2000, 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 @@ -25,9 +25,9 @@ /* Make the block special device PATH available to the system for swapping. This call is restricted to the super-user. */ -extern int swapon (__const char *__path) __THROW; +extern int swapon (const char *__path) __THROW; /* Stop using block special device PATH for swapping. */ -extern int swapoff (__const char *__path) __THROW; +extern int swapoff (const char *__path) __THROW; #endif /* sys/swap.h */ diff --git a/sysdeps/gnu/net/if.h b/sysdeps/gnu/net/if.h index ebb3e9f..8556b48 100644 --- a/sysdeps/gnu/net/if.h +++ b/sysdeps/gnu/net/if.h @@ -1,5 +1,5 @@ /* net/if.h -- declarations for inquiring about network interfaces - Copyright (C) 1997,98,99,2000,2001 Free Software Foundation, Inc. + Copyright (C) 1997,98,99,2000,2001,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 @@ -191,7 +191,7 @@ struct ifconf __BEGIN_DECLS /* Convert an interface name to an index, and vice versa. */ -extern unsigned int if_nametoindex (__const char *__ifname) __THROW; +extern unsigned int if_nametoindex (const char *__ifname) __THROW; extern char *if_indextoname (unsigned int __ifindex, char *__ifname) __THROW; /* Return a list of all interfaces and their indices. */ diff --git a/sysdeps/gnu/utmpx.h b/sysdeps/gnu/utmpx.h index 8622916..757a862 100644 --- a/sysdeps/gnu/utmpx.h +++ b/sysdeps/gnu/utmpx.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 1999, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999, 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 @@ -69,19 +69,19 @@ extern struct utmpx *getutxent (void); This function is a possible cancellation point and therefore not marked with __THROW. */ -extern struct utmpx *getutxid (__const struct utmpx *__id); +extern struct utmpx *getutxid (const struct utmpx *__id); /* Get the user accounting database entry corresponding to LINE. This function is a possible cancellation point and therefore not marked with __THROW. */ -extern struct utmpx *getutxline (__const struct utmpx *__line); +extern struct utmpx *getutxline (const struct utmpx *__line); /* Write the entry UTMPX into the user accounting database. This function is a possible cancellation point and therefore not marked with __THROW. */ -extern struct utmpx *pututxline (__const struct utmpx *__utmpx); +extern struct utmpx *pututxline (const struct utmpx *__utmpx); #ifdef __USE_GNU @@ -91,7 +91,7 @@ extern struct utmpx *pututxline (__const struct utmpx *__utmpx); cancellation point. But due to similarity with an POSIX interface or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ -extern int utmpxname (__const char *__file); +extern int utmpxname (const char *__file); /* Append entry UTMP to the wtmpx-like file WTMPX_FILE. @@ -99,8 +99,8 @@ extern int utmpxname (__const char *__file); cancellation point. But due to similarity with an POSIX interface or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ -extern void updwtmpx (__const char *__wtmpx_file, - __const struct utmpx *__utmpx); +extern void updwtmpx (const char *__wtmpx_file, + const struct utmpx *__utmpx); /* Copy the information in UTMPX to UTMP. @@ -109,7 +109,7 @@ extern void updwtmpx (__const char *__wtmpx_file, cancellation point. But due to similarity with an POSIX interface or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ -extern void getutmp (__const struct utmpx *__utmpx, +extern void getutmp (const struct utmpx *__utmpx, struct utmp *__utmp); /* Copy the information in UTMP to UTMPX. @@ -118,8 +118,7 @@ extern void getutmp (__const struct utmpx *__utmpx, cancellation point. But due to similarity with an POSIX interface or due to the implementation it is a cancellation point and therefore not marked with __THROW. */ -extern void getutmpx (__const struct utmp *__utmp, - struct utmpx *__utmpx); +extern void getutmpx (const struct utmp *__utmp, struct utmpx *__utmpx); #endif __END_DECLS diff --git a/sysdeps/i386/fpu/bits/fenv.h b/sysdeps/i386/fpu/bits/fenv.h index 8c00771..1283483 100644 --- a/sysdeps/i386/fpu/bits/fenv.h +++ b/sysdeps/i386/fpu/bits/fenv.h @@ -82,11 +82,11 @@ typedef struct fenv_t; /* If the default argument is used we use this value. */ -#define FE_DFL_ENV ((__const fenv_t *) -1) +#define FE_DFL_ENV ((const fenv_t *) -1) #ifdef __USE_GNU /* Floating-point environment where none of the exception is masked. */ -# define FE_NOMASK_ENV ((__const fenv_t *) -2) +# define FE_NOMASK_ENV ((const fenv_t *) -2) #endif diff --git a/sysdeps/i386/i486/bits/string.h b/sysdeps/i386/i486/bits/string.h index 4f8c104..0dca9f9 100644 --- a/sysdeps/i386/i486/bits/string.h +++ b/sysdeps/i386/i486/bits/string.h @@ -1,5 +1,5 @@ /* Optimized, inlined string functions. i486 version. - Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2004,2007,2011 + Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2004,2007,2011,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -41,13 +41,13 @@ /* The macros are used in some of the optimized implementations below. */ #define __STRING_SMALL_GET16(src, idx) \ - ((((__const unsigned char *) (src))[idx + 1] << 8) \ - | ((__const unsigned char *) (src))[idx]) + ((((const unsigned char *) (src))[idx + 1] << 8) \ + | ((const unsigned char *) (src))[idx]) #define __STRING_SMALL_GET32(src, idx) \ - (((((__const unsigned char *) (src))[idx + 3] << 8 \ - | ((__const unsigned char *) (src))[idx + 2]) << 8 \ - | ((__const unsigned char *) (src))[idx + 1]) << 8 \ - | ((__const unsigned char *) (src))[idx]) + (((((const unsigned char *) (src))[idx + 3] << 8 \ + | ((const unsigned char *) (src))[idx + 2]) << 8 \ + | ((const unsigned char *) (src))[idx + 1]) << 8 \ + | ((const unsigned char *) (src))[idx]) /* Copy N bytes of SRC to DEST. */ @@ -65,11 +65,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; @@ -87,11 +87,11 @@ __memcpy_by4 (void *__dest, __const void *__src, size_t __n) 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; @@ -114,11 +114,10 @@ __memcpy_by2 (void *__dest, __const void *__src, size_t __n) return __dest; } -__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); __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; @@ -147,11 +146,11 @@ __memcpy_g (void *__dest, __const void *__src, size_t __n) correct behavior for overlapping strings. */ #define memmove(dest, src, n) __memmove_g (dest, src, n) -__STRING_INLINE void *__memmove_g (void *, __const void *, size_t) +__STRING_INLINE void *__memmove_g (void *, const void *, size_t) __asm__ ("memmove"); __STRING_INLINE void * -__memmove_g (void *__dest, __const void *__src, size_t __n) +__memmove_g (void *__dest, const void *__src, size_t __n) { register unsigned long int __d0, __d1, __d2; register void *__tmp = __dest; @@ -170,7 +169,7 @@ __memmove_g (void *__dest, __const void *__src, size_t __n) "cld" : "=&c" (__d0), "=&S" (__d1), "=&D" (__d2), "=m" ( *(struct { __extension__ char __x[__n]; } *)__dest) - : "0" (__n), "1" (__n - 1 + (__const char *) __src), + : "0" (__n), "1" (__n - 1 + (const char *) __src), "2" (__n - 1 + (char *) __tmp), "m" ( *(struct { __extension__ char __x[__n]; } *)__src)); return __dest; @@ -183,7 +182,7 @@ __memmove_g (void *__dest, __const void *__src, size_t __n) # 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; @@ -436,7 +435,7 @@ __memset_gcn_by2 (void *__s, int __c, size_t __n) #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__ @@ -472,10 +471,10 @@ memchr (__const void *__s, int __c, size_t __n) #define _HAVE_STRING_ARCH_memrchr 1 #ifndef _FORCE_INLINES -__STRING_INLINE void *__memrchr (__const void *__s, int __c, size_t __n); +__STRING_INLINE void *__memrchr (const void *__s, int __c, size_t __n); __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__ @@ -550,13 +549,13 @@ rawmemchr (const void *__s, int __c) (__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" @@ -578,7 +577,7 @@ __strlen_g (__const char *__str) ? (sizeof ((src)[0]) == 1 && strlen (src) + 1 <= 8 \ ? __strcpy_a_small ((dest), (src), strlen (src) + 1) \ : (char *) memcpy ((char *) (dest), \ - (__const char *) (src), \ + (const char *) (src), \ strlen (src) + 1)) \ : __strcpy_g ((dest), (src)))) @@ -631,10 +630,10 @@ __strlen_g (__const char *__str) } \ (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; @@ -727,11 +726,11 @@ __strcpy_g (char *__dest, __const char *__src) } \ (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; @@ -749,11 +748,11 @@ __mempcpy_by4 (char *__dest, __const char *__src, size_t __srclen) 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; @@ -778,11 +777,11 @@ __mempcpy_by2 (char *__dest, __const char *__src, size_t __srclen) 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; @@ -805,10 +804,10 @@ __mempcpy_byn (char *__dest, __const char *__src, size_t __srclen) 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; @@ -837,7 +836,7 @@ __stpcpy_g (char *__dest, __const char *__src) (__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) \ @@ -847,11 +846,11 @@ __stpcpy_g (char *__dest, __const char *__src) ? __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; @@ -872,11 +871,11 @@ __strncpy_by4 (char *__dest, __const char __src[], size_t __srclen, size_t __n) 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; @@ -902,11 +901,11 @@ __strncpy_by2 (char *__dest, __const char __src[], size_t __srclen, size_t __n) 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; @@ -930,11 +929,11 @@ __strncpy_byn (char *__dest, __const char __src[], size_t __srclen, size_t __n) 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; @@ -970,11 +969,11 @@ __strncpy_gg (char *__dest, __const char *__src, size_t __n) ? __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; @@ -1004,10 +1003,10 @@ __strcat_c (char *__dest, __const char __src[], size_t __srclen) 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; @@ -1040,15 +1039,15 @@ __strcat_g (char *__dest, __const char *__src) ? (strlen (src) < ((size_t) (n)) \ ? strcat (__dest, (src)) \ : (*(char *)__mempcpy (strchr (__dest, '\0'), \ - (__const char *) (src), \ + (const char *) (src), \ (n)) = 0, __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; @@ -1103,26 +1102,26 @@ __strncat_g (char *__dest, __const char __src[], size_t __n) (__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 \ && sizeof ((s2)[0]) == 1 && strlen (s1) < 4 \ ? (__builtin_constant_p (s2) && sizeof ((s2)[0]) == 1 \ - ? __strcmp_cc ((__const unsigned char *) (s1), \ - (__const unsigned char *) (s2), \ + ? __strcmp_cc ((const unsigned char *) (s1), \ + (const unsigned char *) (s2), \ strlen (s1)) \ - : __strcmp_cg ((__const unsigned char *) (s1), \ - (__const unsigned char *) (s2), \ + : __strcmp_cg ((const unsigned char *) (s1), \ + (const unsigned char *) (s2), \ strlen (s1))) \ : (__builtin_constant_p (s2) && sizeof ((s1)[0]) == 1 \ && sizeof ((s2)[0]) == 1 && strlen (s2) < 4 \ ? (__builtin_constant_p (s1) \ - ? __strcmp_cc ((__const unsigned char *) (s1), \ - (__const unsigned char *) (s2), \ + ? __strcmp_cc ((const unsigned char *) (s1), \ + (const unsigned char *) (s2), \ strlen (s2)) \ - : __strcmp_gc ((__const unsigned char *) (s1), \ - (__const unsigned char *) (s2), \ + : __strcmp_gc ((const unsigned char *) (s1), \ + (const unsigned char *) (s2), \ strlen (s2))) \ : __strcmp_gg ((s1), (s2)))))) @@ -1141,7 +1140,7 @@ __strncat_g (char *__dest, __const char __src[], size_t __n) __result; })) #define __strcmp_cg(s1, s2, l1) \ - (__extension__ ({ __const unsigned char *__s2 = (s2); \ + (__extension__ ({ const unsigned char *__s2 = (s2); \ register int __result = (s1)[0] - __s2[0]; \ if (l1 > 0 && __result == 0) \ { \ @@ -1156,7 +1155,7 @@ __strncat_g (char *__dest, __const char __src[], size_t __n) __result; })) #define __strcmp_gc(s1, s2, l2) \ - (__extension__ ({ __const unsigned char *__s1 = (s1); \ + (__extension__ ({ const unsigned char *__s1 = (s1); \ register int __result = __s1[0] - (s2)[0]; \ if (l2 > 0 && __result == 0) \ { \ @@ -1170,10 +1169,10 @@ __strncat_g (char *__dest, __const char __src[], size_t __n) } \ __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__ @@ -1210,11 +1209,11 @@ __strcmp_gg (__const char *__s1, __const char *__s2) ? 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__ @@ -1255,10 +1254,10 @@ __strncmp_g (__const char *__s1, __const char *__s2, size_t __n) : __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; @@ -1279,10 +1278,10 @@ __strchr_c (__const char *__s, int __c) 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; @@ -1314,10 +1313,10 @@ __strchr_g (__const char *__s, int __c) : __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; @@ -1338,10 +1337,10 @@ __strchrnul_c (__const char *__s, int __c) 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; @@ -1385,10 +1384,10 @@ __strchrnul_g (__const char *__s, int __c) : __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; @@ -1407,10 +1406,10 @@ __strrchr_c (__const char *__s, int __c) 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; @@ -1430,10 +1429,10 @@ __strrchr_g (__const char *__s, int __c) 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; @@ -1454,10 +1453,10 @@ __strrchr_c (__const char *__s, int __c) 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; @@ -1503,11 +1502,11 @@ __strrchr_g (__const char *__s, int __c) : __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); #ifndef _FORCE_INLINES __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; @@ -1528,14 +1527,14 @@ __strcspn_c1 (__const char *__s, int __reject) } #endif -__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); __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" @@ -1553,14 +1552,14 @@ __strcspn_cg (__const char *__s, __const char __reject[], size_t __reject_len) 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" @@ -1585,10 +1584,10 @@ __strcspn_g (__const char *__s, __const char *__reject) } #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" @@ -1625,10 +1624,10 @@ __strcspn_g (__const char *__s, __const char *__reject) : __strspn_g ((s), (accept)))) #ifndef _FORCE_INLINES -__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; @@ -1647,14 +1646,14 @@ __strspn_c1 (__const char *__s, int __accept) } #endif -__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" @@ -1676,14 +1675,14 @@ __strspn_cg (__const char *__s, __const char __accept[], size_t __accept_len) 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" @@ -1707,10 +1706,10 @@ __strspn_g (__const char *__s, __const char *__accept) } #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" @@ -1744,11 +1743,11 @@ __strspn_g (__const char *__s, __const char *__accept) : __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; @@ -1773,11 +1772,11 @@ __strpbrk_cg (__const char *__s, __const char __accept[], size_t __accept_len) 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; @@ -1809,7 +1808,7 @@ __strpbrk_g (__const char *__s, __const char *__accept) } #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; @@ -1854,11 +1853,12 @@ __strpbrk_g (__const char *__s, __const char *__accept) /* 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; @@ -1882,11 +1882,12 @@ __strstr_cg (__const char *__haystack, __const char __needle[], 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; @@ -1917,7 +1918,7 @@ __strstr_g (__const char *__haystack, __const char *__needle) } #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; diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-strtold_l.c b/sysdeps/ieee754/ldbl-opt/nldbl-strtold_l.c index 4227463..33ff1ca 100644 --- a/sysdeps/ieee754/ldbl-opt/nldbl-strtold_l.c +++ b/sysdeps/ieee754/ldbl-opt/nldbl-strtold_l.c @@ -7,7 +7,7 @@ #undef __strtod_l extern double -__strtod_l (__const char *__restrict __nptr, char **__restrict __endptr, +__strtod_l (const char *__restrict __nptr, char **__restrict __endptr, __locale_t __loc); double diff --git a/sysdeps/s390/bits/string.h b/sysdeps/s390/bits/string.h index 49103b9..287300a 100644 --- a/sysdeps/s390/bits/string.h +++ b/sysdeps/s390/bits/string.h @@ -1,5 +1,5 @@ /* Optimized, inlined string functions. S/390 version. - Copyright (C) 2000, 2001, 2007 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2007, 2012 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -42,10 +42,10 @@ #ifndef _FORCE_INLINES #define strlen(str) __strlen_g ((str)) -__STRING_INLINE size_t __strlen_g (__const char *) __asm__ ("strlen"); +__STRING_INLINE size_t __strlen_g (const char *) __asm__ ("strlen"); __STRING_INLINE size_t -__strlen_g (__const char *__str) +__strlen_g (const char *__str) { char *__ptr, *__tmp; @@ -54,7 +54,7 @@ __strlen_g (__const char *__str) __asm__ __volatile__ (" la 0,0\n" "0: srst %0,%1\n" " jo 0b\n" - : "+&a" (__ptr), "+&a" (__tmp) : + : "+&a" (__ptr), "+&a" (__tmp) : : "cc", "memory", "0" ); return (size_t) (__ptr - __str); } @@ -65,10 +65,10 @@ __strlen_g (__const char *__str) #ifndef _FORCE_INLINES #define strcpy(dest, src) __strcpy_g ((dest), (src)) -__STRING_INLINE char *__strcpy_g (char *, __const char *) __asm ("strcpy"); +__STRING_INLINE char *__strcpy_g (char *, const char *) __asm ("strcpy"); __STRING_INLINE char * -__strcpy_g (char *__dest, __const char *__src) +__strcpy_g (char *__dest, const char *__src) { char *tmp = __dest; @@ -85,11 +85,11 @@ __strcpy_g (char *__dest, __const char *__src) #ifndef _FORCE_INLINES #define strncpy(dest, src, n) __strncpy_g ((dest), (src), (n)) -__STRING_INLINE char *__strncpy_g (char *, __const char *, size_t) +__STRING_INLINE char *__strncpy_g (char *, const char *, size_t) __asm__ ("strncpy"); __STRING_INLINE char * -__strncpy_g (char *__dest, __const char *__src, size_t __n) +__strncpy_g (char *__dest, const char *__src, size_t __n) { char *__ret = __dest; char *__ptr; @@ -99,26 +99,26 @@ __strncpy_g (char *__dest, __const char *__src, size_t __n) __diff = (size_t) (__dest - __src); __ptr = (char *) __src; __asm__ __volatile__ (" j 1f\n" - "0: la %0,1(%0)\n" - "1: icm 0,1,0(%0)\n" - " stc 0,0(%2,%0)\n" - " jz 3f\n" + "0: la %0,1(%0)\n" + "1: icm 0,1,0(%0)\n" + " stc 0,0(%2,%0)\n" + " jz 3f\n" #if defined(__s390x__) - " brctg %1,0b\n" + " brctg %1,0b\n" #else - " brct %1,0b\n" + " brct %1,0b\n" #endif - " j 4f\n" - "2: la %0,1(%0)\n" - " stc 0,0(%2,%0)\n" + " j 4f\n" + "2: la %0,1(%0)\n" + " stc 0,0(%2,%0)\n" #if defined(__s390x__) - "3: brctg %1,2b\n" + "3: brctg %1,2b\n" #else - "3: brct %1,2b\n" + "3: brct %1,2b\n" #endif - "4:" - : "+&a" (__ptr), "+&a" (__n) : "a" (__diff) - : "cc", "memory", "0" ); + "4:" + : "+&a" (__ptr), "+&a" (__n) : "a" (__diff) + : "cc", "memory", "0" ); } return __ret; } @@ -129,10 +129,10 @@ __strncpy_g (char *__dest, __const char *__src, size_t __n) #ifndef _FORCE_INLINES #define strcat(dest, src) __strcat_g ((dest), (src)) -__STRING_INLINE char *__strcat_g (char *, __const char *) __asm__ ("strcat"); +__STRING_INLINE char *__strcat_g (char *, const char *) __asm__ ("strcat"); __STRING_INLINE char * -__strcat_g (char *__dest, __const char *__src) +__strcat_g (char *__dest, const char *__src) { char *__ret = __dest; char *__ptr, *__tmp; @@ -161,11 +161,11 @@ __strcat_g (char *__dest, __const char *__src) #ifndef _FORCE_INLINES #define strncat(dest, src, n) __strncat_g ((dest), (src), (n)) -__STRING_INLINE char *__strncat_g (char *, __const char *, size_t) +__STRING_INLINE char *__strncat_g (char *, const char *, size_t) __asm__ ("strncat"); __STRING_INLINE char * -__strncat_g (char *__dest, __const char *__src, size_t __n) +__strncat_g (char *__dest, const char *__src, size_t __n) { char *__ret = __dest; char *__ptr, *__tmp; @@ -184,20 +184,20 @@ __strncat_g (char *__dest, __const char *__src, size_t __n) __diff = (size_t) (__ptr - __src); __tmp = (char *) __src; __asm__ __volatile__ (" j 1f\n" - "0: la %0,1(%0)\n" - "1: icm 0,1,0(%0)\n" - " stc 0,0(%2,%0)\n" - " jz 2f\n" + "0: la %0,1(%0)\n" + "1: icm 0,1,0(%0)\n" + " stc 0,0(%2,%0)\n" + " jz 2f\n" #if defined(__s390x__) - " brctg %1,0b\n" + " brctg %1,0b\n" #else - " brct %1,0b\n" + " brct %1,0b\n" #endif " slr 0,0\n" - " stc 0,1(%2,%0)\n" + " stc 0,1(%2,%0)\n" "2:" - : "+&a" (__tmp), "+&a" (__n) : "a" (__diff) - : "cc", "memory", "0" ); + : "+&a" (__tmp), "+&a" (__n) : "a" (__diff) + : "cc", "memory", "0" ); } return __ret; @@ -208,7 +208,7 @@ __strncat_g (char *__dest, __const char *__src, size_t __n) #define _HAVE_STRING_ARCH_memchr 1 #ifndef _FORCE_INLINES __STRING_INLINE void * -memchr (__const void *__str, int __c, size_t __n) +memchr (const void *__str, int __c, size_t __n) { char *__ptr, *__tmp; @@ -218,9 +218,9 @@ memchr (__const void *__str, int __c, size_t __n) " nr 0,%2\n" "0: srst %0,%1\n" " jo 0b\n" - " brc 13,1f\n" - " la %0,0\n" - "1:" + " brc 13,1f\n" + " la %0,0\n" + "1:" : "+&a" (__ptr), "+&a" (__tmp) : "d" (__c) : "cc", "memory", "0" ); return __ptr; @@ -231,7 +231,7 @@ memchr (__const void *__str, int __c, size_t __n) #define _HAVE_STRING_ARCH_memchr 1 #ifndef _FORCE_INLINES __STRING_INLINE int -strcmp (__const char *__s1, __const char *__s2) +strcmp (const char *__s1, const char *__s2) { char *__p1, *__p2; int __ret; @@ -239,11 +239,11 @@ strcmp (__const char *__s1, __const char *__s2) __p1 = (char *) __s1; __p2 = (char *) __s2; __asm__ __volatile__ (" slr 0,0\n" - "0: clst %1,%2\n" + "0: clst %1,%2\n" " jo 0b\n" " ipm %0\n" " srl %0,28" - : "=d" (__ret), "+&a" (__p1), "+&a" (__p2) : + : "=d" (__ret), "+&a" (__p1), "+&a" (__p2) : : "cc", "memory", "0" ); __ret = (__ret == 0) ? 0 : (__ret == 1) ? -1 : 1; return __ret; diff --git a/sysdeps/s390/fpu/bits/fenv.h b/sysdeps/s390/fpu/bits/fenv.h index df1ee6e..b1ac01e 100644 --- a/sysdeps/s390/fpu/bits/fenv.h +++ b/sysdeps/s390/fpu/bits/fenv.h @@ -1,6 +1,6 @@ -/* Copyright (C) 2000 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Denis Joseph Barrow (djbarrow@de.ibm.com). + Contributed by Denis Joseph Barrow <djbarrow@de.ibm.com>. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -74,9 +74,9 @@ typedef struct } fenv_t; /* If the default argument is used we use this value. */ -#define FE_DFL_ENV ((__const fenv_t *) -1) +#define FE_DFL_ENV ((const fenv_t *) -1) #ifdef __USE_GNU /* Floating-point environment where none of the exceptions are masked. */ -# define FE_NOMASK_ENV ((__const fenv_t *) -2) +# define FE_NOMASK_ENV ((const fenv_t *) -2) #endif diff --git a/sysdeps/sparc/fpu/bits/fenv.h b/sysdeps/sparc/fpu/bits/fenv.h index d2ef97e..528ead9 100644 --- a/sysdeps/sparc/fpu/bits/fenv.h +++ b/sysdeps/sparc/fpu/bits/fenv.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999, 2000, 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 @@ -68,11 +68,11 @@ typedef unsigned long int fexcept_t; typedef unsigned long int fenv_t; /* If the default argument is used we use this value. */ -#define FE_DFL_ENV ((__const fenv_t *) -1) +#define FE_DFL_ENV ((const fenv_t *) -1) #ifdef __USE_GNU /* Floating-point environment where none of the exception is masked. */ -# define FE_NOMASK_ENV ((__const fenv_t *) -2) +# define FE_NOMASK_ENV ((const fenv_t *) -2) #endif /* For internal use only: access the fp state register. */ diff --git a/sysdeps/sparc/fpu/bits/mathinline.h b/sysdeps/sparc/fpu/bits/mathinline.h index d3ff44c..5c69c79 100644 --- a/sysdeps/sparc/fpu/bits/mathinline.h +++ b/sysdeps/sparc/fpu/bits/mathinline.h @@ -1,5 +1,5 @@ /* Inline math functions for SPARC. - Copyright (C) 1999, 2000, 2001, 2002, 2004, 2006, 2007 + Copyright (C) 1999, 2000, 2001, 2002, 2004, 2006, 2007, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>. @@ -215,7 +215,7 @@ __MATH_INLINE long double __NTH (sqrtl (long double __x)) { long double __r; - extern void _Qp_sqrt (long double *, __const__ long double *); + extern void _Qp_sqrt (long double *, const long double *); _Qp_sqrt (&__r, &__x); return __r; } @@ -223,7 +223,7 @@ __NTH (sqrtl (long double __x)) __MATH_INLINE long double sqrtl (long double __x) __THROW { - extern long double _Q_sqrt (__const__ long double); + extern long double _Q_sqrt (const long double); return _Q_sqrt (__x); } # endif /* sparc64 */ @@ -253,7 +253,7 @@ __MATH_INLINE long double __ieee754_sqrtl (long double __x) { long double __r; - extern void _Qp_sqrt (long double *, __const__ long double *); + extern void _Qp_sqrt (long double *, const long double *); _Qp_sqrt(&__r, &__x); return __r; } @@ -261,7 +261,7 @@ __ieee754_sqrtl (long double __x) __MATH_INLINE long double __ieee754_sqrtl (long double __x) { - extern long double _Q_sqrt (__const__ long double); + extern long double _Q_sqrt (const long double); return _Q_sqrt (__x); } # endif /* sparc64 */ diff --git a/sysdeps/unix/sysv/linux/bits/resource.h b/sysdeps/unix/sysv/linux/bits/resource.h index 336c192..e648436 100644 --- a/sysdeps/unix/sysv/linux/bits/resource.h +++ b/sysdeps/unix/sysv/linux/bits/resource.h @@ -1,5 +1,5 @@ /* Bit values & structures for resource limits. Linux version. - Copyright (C) 1994, 1996-2000, 2004, 2005, 2008, 2009, 2010, 2011 + Copyright (C) 1994, 1996-2000, 2004, 2005, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -246,13 +246,13 @@ __BEGIN_DECLS /* Modify and return resource limits of a process atomically. */ # ifndef __USE_FILE_OFFSET64 extern int prlimit (__pid_t __pid, enum __rlimit_resource __resource, - __const struct rlimit *__new_limit, + const struct rlimit *__new_limit, struct rlimit *__old_limit) __THROW; # else # ifdef __REDIRECT_NTH extern int __REDIRECT_NTH (prlimit, (__pid_t __pid, enum __rlimit_resource __resource, - __const struct rlimit *__new_limit, + const struct rlimit *__new_limit, struct rlimit *__old_limit), prlimit64); # else # define prlimit prlimit64 @@ -260,7 +260,7 @@ extern int __REDIRECT_NTH (prlimit, (__pid_t __pid, # endif # ifdef __USE_LARGEFILE64 extern int prlimit64 (__pid_t __pid, enum __rlimit_resource __resource, - __const struct rlimit64 *__new_limit, + const struct rlimit64 *__new_limit, struct rlimit64 *__old_limit) __THROW; # endif #endif diff --git a/sysdeps/unix/sysv/linux/bits/sched.h b/sysdeps/unix/sysv/linux/bits/sched.h index 6b1431d..4735fe8 100644 --- a/sysdeps/unix/sysv/linux/bits/sched.h +++ b/sysdeps/unix/sysv/linux/bits/sched.h @@ -1,6 +1,6 @@ /* Definitions of constants and data structure for POSIX 1003.1b-1993 scheduling interface. - Copyright (C) 1996-1999,2001-2003,2005,2006,2007,2008,2009,2011 + Copyright (C) 1996-1999,2001-2003,2005,2006,2007,2008,2009,2011,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -161,7 +161,7 @@ typedef struct (__extension__ \ ({ size_t __cpu = (cpu); \ __cpu < 8 * (setsize) \ - ? ((((__const __cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)] \ + ? ((((const __cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)] \ & __CPUMASK (__cpu))) != 0 \ : 0; })) @@ -174,8 +174,8 @@ typedef struct # else # define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \ (__extension__ \ - ({ __const __cpu_mask *__arr1 = (cpusetp1)->__bits; \ - __const __cpu_mask *__arr2 = (cpusetp2)->__bits; \ + ({ const __cpu_mask *__arr1 = (cpusetp1)->__bits; \ + const __cpu_mask *__arr2 = (cpusetp2)->__bits; \ size_t __imax = (setsize) / sizeof (__cpu_mask); \ size_t __i; \ for (__i = 0; __i < __imax; ++__i) \ @@ -187,8 +187,8 @@ typedef struct # define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \ (__extension__ \ ({ cpu_set_t *__dest = (destset); \ - __const __cpu_mask *__arr1 = (srcset1)->__bits; \ - __const __cpu_mask *__arr2 = (srcset2)->__bits; \ + const __cpu_mask *__arr1 = (srcset1)->__bits; \ + const __cpu_mask *__arr2 = (srcset2)->__bits; \ size_t __imax = (setsize) / sizeof (__cpu_mask); \ size_t __i; \ for (__i = 0; __i < __imax; ++__i) \ diff --git a/sysdeps/unix/sysv/linux/bits/sigset.h b/sysdeps/unix/sysv/linux/bits/sigset.h index daec8ac..993cdd5 100644 --- a/sysdeps/unix/sysv/linux/bits/sigset.h +++ b/sysdeps/unix/sysv/linux/bits/sigset.h @@ -1,5 +1,5 @@ /* __sig_atomic_t, __sigset_t, and related definitions. Linux version. - Copyright (C) 1991, 1992, 1994, 1996, 1997, 2007 + Copyright (C) 1991, 1992, 1994, 1996, 1997, 2007, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -101,7 +101,7 @@ typedef struct /* These functions needn't check for a bogus signal number -- error checking is done in the non __ versions. */ -extern int __sigismember (__const __sigset_t *, int); +extern int __sigismember (const __sigset_t *, int); extern int __sigaddset (__sigset_t *, int); extern int __sigdelset (__sigset_t *, int); @@ -115,7 +115,7 @@ extern int __sigdelset (__sigset_t *, int); return BODY; \ } -__SIGSETFN (__sigismember, (__set->__val[__word] & __mask) ? 1 : 0, __const) +__SIGSETFN (__sigismember, (__set->__val[__word] & __mask) ? 1 : 0, const) __SIGSETFN (__sigaddset, ((__set->__val[__word] |= __mask), 0), ) __SIGSETFN (__sigdelset, ((__set->__val[__word] &= ~__mask), 0), ) diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h index 69e090b..9eeb377 100644 --- a/sysdeps/unix/sysv/linux/bits/socket.h +++ b/sysdeps/unix/sysv/linux/bits/socket.h @@ -1,5 +1,5 @@ /* System-specific socket constants and types. Linux version. - Copyright (C) 1991, 1992, 1994-2001, 2004, 2006-2010, 2011 + Copyright (C) 1991, 1992, 1994-2001, 2004, 2006-2010, 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -430,7 +430,7 @@ __BEGIN_DECLS __THROW. */ extern int recvmmsg (int __fd, struct mmsghdr *__vmessages, unsigned int __vlen, int __flags, - __const struct timespec *__tmo); + const struct timespec *__tmo); /* Send a VLEN messages as described by VMESSAGES to socket FD. Return the number of datagrams successfully written or -1 for errors. diff --git a/sysdeps/unix/sysv/linux/bits/sys_errlist.h b/sysdeps/unix/sysv/linux/bits/sys_errlist.h index ee556e8..c14e9cd 100644 --- a/sysdeps/unix/sysv/linux/bits/sys_errlist.h +++ b/sysdeps/unix/sysv/linux/bits/sys_errlist.h @@ -1,5 +1,5 @@ /* Declare sys_errlist and sys_nerr, or don't. Compatibility (do) version. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 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 @@ -25,9 +25,9 @@ #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 diff --git a/sysdeps/unix/sysv/linux/bits/uio.h b/sysdeps/unix/sysv/linux/bits/uio.h index b2d7719..42bc615 100644 --- a/sysdeps/unix/sysv/linux/bits/uio.h +++ b/sysdeps/unix/sysv/linux/bits/uio.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2006, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 2006, 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 @@ -55,17 +55,17 @@ struct iovec __BEGIN_DECLS /* Read from another process' address space. */ -extern ssize_t process_vm_readv (pid_t __pid, __const struct iovec *__lvec, +extern ssize_t process_vm_readv (pid_t __pid, const struct iovec *__lvec, unsigned long int __liovcnt, - __const struct iovec *__rvec, + const struct iovec *__rvec, unsigned long int __riovcnt, unsigned long int __flags) __THROW; /* Write to another process' address space. */ -extern ssize_t process_vm_writev (pid_t __pid, __const struct iovec *__lvec, +extern ssize_t process_vm_writev (pid_t __pid, const struct iovec *__lvec, unsigned long int __liovcnt, - __const struct iovec *__rvec, + const struct iovec *__rvec, unsigned long int __riovcnt, unsigned long int __flags) __THROW; diff --git a/sysdeps/unix/sysv/linux/i386/glob64.c b/sysdeps/unix/sysv/linux/i386/glob64.c index 18b7f21..b4fcd1a 100644 --- a/sysdeps/unix/sysv/linux/i386/glob64.c +++ b/sysdeps/unix/sysv/linux/i386/glob64.c @@ -32,8 +32,8 @@ libc_hidden_ver (__glob64, glob64) #include <sysdeps/unix/sysv/linux/i386/olddirent.h> -int __old_glob64 (__const char *__pattern, int __flags, - int (*__errfunc) (__const char *, int), +int __old_glob64 (const char *__pattern, int __flags, + int (*__errfunc) (const char *, int), glob64_t *__pglob); #undef dirent diff --git a/sysdeps/unix/sysv/linux/i386/olddirent.h b/sysdeps/unix/sysv/linux/i386/olddirent.h index 4f73197..c503247 100644 --- a/sysdeps/unix/sysv/linux/i386/olddirent.h +++ b/sysdeps/unix/sysv/linux/i386/olddirent.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2009, 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 @@ -33,13 +33,13 @@ struct __old_dirent64 /* Now define the internal interfaces. */ extern struct __old_dirent64 *__old_readdir64 (DIR *__dirp); extern int __old_readdir64_r (DIR *__dirp, struct __old_dirent64 *__entry, - struct __old_dirent64 **__result); + struct __old_dirent64 **__result); extern __ssize_t __old_getdents64 (int __fd, char *__buf, size_t __nbytes) internal_function; -int __old_scandir64 (__const char * __dir, +int __old_scandir64 (const char * __dir, struct __old_dirent64 *** __namelist, - int (*__selector) (__const struct __old_dirent64 *), - int (*__cmp) (__const struct __old_dirent64 **, - __const struct __old_dirent64 **)); + int (*__selector) (const struct __old_dirent64 *), + int (*__cmp) (const struct __old_dirent64 **, + const struct __old_dirent64 **)); #endif diff --git a/sysdeps/unix/sysv/linux/preadv.c b/sysdeps/unix/sysv/linux/preadv.c index 72722eb..fdf5b36 100644 --- a/sysdeps/unix/sysv/linux/preadv.c +++ b/sysdeps/unix/sysv/linux/preadv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009 Free Software Foundation, Inc. +/* Copyright (C) 2009, 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 @@ -42,7 +42,7 @@ (off_t) ((((uint64_t) (val)) >> (sizeof (long) * 4)) >> (sizeof (long) * 4)) #ifndef __ASSUME_PREADV -static ssize_t PREADV_REPLACEMENT (int, __const struct iovec *, +static ssize_t PREADV_REPLACEMENT (int, const struct iovec *, int, OFF_T) internal_function; #endif diff --git a/sysdeps/unix/sysv/linux/prlimit.c b/sysdeps/unix/sysv/linux/prlimit.c index 5f7a197..e452138 100644 --- a/sysdeps/unix/sysv/linux/prlimit.c +++ b/sysdeps/unix/sysv/linux/prlimit.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010 Free Software Foundation, Inc. +/* Copyright (C) 2010, 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 @@ -24,7 +24,7 @@ #ifdef __NR_prlimit64 int prlimit (__pid_t pid, enum __rlimit_resource resource, - __const struct rlimit *new_rlimit, struct rlimit *old_rlimit) + const struct rlimit *new_rlimit, struct rlimit *old_rlimit) { struct rlimit64 new_rlimit64_mem; struct rlimit64 *new_rlimit64 = NULL; @@ -83,7 +83,7 @@ prlimit (__pid_t pid, enum __rlimit_resource resource, #else int prlimit (__pid_t pid, enum __rlimit_resource resource, - __const struct rlimit *new_rlimit, struct rlimit *old_rlimit) + const struct rlimit *new_rlimit, struct rlimit *old_rlimit) { __set_errno (ENOSYS); return -1; diff --git a/sysdeps/unix/sysv/linux/pwritev.c b/sysdeps/unix/sysv/linux/pwritev.c index 2e9cbb2..534b800 100644 --- a/sysdeps/unix/sysv/linux/pwritev.c +++ b/sysdeps/unix/sysv/linux/pwritev.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009 Free Software Foundation, Inc. +/* Copyright (C) 2009, 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 @@ -42,7 +42,7 @@ (off_t) ((((uint64_t) (val)) >> (sizeof (long) * 4)) >> (sizeof (long) * 4)) #ifndef __ASSUME_PWRITEV -static ssize_t PWRITEV_REPLACEMENT (int, __const struct iovec *, +static ssize_t PWRITEV_REPLACEMENT (int, const struct iovec *, int, OFF_T) internal_function; #endif diff --git a/sysdeps/unix/sysv/linux/readv.c b/sysdeps/unix/sysv/linux/readv.c index 9425084..89e4c60 100644 --- a/sysdeps/unix/sysv/linux/readv.c +++ b/sysdeps/unix/sysv/linux/readv.c @@ -1,5 +1,6 @@ /* readv supports all Linux kernels >= 2.0. - Copyright (C) 1997,1998,2000,2002,2003,2009 Free Software Foundation, Inc. + Copyright (C) 1997,1998,2000,2002,2003,2009,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 @@ -28,7 +29,7 @@ #include <kernel-features.h> #ifndef __ASSUME_COMPLETE_READV_WRITEV -static ssize_t __atomic_readv_replacement (int, __const struct iovec *, +static ssize_t __atomic_readv_replacement (int, const struct iovec *, int) internal_function; #endif diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/utmp-convert.h b/sysdeps/unix/sysv/linux/s390/s390-32/utmp-convert.h index 4fb77fa..33de683 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/utmp-convert.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/utmp-convert.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2008 Free Software Foundation, Inc. +/* Copyright (C) 2008, 2012 Free Software Foundation, Inc. Contributed by Andreas Krebbel <Andreas.Krebbel@de.ibm.com>. This file is part of the GNU C Library. @@ -32,7 +32,7 @@ /* Convert the 64 bit struct utmp value in FROM to the 32 bit version returned in TO. */ static inline void -utmp_convert64to32 (__const struct utmp *from, struct utmp32 *to) +utmp_convert64to32 (const struct utmp *from, struct utmp32 *to) { #if _HAVE_UT_TYPE - 0 to->ut_type = from->ut_type; @@ -60,7 +60,7 @@ utmp_convert64to32 (__const struct utmp *from, struct utmp32 *to) /* Convert the 32 bit struct utmp value in FROM to the 64 bit version returned in TO. */ static inline void -utmp_convert32to64 (__const struct utmp32 *from, struct utmp *to) +utmp_convert32to64 (const struct utmp32 *from, struct utmp *to) { #if _HAVE_UT_TYPE - 0 to->ut_type = from->ut_type; diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h index dedc6c6..9042e0f 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h +++ b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h @@ -1,5 +1,5 @@ /* The `struct utmp' type, describing entries in the utmp file. GNU version. - Copyright (C) 1993, 1996, 1997, 1998, 1999, 2002, 2008, 2010 + Copyright (C) 1993, 1996, 1997, 1998, 1999, 2002, 2008, 2010, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -51,14 +51,11 @@ struct utmpx32 /* The internal interface needed by the compat wrapper functions. */ extern struct utmpx *__getutxent (void); -extern struct utmpx *__getutxid (__const struct utmpx *__id); -extern struct utmpx *__getutxline (__const struct utmpx *__line); -extern struct utmpx *__pututxline (__const struct utmpx *__utmpx); -extern void __updwtmpx (__const char *__wtmpx_file, - __const struct utmpx *__utmpx); -extern void __getutmp (__const struct utmpx *__utmpx, - struct utmp *__utmp); -extern void __getutmpx (__const struct utmp *__utmp, - struct utmpx *__utmpx); +extern struct utmpx *__getutxid (const struct utmpx *__id); +extern struct utmpx *__getutxline (const struct utmpx *__line); +extern struct utmpx *__pututxline (const struct utmpx *__utmpx); +extern void __updwtmpx (const char *__wtmpx_file, const struct utmpx *__utmpx); +extern void __getutmp (const struct utmpx *__utmpx, struct utmp *__utmp); +extern void __getutmpx (const struct utmp *__utmp, struct utmpx *__utmpx); #endif /* utmpx32.h */ diff --git a/sysdeps/unix/sysv/linux/sparc/bits/socket.h b/sysdeps/unix/sysv/linux/sparc/bits/socket.h index 6cfbbd7..0fb5a60 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/socket.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/socket.h @@ -1,5 +1,5 @@ /* System-specific socket constants and types. Linux/SPARC version. - Copyright (C) 1991, 1992, 1994-2001, 2004, 2006, 2007, 2008, 2009, 2011 + Copyright (C) 1991, 1992, 1994-2001, 2004, 2006, 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -430,7 +430,7 @@ __BEGIN_DECLS __THROW. */ extern int recvmmsg (int __fd, struct mmsghdr *__vmessages, unsigned int __vlen, int __flags, - __const struct timespec *__tmo); + const struct timespec *__tmo); __END_DECLS diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c b/sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c index 3be801a..bf7027e 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c @@ -1,7 +1,7 @@ /* POSIX.1 sigaction call for Linux/SPARC. - Copyright (C) 1997-2000,2002,2003,2005 Free Software Foundation, Inc. + Copyright (C) 1997-2000,2002,2003,2005,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Miguel de Icaza (miguel@nuclecu.unam.mx), 1997. + Contributed by Miguel de Icaza <miguel@nuclecu.unam.mx>, 1997. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -33,8 +33,7 @@ static void __sigreturn_stub (void); int __libc_missing_rt_sigs; int -__libc_sigaction (int sig, __const struct sigaction *act, - struct sigaction *oact) +__libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact) { struct old_kernel_sigaction k_sigact, k_osigact; int ret; diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c b/sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c index b5e35f4..d556663 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c @@ -1,8 +1,8 @@ /* POSIX.1 sigaction call for Linux/SPARC64. - Copyright (C) 1997-2000,2002,2003,2005 Free Software Foundation, Inc. + Copyright (C) 1997-2000,2002,2003,2005,2012 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Miguel de Icaza (miguel@nuclecu.unam.mx) and - Jakub Jelinek (jj@ultra.linux.cz). + Contributed by Miguel de Icaza <miguel@nuclecu.unam.mx> and + Jakub Jelinek <jj@ultra.linux.cz>. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -32,8 +32,7 @@ static void __rt_sigreturn_stub (void); int -__libc_sigaction (int sig, __const struct sigaction *act, - struct sigaction *oact) +__libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact) { int ret; struct kernel_sigaction kact, koact; diff --git a/sysdeps/unix/sysv/linux/sparc/sys/epoll.h b/sysdeps/unix/sysv/linux/sparc/sys/epoll.h index 2dfc4fc..fdd531e 100644 --- a/sysdeps/unix/sysv/linux/sparc/sys/epoll.h +++ b/sysdeps/unix/sysv/linux/sparc/sys/epoll.h @@ -137,7 +137,7 @@ extern int epoll_wait (int __epfd, struct epoll_event *__events, __THROW. */ extern int epoll_pwait (int __epfd, struct epoll_event *__events, int __maxevents, int __timeout, - __const __sigset_t *__ss); + const __sigset_t *__ss); __END_DECLS diff --git a/sysdeps/unix/sysv/linux/sparc/sys/timerfd.h b/sysdeps/unix/sysv/linux/sparc/sys/timerfd.h index 833d050..0073f7f 100644 --- a/sysdeps/unix/sysv/linux/sparc/sys/timerfd.h +++ b/sysdeps/unix/sysv/linux/sparc/sys/timerfd.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2008 Free Software Foundation, Inc. +/* Copyright (C) 2008, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -49,7 +49,7 @@ extern int timerfd_create (clockid_t __clock_id, int __flags) __THROW; FLAGS has the TFD_TIMER_ABSTIME flag set the timeout value is absolute. Optionally return the old expiration time in OTMR. */ extern int timerfd_settime (int __ufd, int __flags, - __const struct itimerspec *__utmr, + const struct itimerspec *__utmr, struct itimerspec *__otmr) __THROW; /* Return the next expiration time of UFD. */ diff --git a/sysdeps/unix/sysv/linux/sys/acct.h b/sysdeps/unix/sysv/linux/sys/acct.h index 47c63eb..e2408de 100644 --- a/sysdeps/unix/sysv/linux/sys/acct.h +++ b/sysdeps/unix/sysv/linux/sys/acct.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1996-1999, 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 @@ -102,7 +102,7 @@ enum /* Switch process accounting on and off. */ -extern int acct (__const char *__filename) __THROW; +extern int acct (const char *__filename) __THROW; __END_DECLS diff --git a/sysdeps/unix/sysv/linux/sys/epoll.h b/sysdeps/unix/sysv/linux/sys/epoll.h index f23db92..2294ee1 100644 --- a/sysdeps/unix/sysv/linux/sys/epoll.h +++ b/sysdeps/unix/sysv/linux/sys/epoll.h @@ -137,7 +137,7 @@ extern int epoll_wait (int __epfd, struct epoll_event *__events, __THROW. */ extern int epoll_pwait (int __epfd, struct epoll_event *__events, int __maxevents, int __timeout, - __const __sigset_t *__ss); + const __sigset_t *__ss); __END_DECLS diff --git a/sysdeps/unix/sysv/linux/sys/mount.h b/sysdeps/unix/sysv/linux/sys/mount.h index 923b461..831a62c 100644 --- a/sysdeps/unix/sysv/linux/sys/mount.h +++ b/sysdeps/unix/sysv/linux/sys/mount.h @@ -1,5 +1,5 @@ /* Header file for mounting/unmount Linux filesystems. - Copyright (C) 1996-2000, 2004, 2010 Free Software Foundation, Inc. + Copyright (C) 1996-2000, 2004, 2010, 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 @@ -133,15 +133,15 @@ enum __BEGIN_DECLS /* Mount a filesystem. */ -extern int mount (__const char *__special_file, __const char *__dir, - __const char *__fstype, unsigned long int __rwflag, - __const void *__data) __THROW; +extern int mount (const char *__special_file, const char *__dir, + const char *__fstype, unsigned long int __rwflag, + const void *__data) __THROW; /* Unmount a filesystem. */ -extern int umount (__const char *__special_file) __THROW; +extern int umount (const char *__special_file) __THROW; /* 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 diff --git a/sysdeps/unix/sysv/linux/sys/swap.h b/sysdeps/unix/sysv/linux/sys/swap.h index 961006c..1493d48 100644 --- a/sysdeps/unix/sysv/linux/sys/swap.h +++ b/sysdeps/unix/sysv/linux/sys/swap.h @@ -1,5 +1,5 @@ /* Calls to enable and disable swapping on specified locations. Linux version. - Copyright (C) 1996, 1998, 1999, 2010 Free Software Foundation, Inc. + Copyright (C) 1996, 1998, 1999, 2010, 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 @@ -34,10 +34,10 @@ __BEGIN_DECLS /* Make the block special device PATH available to the system for swapping. This call is restricted to the super-user. */ -extern int swapon (__const char *__path, int __flags) __THROW; +extern int swapon (const char *__path, int __flags) __THROW; /* Stop using block special device PATH for swapping. */ -extern int swapoff (__const char *__path) __THROW; +extern int swapoff (const char *__path) __THROW; __END_DECLS diff --git a/sysdeps/unix/sysv/linux/sys/timerfd.h b/sysdeps/unix/sysv/linux/sys/timerfd.h index c1bb06f..a2cd2c2 100644 --- a/sysdeps/unix/sysv/linux/sys/timerfd.h +++ b/sysdeps/unix/sysv/linux/sys/timerfd.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2008 Free Software Foundation, Inc. +/* Copyright (C) 2008, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -49,7 +49,7 @@ extern int timerfd_create (clockid_t __clock_id, int __flags) __THROW; FLAGS has the TFD_TIMER_ABSTIME flag set the timeout value is absolute. Optionally return the old expiration time in OTMR. */ extern int timerfd_settime (int __ufd, int __flags, - __const struct itimerspec *__utmr, + const struct itimerspec *__utmr, struct itimerspec *__otmr) __THROW; /* Return the next expiration time of UFD. */ diff --git a/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h b/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h index 6b5ef35..260afbe 100644 --- a/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h +++ b/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h @@ -137,7 +137,7 @@ extern int epoll_wait (int __epfd, struct epoll_event *__events, __THROW. */ extern int epoll_pwait (int __epfd, struct epoll_event *__events, int __maxevents, int __timeout, - __const __sigset_t *__ss); + const __sigset_t *__ss); __END_DECLS diff --git a/sysdeps/x86_64/fpu/bits/fenv.h b/sysdeps/x86_64/fpu/bits/fenv.h index 8bc2450..8142366 100644 --- a/sysdeps/x86_64/fpu/bits/fenv.h +++ b/sysdeps/x86_64/fpu/bits/fenv.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997-2001,2004,2011 Free Software Foundation, Inc. +/* Copyright (C) 1997-2001,2004,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 @@ -89,11 +89,11 @@ typedef struct fenv_t; /* If the default argument is used we use this value. */ -#define FE_DFL_ENV ((__const fenv_t *) -1) +#define FE_DFL_ENV ((const fenv_t *) -1) #ifdef __USE_GNU /* Floating-point environment where none of the exception is masked. */ -# define FE_NOMASK_ENV ((__const fenv_t *) -2) +# define FE_NOMASK_ENV ((const fenv_t *) -2) #endif diff --git a/sysdeps/x86_64/strcasecmp_l-nonascii.c b/sysdeps/x86_64/strcasecmp_l-nonascii.c index 13b35de..30e8969 100644 --- a/sysdeps/x86_64/strcasecmp_l-nonascii.c +++ b/sysdeps/x86_64/strcasecmp_l-nonascii.c @@ -1,6 +1,6 @@ #include <string.h> -extern int __strcasecmp_l_nonascii (__const char *__s1, __const char *__s2, +extern int __strcasecmp_l_nonascii (const char *__s1, const char *__s2, __locale_t __loc); #define __strcasecmp_l __strcasecmp_l_nonascii diff --git a/sysdeps/x86_64/strncase_l-nonascii.c b/sysdeps/x86_64/strncase_l-nonascii.c index baabd31..8664863 100644 --- a/sysdeps/x86_64/strncase_l-nonascii.c +++ b/sysdeps/x86_64/strncase_l-nonascii.c @@ -1,6 +1,6 @@ #include <string.h> -extern int __strncasecmp_l_nonascii (__const char *__s1, __const char *__s2, +extern int __strncasecmp_l_nonascii (const char *__s1, const char *__s2, size_t __n, __locale_t __loc); #define __strncasecmp_l __strncasecmp_l_nonascii |