RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2025-03-31 07:38:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix types for wctype_t and wctrans_t

Browse Source 
wctype_t was incorrectly "int" rather than "long" on x86_64. not only
is this an ABI incompatibility; it's also a major design flaw if we
ever wanted wctype_t to be implemented as a pointer, which would be
necessary if locales support custom character classes, since int is
too small to store a converted pointer. this commit fixes wctype_t to
be unsigned long on all archs, matching the LSB ABI; this change does
not matter for C code, but for C++ it affects mangling.

the same issue applied to wctrans_t. glibc/LSB defines this type as
const __int32_t *, but since no such definition is visible, I've just
expanded the definition, int, everywhere.

it would be nice if these types (which don't vary by arch) could be in
wctype.h, but the OB XSI requirement in POSIX that wchar.h expose some
types and functions from wctype.h precludes doing so. glibc works
around this with some hideous hacks, but trying to duplicate that
would go against the intent of musl's headers.
This commit is contained in:
Rich Felker 2013-03-04 19:22:14 -05:00
parent 8c741783fc
commit da1442c9a8
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/bits/alltypes.h.sh
View File

@ -26,8 +26,8 @@ TYPEDEF __builtin_va_list va_list;
TYPEDEF unsigned wchar_t;
#endif
TYPEDEF int wint_t;
TYPEDEF long wctrans_t;
TYPEDEF long wctype_t;
TYPEDEF const int * wctrans_t;
TYPEDEF unsigned long wctype_t;
TYPEDEF signed char int8_t;
TYPEDEF short int16_t;

4
arch/i386/bits/alltypes.h.sh
View File

@ -34,8 +34,8 @@ TYPEDEF long wchar_t;
#endif
#endif
TYPEDEF long wint_t;
TYPEDEF long wctrans_t;
TYPEDEF long wctype_t;
TYPEDEF const int * wctrans_t;
TYPEDEF unsigned long wctype_t;
TYPEDEF signed char int8_t;
TYPEDEF short int16_t;

4
arch/microblaze/bits/alltypes.h.sh
View File

@ -26,8 +26,8 @@ TYPEDEF __builtin_va_list va_list;
TYPEDEF int wchar_t;
#endif
TYPEDEF int wint_t;
TYPEDEF long wctrans_t;
TYPEDEF long wctype_t;
TYPEDEF const int * wctrans_t;
TYPEDEF unsigned long wctype_t;
TYPEDEF signed char int8_t;
TYPEDEF short int16_t;

4
arch/mips/bits/alltypes.h.sh
View File

@ -26,8 +26,8 @@ TYPEDEF __builtin_va_list va_list;
TYPEDEF int wchar_t;
#endif
TYPEDEF int wint_t;
TYPEDEF long wctrans_t;
TYPEDEF long wctype_t;
TYPEDEF const int * wctrans_t;
TYPEDEF unsigned long wctype_t;
TYPEDEF signed char int8_t;
TYPEDEF short int16_t;

4
arch/powerpc/bits/alltypes.h.sh
View File

@ -26,8 +26,8 @@ TYPEDEF __builtin_va_list va_list;
TYPEDEF long wchar_t;
#endif
TYPEDEF int wint_t;
TYPEDEF long wctrans_t;
TYPEDEF long wctype_t;
TYPEDEF const int * wctrans_t;
TYPEDEF unsigned long wctype_t;
TYPEDEF signed char int8_t;
TYPEDEF short int16_t;

4
arch/x86_64/bits/alltypes.h.sh
View File

@ -25,8 +25,8 @@ TYPEDEF __builtin_va_list va_list;
TYPEDEF int wchar_t;
#endif
TYPEDEF int wint_t;
TYPEDEF int wctrans_t;
TYPEDEF int wctype_t;
TYPEDEF const int * wctrans_t;
TYPEDEF unsigned long wctype_t;
TYPEDEF signed char int8_t;
TYPEDEF short int16_t;

8
src/ctype/wctrans.c
View File

@ -3,14 +3,14 @@
wctrans_t wctrans(const char *class)
{
if (!strcmp(class, "toupper")) return 1;
if (!strcmp(class, "tolower")) return 2;
if (!strcmp(class, "toupper")) return (wctrans_t)1;
if (!strcmp(class, "tolower")) return (wctrans_t)2;
return 0;
}
wint_t towctrans(wint_t wc, wctrans_t trans)
{
if (trans == 1) return towupper(wc);
if (trans == 2) return towlower(wc);
if (trans == (wctrans_t)1) return towupper(wc);
if (trans == (wctrans_t)2) return towlower(wc);
return wc;
}