diff options
Diffstat (limited to 'wcsmbs')
| -rw-r--r-- | wcsmbs/wchar.h | 25 | ||||
| -rw-r--r-- | wcsmbs/wcscmp.c | 14 | ||||
| -rw-r--r-- | wcsmbs/wcscoll.c | 2 | ||||
| -rw-r--r-- | wcsmbs/wcsncmp.c | 32 | ||||
| -rw-r--r-- | wcsmbs/wcstok.c | 30 | ||||
| -rw-r--r-- | wcsmbs/wcsxfrm.c | 4 | ||||
| -rw-r--r-- | wcsmbs/wmemcmp.c | 34 |
7 files changed, 68 insertions, 73 deletions
diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 3b15d9f38a..b54170c3f3 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -27,44 +27,31 @@ Cambridge, MA 02139, USA. */ __BEGIN_DECLS -/* Get size_t, wchar_t, uwchar_t and NULL from <stddef.h>. */ +/* Get size_t, wchar_t, wint_t and NULL from <stddef.h>. */ #define __need_size_t #define __need_wchar_t -/* #define __need_uwchar_t */ +#define __need_wint_t #define __need_NULL -/* __need_WCHAR_MAX */ -/* __need_WCHAR_MIN */ #include <stddef.h> -/* FIXME: Should go with this or another name in stddef.h. */ -typedef unsigned int uwchar_t; - /* Conversion state information. */ typedef int mbstate_t; /* FIXME */ -/* Should come from <stddef.h> */ -#define WCHAR_MIN ((wchar_t) 0) /* FIXME */ -#define WCHAR_MAX (~WCHAR_MIN) /* FIXME */ +#define WCHAR_MIN ((wchar_t) 0) +#define WCHAR_MAX (~WCHAR_MIN) #ifndef WEOF # define WEOF (0xffffffffu) #endif -/* FIXME: should this go into <stddef.h>??? */ -#if 0 -#define __need_wint_t -#include <stddef.h> -#else +#ifndef _WINT_T /* Integral type unchanged by default argument promotions that can hold any value corresponding to members of the extended character set, as well as at least one value that does not correspond to any member of the extended character set. */ -#ifndef __have_wint_t_defined -#define __have_wint_t_defined 1 -/* This is a hack!!! */ +#define _WINT_T 1 typedef unsigned int wint_t; #endif -#endif /* Copy SRC to DEST. */ diff --git a/wcsmbs/wcscmp.c b/wcsmbs/wcscmp.c index 08da116787..2cc31992d2 100644 --- a/wcsmbs/wcscmp.c +++ b/wcsmbs/wcscmp.c @@ -1,6 +1,6 @@ /* Copyright (C) 1995, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. -Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu> +Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -13,9 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include <wchar.h> @@ -28,12 +28,12 @@ wcscmp (s1, s2) const wchar_t *s1; const wchar_t *s2; { - uwchar_t c1, c2; + wint_t c1, c2; do { - c1 = (uwchar_t) *s1++; - c2 = (uwchar_t) *s2++; + c1 = (wint_t) *s1++; + c2 = (wint_t) *s2++; if (c1 == L'\0') return c1 - c2; } diff --git a/wcsmbs/wcscoll.c b/wcsmbs/wcscoll.c index e033b4a6de..ad4c23244b 100644 --- a/wcsmbs/wcscoll.c +++ b/wcsmbs/wcscoll.c @@ -19,7 +19,7 @@ Boston, MA 02111-1307, USA. */ #include <wchar.h> #define STRING_TYPE wchar_t -#define USTRING_TYPE uwchar_t +#define USTRING_TYPE wint_t #define STRCOLL wcscoll #define STRCMP wcscmp diff --git a/wcsmbs/wcsncmp.c b/wcsmbs/wcsncmp.c index 3df6bfc151..fb554cbfb5 100644 --- a/wcsmbs/wcsncmp.c +++ b/wcsmbs/wcsncmp.c @@ -1,6 +1,6 @@ /* Copyright (C) 1995, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. -Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu> +Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -13,9 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include <wchar.h> @@ -30,28 +30,28 @@ wcsncmp (s1, s2, n) const wchar_t *s2; size_t n; { - uwchar_t c1 = L'\0'; - uwchar_t c2 = L'\0'; + wint_t c1 = L'\0'; + wint_t c2 = L'\0'; if (n >= 4) { size_t n4 = n >> 2; do { - c1 = (uwchar_t) *s1++; - c2 = (uwchar_t) *s2++; + c1 = (wint_t) *s1++; + c2 = (wint_t) *s2++; if (c1 == L'\0' || c1 != c2) return c1 - c2; - c1 = (uwchar_t) *s1++; - c2 = (uwchar_t) *s2++; + c1 = (wint_t) *s1++; + c2 = (wint_t) *s2++; if (c1 == L'\0' || c1 != c2) return c1 - c2; - c1 = (uwchar_t) *s1++; - c2 = (uwchar_t) *s2++; + c1 = (wint_t) *s1++; + c2 = (wint_t) *s2++; if (c1 == L'\0' || c1 != c2) return c1 - c2; - c1 = (uwchar_t) *s1++; - c2 = (uwchar_t) *s2++; + c1 = (wint_t) *s1++; + c2 = (wint_t) *s2++; if (c1 == L'\0' || c1 != c2) return c1 - c2; } while (--n4 > 0); @@ -60,8 +60,8 @@ wcsncmp (s1, s2, n) while (n > 0) { - c1 = (uwchar_t) *s1++; - c2 = (uwchar_t) *s2++; + c1 = (wint_t) *s1++; + c2 = (wint_t) *s2++; if (c1 == L'\0' || c1 != c2) return c1 - c2; n--; diff --git a/wcsmbs/wcstok.c b/wcsmbs/wcstok.c index 376fe7bfcb..b6baf311a4 100644 --- a/wcsmbs/wcstok.c +++ b/wcsmbs/wcstok.c @@ -1,6 +1,6 @@ /* Copyright (C) 1995, 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. -Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu> +Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -13,9 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ #include <wchar.h> #include <errno.h> @@ -25,20 +25,26 @@ Cambridge, MA 02139, USA. */ NULL, the last string wcstok() was called with is used. */ wchar_t * wcstok (wcs, delim, ptr) - register wchar_t *wcs; - register const wchar_t *delim; - register wchar_t **ptr; + wchar_t *wcs; + const wchar_t *delim; + wchar_t **save_ptr; { wchar_t *result; if (wcs == NULL) - wcs = *ptr; + if (*save_ptr == NULL) + { + errno = EINVAL; + return NULL; + } + else + wcs = *save_ptr; /* Scan leading delimiters. */ wcs += wcsspn (wcs, delim); if (*wcs == L'\0') { - *ptr = NULL; + *save_ptr = NULL; return NULL; } @@ -47,12 +53,12 @@ wcstok (wcs, delim, ptr) wcs = wcspbrk (result, delim); if (wcs == NULL) /* This token finishes the string. */ - *ptr = NULL; + *save_ptr = NULL; else { - /* Terminate the token and make OLDS point past it. */ + /* Terminate the token and make *SAVE_PTR point past it. */ *wcs = L'\0'; - *ptr = wcs + 1; + *save_ptr = wcs + 1; } return result; } diff --git a/wcsmbs/wcsxfrm.c b/wcsmbs/wcsxfrm.c index 96a32382e0..0a04fd96f2 100644 --- a/wcsmbs/wcsxfrm.c +++ b/wcsmbs/wcsxfrm.c @@ -18,8 +18,10 @@ Boston, MA 02111-1307, USA. */ #include <wchar.h> +#define WIDE_VERSION 1 #define STRING_TYPE wchar_t -#define USTRING_TYPE uwchar_t +#define USTRING_TYPE wint_t +#define L_(Ch) L##Ch #define STRXFRM wcsxfrm #define STRLEN wcslen #define STPNCPY __wcpncpy diff --git a/wcsmbs/wmemcmp.c b/wcsmbs/wmemcmp.c index f96cad9c0e..8d04148466 100644 --- a/wcsmbs/wmemcmp.c +++ b/wcsmbs/wmemcmp.c @@ -1,6 +1,6 @@ /* Copyright (C) 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. -Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu> +Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -26,25 +26,25 @@ wmemcmp (s1, s2, n) const wchar_t *s2; size_t n; { - register uwchar_t c1; - register uwchar_t c2; + register wint_t c1; + register wint_t c2; while (n >= 4) { - c1 = (uwchar_t) s1[0]; - c2 = (uwchar_t) s2[0]; + c1 = (wint_t) s1[0]; + c2 = (wint_t) s2[0]; if (c1 - c2 != 0) return c1 - c2; - c1 = (uwchar_t) s1[1]; - c2 = (uwchar_t) s2[1]; + c1 = (wint_t) s1[1]; + c2 = (wint_t) s2[1]; if (c1 - c2 != 0) return c1 - c2; - c1 = (uwchar_t) s1[2]; - c2 = (uwchar_t) s2[2]; + c1 = (wint_t) s1[2]; + c2 = (wint_t) s2[2]; if (c1 - c2 != 0) return c1 - c2; - c1 = (uwchar_t) s1[3]; - c2 = (uwchar_t) s2[3]; + c1 = (wint_t) s1[3]; + c2 = (wint_t) s2[3]; if (c1 - c2 != 0) return c1 - c2; s1 += 4; @@ -54,8 +54,8 @@ wmemcmp (s1, s2, n) if (n > 0) { - c1 = (uwchar_t) s1[0]; - c2 = (uwchar_t) s2[0]; + c1 = (wint_t) s1[0]; + c2 = (wint_t) s2[0]; if (c1 - c2 != 0) return c1 - c2; ++s1; @@ -64,8 +64,8 @@ wmemcmp (s1, s2, n) } if (n > 0) { - c1 = (uwchar_t) s1[0]; - c2 = (uwchar_t) s2[0]; + c1 = (wint_t) s1[0]; + c2 = (wint_t) s2[0]; if (c1 - c2 != 0) return c1 - c2; ++s1; @@ -74,8 +74,8 @@ wmemcmp (s1, s2, n) } if (n > 0) { - c1 = (uwchar_t) s1[0]; - c2 = (uwchar_t) s2[0]; + c1 = (wint_t) s1[0]; + c2 = (wint_t) s2[0]; if (c1 - c2 != 0) return c1 - c2; } |