Revert "Fix strncmp page test to limit length to size of object"

This reverts commit e513f34605747f43eed259519b6fb847591861d2.

diff --git a/ChangeLog b/ChangeLog
index 2f2ec75..fe86bc9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-2011-04-05  Andreas Schwab  <schwab@redhat.com>
-
-       * string/test-strncmp.c (do_page_test): Limit length to size of
-       object.
-
 2011-04-03  Ulrich Drepper  <drepper@gmail.com>
 
        * sysdeps/x86_64/cacheinfo.c (intel_02_known): Fix typo in table.

diff --git a/string/test-strncmp.c b/string/test-strncmp.c
index 880b2be..00971df 100644 (file)
--- a/string/test-strncmp.c
+++ b/string/test-strncmp.c
@@ -204,7 +204,6 @@ do_page_test (size_t offset1, size_t offset2, char *s2)
 {
   char *s1;
   int exp_result;
-  size_t max_offset = offset1 > offset2 ? offset1 : offset2;
 
   if (offset1 >= page_size || offset2 >= page_size)
     return;
@@ -212,12 +211,12 @@ do_page_test (size_t offset1, size_t offset2, char *s2)
   s1 = (char *) (buf1 + offset1);
   s2 += offset2;
 
-  exp_result = *s1;
+  exp_result= *s1;
 
   FOR_EACH_IMPL (impl, 0)
     {
-      check_result (impl, s1, s2, page_size - max_offset, -exp_result);
-      check_result (impl, s2, s1, page_size - max_offset, exp_result);
+      check_result (impl, s1, s2, page_size, -exp_result);
+      check_result (impl, s2, s1, page_size, exp_result);
     }
 }