aboutsummaryrefslogtreecommitdiff
path: root/string/test-strpbrk.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-12-27 22:50:12 +0000
committerRoland McGrath <roland@gnu.org>2005-12-27 22:50:12 +0000
commit0317eaecb1f1a0667a18412b2209f0ae70f94420 (patch)
treebc201bb0f8243a9338befa69b7daf7c990ef82d5 /string/test-strpbrk.c
parent89c47e9c50290dd946ec4ac94baf81ae3d5da493 (diff)
downloadglibc-0317eaecb1f1a0667a18412b2209f0ae70f94420.tar
glibc-0317eaecb1f1a0667a18412b2209f0ae70f94420.tar.gz
glibc-0317eaecb1f1a0667a18412b2209f0ae70f94420.tar.bz2
glibc-0317eaecb1f1a0667a18412b2209f0ae70f94420.zip
* posix/tst-execle1.c (do_test): Add a const.
* posix/tst-execle2.c (do_test): Likewise. * posix/transbug.c (run_test): Add some casts. * posix/bug-regex22.c (main): Likewise. * posix/bug-regex5.c (main): Likewise. * wcsmbs/tst-mbsrtowcs.c (main): Likewise. * string/test-strspn.c (do_test, do_random_tests): Likewise. * string/test-strrchr.c (do_test, do_random_tests): Likewise. * string/test-strlen.c (do_random_tests): Likewise. * string/test-strpbrk.c (do_test, do_random_tests): Likewise. * string/test-strcmp.c (do_random_tests): Likewise. * string/test-strchr.c (do_test, do_random_tests): Likewise. * string/test-strcat.c (do_test, do_random_tests): Likewise. * string/test-strncpy.c (do_random_tests): Likewise. * string/test-strcpy.c (do_test, do_random_tests): Likewise. * string/test-memccpy.c (do_test): Likewise. * string/test-memmove.c (do_test, do_random_tests): Likewise. * string/test-memcpy.c (do_test, do_random_tests): Likewise. * string/test-memcmp.c (do_test, do_random_tests): Likewise. * string/test-memchr.c (do_test, do_random_tests): Likewise. * dlfcn/bug-atexit1.c (do_test): Fix up prototype in cast. * stdio-common/tst-fgets.c (do_test): Add a cast. * iconvdata/bug-iconv4.c (xiconv): Add a cast. * locale/programs/simple-hash.c (insert_entry_2): Remove useless casts. * resolv/herror.c (herror): Remove unused extern decl. * libio/obprintf.c: Include "strfile.h". * elf/order2mod2.c (init): Cast ignored value to void. * stdio-common/tstdiomisc.c: If FLT_EVAL_METHOD is 2, use long
Diffstat (limited to 'string/test-strpbrk.c')
-rw-r--r--string/test-strpbrk.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/string/test-strpbrk.c b/string/test-strpbrk.c
index 2ec52fd286..f3ed2080bc 100644
--- a/string/test-strpbrk.c
+++ b/string/test-strpbrk.c
@@ -1,5 +1,5 @@
/* Test and measure strpbrk functions.
- Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2003, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
@@ -102,8 +102,8 @@ do_test (size_t align, size_t pos, size_t len)
if (align + pos + 10 >= page_size || len > 240)
return;
- rej = buf2 + (random () & 255);
- s = buf1 + align;
+ rej = (char *) (buf2 + (random () & 255));
+ s = (char *) (buf1 + align);
for (i = 0; i < len; ++i)
{
@@ -182,7 +182,7 @@ do_random_tests (void)
}
rej[i] = '\0';
for (c = 1; c <= 255; ++c)
- if (strchr (rej, c) == NULL)
+ if (strchr ((char *) rej, c) == NULL)
break;
j = (pos > len ? pos : len) + align + 64;
if (j > 512)
@@ -199,23 +199,24 @@ do_random_tests (void)
else
{
p[i] = random () & 255;
- if (strchr (rej, p[i]))
+ if (strchr ((char *) rej, p[i]))
{
p[i] = random () & 255;
- if (strchr (rej, p[i]))
+ if (strchr ((char *) rej, p[i]))
p[i] = c;
}
}
}
- result = STRPBRK_RESULT (p + align, pos < len ? pos : len);
+ result = STRPBRK_RESULT ((char *) (p + align), pos < len ? pos : len);
FOR_EACH_IMPL (impl, 1)
- if (CALL (impl, p + align, rej) != result)
+ if (CALL (impl, (char *) (p + align), (char *) rej) != result)
{
error (0, 0, "Iteration %zd - wrong result in function %s (%zd, %p, %zd, %zd, %zd) %p != %p",
n, impl->name, align, rej, rlen, pos, len,
- (void *) CALL (impl, p + align, rej), (void *) result);
+ (void *) CALL (impl, (char *) (p + align), (char *) rej),
+ (void *) result);
ret = 1;
}
}