X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fapi%2Fwchar.c;h=a4a1f33ccca016dfbabd5259a0958e81e49a4446;hb=195a19665a3ff53af1e547741e80cd73d333d688;hp=5aeab9d27956facd4469b8d0a3a4e8aa82c1ed7e;hpb=6a2161f389e6115bb3b948d71c56c8c882eaeda6;p=libc-test

diff --git a/src/api/wchar.c b/src/api/wchar.c
index 5aeab9d..a4a1f33 100644
--- a/src/api/wchar.c
+++ b/src/api/wchar.c
@@ -13,64 +13,85 @@ T(mbstate_t)
 T(size_t)
 T(wchar_t)
 T(wint_t)
+T(struct tm)
 C(WCHAR_MAX)
 C(WCHAR_MIN)
 C(WEOF)
 {void *x=NULL;}
-wint_t(*p_getwchar)(void) = getwchar;
-size_t(*p_mbrlen)(const char*restrict,size_t,mbstate_t*restrict) = mbrlen;
-size_t(*p_mbrtowc)(wchar_t*restrict,const char*restrict,size_t,mbstate_t*restrict) = mbrtowc;
-int(*p_mbsinit)(const mbstate_t*) = mbsinit;
-size_t(*p_mbsrtowcs)(wchar_t*restrict,const char**restrict,size_t,mbstate_t*restrict) = mbsrtowcs;
-wint_t(*p_putwchar)(wchar_t) = putwchar;
-size_t(*p_wcrtomb)(char*restrict,wchar_t,mbstate_t*restrict) = wcrtomb;
-wchar_t*(*p_wcscat)(wchar_t*restrict,const wchar_t*restrict) = wcscat;
-wchar_t*(*p_wcschr)(const wchar_t*,wchar_t) = wcschr;
-int(*p_wcscmp)(const wchar_t*,const wchar_t*) = wcscmp;
-int(*p_wcscoll)(const wchar_t*,const wchar_t*) = wcscoll;
-wchar_t*(*p_wcscpy)(wchar_t*restrict,const wchar_t*restrict) = wcscpy;
-size_t(*p_wcscspn)(const wchar_t*,const wchar_t*) = wcscspn;
-size_t(*p_wcsftime)(wchar_t*restrict,size_t,const wchar_t*restrict,const struct tm*restrict) = wcsftime;
-size_t(*p_wcslen)(const wchar_t*) = wcslen;
-wchar_t*(*p_wcsncat)(wchar_t*restrict,const wchar_t*restrict,size_t) = wcsncat;
-int(*p_wcsncmp)(const wchar_t*,const wchar_t*,size_t) = wcsncmp;
-wchar_t*(*p_wcsncpy)(wchar_t*restrict,const wchar_t*restrict,size_t) = wcsncpy;
-wchar_t*(*p_wcspbrk)(const wchar_t*,const wchar_t*) = wcspbrk;
-wchar_t*(*p_wcsrchr)(const wchar_t*,wchar_t) = wcsrchr;
-size_t(*p_wcsrtombs)(char*restrict,const wchar_t**restrict,size_t,mbstate_t*restrict) = wcsrtombs;
-size_t(*p_wcsspn)(const wchar_t*,const wchar_t*) = wcsspn;
-wchar_t*(*p_wcsstr)(const wchar_t*restrict,const wchar_t*restrict) = wcsstr;
-double(*p_wcstod)(const wchar_t*restrict,wchar_t**restrict) = wcstod;
-float(*p_wcstof)(const wchar_t*restrict,wchar_t**restrict) = wcstof;
-wchar_t*(*p_wcstok)(wchar_t*restrict,const wchar_t*restrict,wchar_t**restrict) = wcstok;
-long(*p_wcstol)(const wchar_t*restrict,wchar_t**restrict,int) = wcstol;
-long double(*p_wcstold)(const wchar_t*restrict,wchar_t**restrict) = wcstold;
-long long(*p_wcstoll)(const wchar_t*restrict,wchar_t**restrict,int) = wcstoll;
-unsigned long(*p_wcstoul)(const wchar_t*restrict,wchar_t**restrict,int) = wcstoul;
-unsigned long long(*p_wcstoull)(const wchar_t*restrict,wchar_t**restrict,int) = wcstoull;
-size_t(*p_wcsxfrm)(wchar_t*restrict,const wchar_t*restrict,size_t) = wcsxfrm;
-wchar_t*(*p_wmemchr)(const wchar_t*,wchar_t,size_t) = wmemchr;
-int(*p_wmemcmp)(const wchar_t*,const wchar_t*,size_t) = wmemcmp;
-wchar_t*(*p_wmemcpy)(wchar_t*restrict,const wchar_t*restrict,size_t) = wmemcpy;
-wchar_t*(*p_wmemmove)(wchar_t*,const wchar_t*,size_t) = wmemmove;
-wchar_t*(*p_wmemset)(wchar_t*,wchar_t,size_t) = wmemset;
+{wint_t(*p)(int) = btowc;}
+{wint_t(*p)(FILE*) = fgetwc;}
+{wchar_t*(*p)(wchar_t*restrict,int,FILE*restrict) = fgetws;}
+{wint_t(*p)(wchar_t,FILE*) = fputwc;}
+{int(*p)(const wchar_t*restrict,FILE*restrict) = fputws;}
+{int(*p)(FILE*,int) = fwide;}
+{int(*p)(FILE*restrict,const wchar_t*restrict,...) = fwprintf;}
+{int(*p)(FILE*restrict,const wchar_t*restrict,...) = fwscanf;}
+{wint_t(*p)(FILE*) = getwc;}
+{wint_t(*p)(void) = getwchar;}
+{size_t(*p)(const char*restrict,size_t,mbstate_t*restrict) = mbrlen;}
+{size_t(*p)(wchar_t*restrict,const char*restrict,size_t,mbstate_t*restrict) = mbrtowc;}
+{int(*p)(const mbstate_t*) = mbsinit;}
+{size_t(*p)(wchar_t*restrict,const char**restrict,size_t,mbstate_t*restrict) = mbsrtowcs;}
+{wint_t(*p)(wchar_t,FILE*) = putwc;}
+{wint_t(*p)(wchar_t) = putwchar;}
+{int(*p)(wchar_t*restrict,size_t,const wchar_t*restrict,...) = swprintf;}
+{int(*p)(const wchar_t*restrict,const wchar_t*restrict,...) = swscanf;}
+{wint_t(*p)(wint_t,FILE*) = ungetwc;}
+{int(*p)(FILE*restrict,const wchar_t*restrict,va_list) = vfwprintf;}
+{int(*p)(FILE*restrict,const wchar_t*restrict,va_list) = vfwscanf;}
+{int(*p)(wchar_t*restrict,size_t,const wchar_t*restrict,va_list) = vswprintf;}
+{int(*p)(const wchar_t*restrict,const wchar_t*restrict,va_list) = vswscanf;}
+{int(*p)(const wchar_t*restrict,va_list) = vwprintf;}
+{int(*p)(const wchar_t*restrict,va_list) = vwscanf;}
+{size_t(*p)(char*restrict,wchar_t,mbstate_t*restrict) = wcrtomb;}
+{wchar_t*(*p)(wchar_t*restrict,const wchar_t*restrict) = wcscat;}
+{wchar_t*(*p)(const wchar_t*,wchar_t) = wcschr;}
+{int(*p)(const wchar_t*,const wchar_t*) = wcscmp;}
+{int(*p)(const wchar_t*,const wchar_t*) = wcscoll;}
+{wchar_t*(*p)(wchar_t*restrict,const wchar_t*restrict) = wcscpy;}
+{size_t(*p)(const wchar_t*,const wchar_t*) = wcscspn;}
+{size_t(*p)(wchar_t*restrict,size_t,const wchar_t*restrict,const struct tm*restrict) = wcsftime;}
+{size_t(*p)(const wchar_t*) = wcslen;}
+{wchar_t*(*p)(wchar_t*restrict,const wchar_t*restrict,size_t) = wcsncat;}
+{int(*p)(const wchar_t*,const wchar_t*,size_t) = wcsncmp;}
+{wchar_t*(*p)(wchar_t*restrict,const wchar_t*restrict,size_t) = wcsncpy;}
+{wchar_t*(*p)(const wchar_t*,const wchar_t*) = wcspbrk;}
+{wchar_t*(*p)(const wchar_t*,wchar_t) = wcsrchr;}
+{size_t(*p)(char*restrict,const wchar_t**restrict,size_t,mbstate_t*restrict) = wcsrtombs;}
+{size_t(*p)(const wchar_t*,const wchar_t*) = wcsspn;}
+{wchar_t*(*p)(const wchar_t*restrict,const wchar_t*restrict) = wcsstr;}
+{double(*p)(const wchar_t*restrict,wchar_t**restrict) = wcstod;}
+{float(*p)(const wchar_t*restrict,wchar_t**restrict) = wcstof;}
+{wchar_t*(*p)(wchar_t*restrict,const wchar_t*restrict,wchar_t**restrict) = wcstok;}
+{long(*p)(const wchar_t*restrict,wchar_t**restrict,int) = wcstol;}
+{long double(*p)(const wchar_t*restrict,wchar_t**restrict) = wcstold;}
+{long long(*p)(const wchar_t*restrict,wchar_t**restrict,int) = wcstoll;}
+{unsigned long(*p)(const wchar_t*restrict,wchar_t**restrict,int) = wcstoul;}
+{unsigned long long(*p)(const wchar_t*restrict,wchar_t**restrict,int) = wcstoull;}
+{size_t(*p)(wchar_t*restrict,const wchar_t*restrict,size_t) = wcsxfrm;}
+{int(*p)(wint_t) = wctob;}
+{wchar_t*(*p)(const wchar_t*,wchar_t,size_t) = wmemchr;}
+{int(*p)(const wchar_t*,const wchar_t*,size_t) = wmemcmp;}
+{wchar_t*(*p)(wchar_t*restrict,const wchar_t*restrict,size_t) = wmemcpy;}
+{wchar_t*(*p)(wchar_t*,const wchar_t*,size_t) = wmemmove;}
+{wchar_t*(*p)(wchar_t*,wchar_t,size_t) = wmemset;}
 #ifdef _POSIX_C_SOURCE
