OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* include/ctype.h (__ctype_b_loc, __ctype_toupper_loc, 

__ctype_tolower_loc): Avoid "dereferencing type-punned pointer will
	break strict-aliasing rules" warnings.
This commit is contained in:
Roland McGrath 2003-07-29 23:48:35 +00:00
parent 98c24a32e6
commit 0d2f48bb4a
2 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-07-29 Jakub Jelinek <jakub@redhat.com>
* include/ctype.h (__ctype_b_loc, __ctype_toupper_loc,
__ctype_tolower_loc): Avoid "dereferencing type-punned pointer will
break strict-aliasing rules" warnings.
2003-07-29 Roland McGrath <roland@redhat.com>
* elf/Makefile: Revert accidental changes in last commit.

42
include/ctype.h
View File

@ -25,31 +25,43 @@ __libc_tsd_define (extern, CTYPE_TOLOWER)
CTYPE_EXTERN_INLINE const uint16_t ** __attribute__ ((const))
__ctype_b_loc (void)
{
const uint16_t **tablep =
(const uint16_t **) __libc_tsd_address (CTYPE_B);
if (__builtin_expect (*tablep == NULL, 0))
*tablep = (const uint16_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_CLASS) + 128;
return tablep;
union
{
void **ptr;
const uint16_t **tablep;
} u;
u.ptr = __libc_tsd_address (CTYPE_B);
if (__builtin_expect (*u.tablep == NULL, 0))
*u.tablep = (const uint16_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_CLASS) + 128;
return u.tablep;
}
CTYPE_EXTERN_INLINE const int32_t ** __attribute__ ((const))
__ctype_toupper_loc (void)
{
const int32_t **tablep =
(const int32_t **) __libc_tsd_address (CTYPE_TOUPPER);
if (__builtin_expect (*tablep == NULL, 0))
*tablep = ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOUPPER) + 128);
return tablep;
union
{
void **ptr;
const int32_t **tablep;
} u;
u.ptr = __libc_tsd_address (CTYPE_TOUPPER);
if (__builtin_expect (*u.tablep == NULL, 0))
*u.tablep = ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOUPPER) + 128);
return u.tablep;
}
CTYPE_EXTERN_INLINE const int32_t ** __attribute__ ((const))
__ctype_tolower_loc (void)
{
const int32_t **tablep =
(const int32_t **) __libc_tsd_address (CTYPE_TOLOWER);
if (__builtin_expect (*tablep == NULL, 0))
*tablep = ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOLOWER) + 128);
return tablep;
union
{
void **ptr;
const int32_t **tablep;
} u;
u.ptr = __libc_tsd_address (CTYPE_TOLOWER);
if (__builtin_expect (*u.tablep == NULL, 0))
*u.tablep = ((int32_t *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_TOLOWER) + 128);
return u.tablep;
}
# endif /* Not NOT_IN_libc. */