Browse Source

Add a few missing functions so that wctype.h/wchar.h are more or less

uptodate, namely, wcsto(u)l(l) family, wcstod, stubs from wctrans/towctrans
crank minor.
okay millert@, jmc@.
OPENBSD_3_8
espie 19 years ago
parent
commit
14a721a9a3
2 changed files with 24 additions and 5 deletions
  1. +19
    -2
      src/include/wchar.h
  2. +5
    -3
      src/include/wctype.h

+ 19
- 2
src/include/wchar.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: wchar.h,v 1.5 2005/06/20 10:46:34 espie Exp $ */
/* $OpenBSD: wchar.h,v 1.6 2005/07/01 08:59:27 espie Exp $ */
/* $NetBSD: wchar.h,v 1.16 2003/03/07 07:11:35 tshiozak Exp $ */ /* $NetBSD: wchar.h,v 1.16 2003/03/07 07:11:35 tshiozak Exp $ */
/*- /*-
@ -134,6 +134,7 @@ size_t wcsspn(const wchar_t *, const wchar_t *);
wchar_t *wcsstr(const wchar_t *, const wchar_t *); wchar_t *wcsstr(const wchar_t *, const wchar_t *);
wchar_t *wcstok(wchar_t * __restrict, const wchar_t * __restrict, wchar_t *wcstok(wchar_t * __restrict, const wchar_t * __restrict,
wchar_t ** __restrict); wchar_t ** __restrict);
size_t wcsxfrm(wchar_t *, const wchar_t *, size_t);
wchar_t *wcswcs(const wchar_t *, const wchar_t *); wchar_t *wcswcs(const wchar_t *, const wchar_t *);
wchar_t *wmemchr(const wchar_t *, wchar_t, size_t); wchar_t *wmemchr(const wchar_t *, wchar_t, size_t);
int wmemcmp(const wchar_t *, const wchar_t *, size_t); int wmemcmp(const wchar_t *, const wchar_t *, size_t);
@ -144,9 +145,25 @@ wchar_t *wmemset(wchar_t *, wchar_t, size_t);
size_t wcslcat(wchar_t *, const wchar_t *, size_t); size_t wcslcat(wchar_t *, const wchar_t *, size_t);
size_t wcslcpy(wchar_t *, const wchar_t *, size_t); size_t wcslcpy(wchar_t *, const wchar_t *, size_t);
int wcswidth(const wchar_t *, size_t);
int wctob(wint_t); int wctob(wint_t);
int wcscoll(const wchar_t *, const wchar_t *); int wcscoll(const wchar_t *, const wchar_t *);
size_t wcsxfrm(wchar_t *, const wchar_t *, size_t);
int wcwidth(wchar_t);
double wcstod(const wchar_t * __restrict, wchar_t ** __restrict);
long int wcstol(const wchar_t * __restrict, wchar_t ** __restrict, int base);
unsigned long int wcstoul(const wchar_t * __restrict, wchar_t ** __restrict,
int base);
#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || \
defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) > 199901L
/* LONGLONG */
long long int wcstoll(const wchar_t * __restrict,
wchar_t ** __restrict, int base);
/* LONGLONG */
unsigned long long int wcstoull(const wchar_t * __restrict,
wchar_t ** __restrict, int base);
#endif
wint_t ungetwc(wint_t, FILE *); wint_t ungetwc(wint_t, FILE *);
wint_t fgetwc(FILE *); wint_t fgetwc(FILE *);


+ 5
- 3
src/include/wctype.h View File

@ -1,4 +1,4 @@
/* $OpenBSD: wctype.h,v 1.3 2005/05/11 18:44:12 espie Exp $ */
/* $OpenBSD: wctype.h,v 1.4 2005/07/01 08:59:27 espie Exp $ */
/* $NetBSD: wctype.h,v 1.5 2003/03/02 22:18:11 tshiozak Exp $ */ /* $NetBSD: wctype.h,v 1.5 2003/03/02 22:18:11 tshiozak Exp $ */
/*- /*-
@ -67,10 +67,12 @@ int iswpunct(wint_t);
int iswspace(wint_t); int iswspace(wint_t);
int iswupper(wint_t); int iswupper(wint_t);
int iswxdigit(wint_t); int iswxdigit(wint_t);
int iswctype(wint_t, wctype_t);
wint_t towctrans(wint_t, wctrans_t);
wint_t towlower(wint_t); wint_t towlower(wint_t);
wint_t towupper(wint_t); wint_t towupper(wint_t);
int iswctype(wint_t, wctype_t);
wctype_t wctype(const char *);
wctrans_t wctrans(const char *);
wctype_t wctype(const char *);
__END_DECLS __END_DECLS
#endif /* _WCTYPE_H_ */ #endif /* _WCTYPE_H_ */

Loading…
Cancel
Save