diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | string/test-strchr.c | 26 | ||||
| -rw-r--r-- | wcsmbs/wcscmp.c | 8 | ||||
| -rw-r--r-- | wcsmbs/wmemcmp.c | 32 |
4 files changed, 42 insertions, 31 deletions
@@ -1,3 +1,10 @@ +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> * sysdeps/ieee754/dbl-64/e_atanh.c: Use math_force_eval instead of a diff --git a/string/test-strchr.c b/string/test-strchr.c index 518a4dce38..3bbc2f5700 100644 --- a/string/test-strchr.c +++ b/string/test-strchr.c @@ -63,8 +63,8 @@ stupid_STRCHR (const CHAR *s, int c) return NULL; } -IMPL (stupid_STRCHR, 1) -IMPL (simple_STRCHR, 1) +IMPL (stupid_STRCHR, 0) +IMPL (simple_STRCHR, 0) IMPL (STRCHR, 1) static void @@ -100,15 +100,15 @@ do_one_test (impl_t *impl, const CHAR *s, int c, const CHAR *exp_res) static void do_test (size_t align, size_t pos, size_t len, int seek_char, int max_char) -/* for wcschr: align here means align not in bytes, - * but in wchar_ts, in bytes it will equal to align * (sizeof (wchar_t)) - * len for wcschr here isn't in bytes but it's number of wchar_t symbols */ +/* For wcschr: align here means align not in bytes, + but in wchar_ts, in bytes it will equal to align * (sizeof (wchar_t)) + len for wcschr here isn't in bytes but it's number of wchar_t symbols. */ { size_t i; CHAR *result; - CHAR *buf = (CHAR *) (buf1); + CHAR *buf = (CHAR *) buf1; align &= 15; - if ((align + len) * sizeof(CHAR) >= page_size) + if ((align + len) * sizeof (CHAR) >= page_size) return; for (i = 0; i < len; ++i) @@ -116,6 +116,8 @@ do_test (size_t align, size_t pos, size_t len, int seek_char, int max_char) buf[align + i] = 32 + 23 * i % max_char; if (buf[align + i] == seek_char) buf[align + i] = seek_char + 1; + else if (buf[align + i] == 0) + buf[align + i] = 1; } buf[align + len] = 0; @@ -130,7 +132,8 @@ do_test (size_t align, size_t pos, size_t len, int seek_char, int max_char) result = NULL; if (HP_TIMING_AVAIL) - printf ("Length %4zd, alignment in bytes %2zd:", pos, align * sizeof (CHAR)); + printf ("Length %4zd, alignment in bytes %2zd:", + pos, align * sizeof (CHAR)); FOR_EACH_IMPL (impl, 0) do_one_test (impl, buf + align, seek_char, result); @@ -149,14 +152,15 @@ do_random_tests (void) for (n = 0; n < ITERATIONS; n++) { -/* for wcschr: align here means align not in bytes, but in wchar_ts, - * in bytes it will equal to align * (sizeof (wchar_t)) */ + /* For wcschr: align here means align not in bytes, but in wchar_ts, + in bytes it will equal to align * (sizeof (wchar_t)). */ align = random () & 15; pos = random () & 511; seek_char = random () & 255; if (pos + align >= 511) pos = 510 - align - (random () & 7); -/* len for wcschr here isn't in bytes but it's number of wchar_t symbols */ + /* len for wcschr here isn't in bytes but it's number of wchar_t + symbols. */ len = random () & 511; if ((pos == len && seek_char) || (pos > len && (random () & 1))) 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; } |