aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2011-10-25 15:06:34 +0200
committerAndreas Schwab <schwab@redhat.com>2011-10-25 15:26:29 +0200
commit1f1e194720177de3cbc2a84bc62d22e63cb23d4a (patch)
tree78ca6332699b0fcdf9cfe49ebb29c7b735643117
parent37822576b8cf2a04fb34212fb0ae82d3b607bed2 (diff)
downloadglibc-1f1e194720177de3cbc2a84bc62d22e63cb23d4a.tar
glibc-1f1e194720177de3cbc2a84bc62d22e63cb23d4a.tar.gz
glibc-1f1e194720177de3cbc2a84bc62d22e63cb23d4a.tar.bz2
glibc-1f1e194720177de3cbc2a84bc62d22e63cb23d4a.zip
Use correct signedness in default implementations of wcscmp and wmemcmp
-rw-r--r--ChangeLog3
-rw-r--r--wcsmbs/wcscmp.c8
-rw-r--r--wcsmbs/wmemcmp.c32
3 files changed, 23 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d0e0fccc6..fbd5a492f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2011-10-25 Andreas Schwab <schwab@redhat.com>
+ * wcsmbs/wcscmp.c (WCSCMP): Compare as wchar_t, not wint_t.
+ * wcsmbs/wmemcmp.c (WMEMCMP): Likewise.
+
* string/test-strchr.c (do_test): Don't generate NUL bytes.
2011-10-25 Ulrich Drepper <drepper@gmail.com>
diff --git a/wcsmbs/wcscmp.c b/wcsmbs/wcscmp.c
index ddbd4aa93f..98728359b0 100644
--- a/wcsmbs/wcscmp.c
+++ b/wcsmbs/wcscmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
@@ -31,12 +31,12 @@ WCSCMP (s1, s2)
const wchar_t *s1;
const wchar_t *s2;
{
- wint_t c1, c2;
+ wchar_t c1, c2;
do
{
- c1 = (wint_t) *s1++;
- c2 = (wint_t) *s2++;
+ c1 = *s1++;
+ c2 = *s2++;
if (c2 == L'\0')
return c1 - c2;
}
diff --git a/wcsmbs/wmemcmp.c b/wcsmbs/wmemcmp.c
index 73c6394f8e..9bd556e64b 100644
--- a/wcsmbs/wmemcmp.c
+++ b/wcsmbs/wmemcmp.c
@@ -29,25 +29,25 @@ WMEMCMP (s1, s2, n)
const wchar_t *s2;
size_t n;
{
- register wint_t c1;
- register wint_t c2;
+ register wchar_t c1;
+ register wchar_t c2;
while (n >= 4)
{
- c1 = (wint_t) s1[0];
- c2 = (wint_t) s2[0];
+ c1 = s1[0];
+ c2 = s2[0];
if (c1 - c2 != 0)
return c1 > c2 ? 1 : -1;
- c1 = (wint_t) s1[1];
- c2 = (wint_t) s2[1];
+ c1 = s1[1];
+ c2 = s2[1];
if (c1 - c2 != 0)
return c1 > c2 ? 1 : -1;
- c1 = (wint_t) s1[2];
- c2 = (wint_t) s2[2];
+ c1 = s1[2];
+ c2 = s2[2];
if (c1 - c2 != 0)
return c1 > c2 ? 1 : -1;
- c1 = (wint_t) s1[3];
- c2 = (wint_t) s2[3];
+ c1 = s1[3];
+ c2 = s2[3];
if (c1 - c2 != 0)
return c1 > c2 ? 1 : -1;
s1 += 4;
@@ -57,8 +57,8 @@ WMEMCMP (s1, s2, n)
if (n > 0)
{
- c1 = (wint_t) s1[0];
- c2 = (wint_t) s2[0];
+ c1 = s1[0];
+ c2 = s2[0];
if (c1 - c2 != 0)
return c1 > c2 ? 1 : -1;
++s1;
@@ -67,8 +67,8 @@ WMEMCMP (s1, s2, n)
}
if (n > 0)
{
- c1 = (wint_t) s1[0];
- c2 = (wint_t) s2[0];
+ c1 = s1[0];
+ c2 = s2[0];
if (c1 - c2 != 0)
return c1 > c2 ? 1 : -1;
++s1;
@@ -77,8 +77,8 @@ WMEMCMP (s1, s2, n)
}
if (n > 0)
{
- c1 = (wint_t) s1[0];
- c2 = (wint_t) s2[0];
+ c1 = s1[0];
+ c2 = s2[0];
if (c1 - c2 != 0)
return c1 > c2 ? 1 : -1;
}