-size_t(*p_mbsnrtowcs)(wchar_t*restrict,const char**restrict,size_t,size_t,mbstate_t*restrict) = mbsnrtowcs;
-FILE*(*p_open_wmemstream)(wchar_t**,size_t*) = open_wmemstream;
-wchar_t*(*p_wcpcpy)(wchar_t*restrict,const wchar_t*restrict) = wcpcpy;
-wchar_t*(*p_wcpncpy)(wchar_t*restrict,const wchar_t*restrict,size_t) = wcpncpy;
-int(*p_wcscasecmp)(const wchar_t*,const wchar_t*) = wcscasecmp;
-int(*p_wcscasecmp_l)(const wchar_t*,const wchar_t*,locale_t) = wcscasecmp_l;
-int(*p_wcscoll_l)(const wchar_t*,const wchar_t*,locale_t) = wcscoll_l;
-wchar_t*(*p_wcsdup)(const wchar_t*) = wcsdup;
-int(*p_wcsncasecmp)(const wchar_t*,const wchar_t*,size_t) = wcsncasecmp;
-int(*p_wcsncasecmp_l)(const wchar_t*,const wchar_t*,size_t,locale_t) = wcsncasecmp_l;
-size_t(*p_wcsnlen)(const wchar_t*,size_t) = wcsnlen;
-size_t(*p_wcsnrtombs)(char*restrict,const wchar_t**restrict,size_t,size_t,mbstate_t*restrict) = wcsnrtombs;
-size_t(*p_wcsxfrm_l)(wchar_t*restrict,const wchar_t*restrict,size_t,locale_t) = wcsxfrm_l;
+{size_t(*p)(wchar_t*restrict,const char**restrict,size_t,size_t,mbstate_t*restrict) = mbsnrtowcs;}
+{FILE*(*p)(wchar_t**,size_t*) = open_wmemstream;}
+{wchar_t*(*p)(wchar_t*restrict,const wchar_t*restrict) = wcpcpy;}
+{wchar_t*(*p)(wchar_t*restrict,const wchar_t*restrict,size_t) = wcpncpy;}
+{int(*p)(const wchar_t*,const wchar_t*) = wcscasecmp;}
+{int(*p)(const wchar_t*,const wchar_t*,locale_t) = wcscasecmp_l;}
+{int(*p)(const wchar_t*,const wchar_t*,locale_t) = wcscoll_l;}
+{wchar_t*(*p)(const wchar_t*) = wcsdup;}
+{int(*p)(const wchar_t*,const wchar_t*,size_t) = wcsncasecmp;}
+{int(*p)(const wchar_t*,const wchar_t*,size_t,locale_t) = wcsncasecmp_l;}
+{size_t(*p)(const wchar_t*,size_t) = wcsnlen;}
+{size_t(*p)(char*restrict,const wchar_t**restrict,size_t,size_t,mbstate_t*restrict) = wcsnrtombs;}
+{size_t(*p)(wchar_t*restrict,const wchar_t*restrict,size_t,locale_t) = wcsxfrm_l;}
 #endif
 #ifdef _XOPEN_SOURCE
-int(*p_wcswidth)(const wchar_t*,size_t) = wcswidth;
-int(*p_wcwidth)(wchar_t) = wcwidth;
+{int(*p)(const wchar_t*,size_t) = wcswidth;}
+{int(*p)(wchar_t) = wcwidth;}
 #endif
 }