iconv, localedef: avoid floating point rounding differences [BZ #24372]

[thirdparty/glibc.git] / wctype / iswctype.c

diff --git a/wctype/iswctype.c b/wctype/iswctype.c
index 58a2a5288f5bf77e385ab7ceb4fa8369d00aa404..236f87fb685f92be39db0eb71bf78e8d8c010872 100644 (file)
--- a/wctype/iswctype.c
+++ b/wctype/iswctype.c
@@ -1,40 +1,37 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>.
 
    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
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser 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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <ctype.h>
 #include <wctype.h>
 
-#include "cname-lookup.h"
-
-
-extern unsigned int *__ctype32_b;
+#include "wchar-lookup.h"
 
+#undef __iswctype
 
 int
 __iswctype (wint_t wc, wctype_t desc)
 {
-  size_t idx;
-
-  idx = cname_lookup (wc);
-  if (idx == ~((size_t) 0))
+  /* If the user passes in an invalid DESC valid (the one returned from
+     `wctype' in case of an error) simply return 0.  */
+  if (desc == (wctype_t) 0)
     return 0;
 
-  return __ctype32_b[idx] & desc;
+  return wctype_table_lookup ((const char *) desc, wc);
 }
+libc_hidden_def (__iswctype)
 weak_alias (__iswctype, iswctype)