From c9df3df9d2a1d7a87f8026b6279639bca0962b91 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 17 Apr 2003 17:38:38 +0000 Subject: Update. * string/test-memchr.c: Likewise. * string/test-memcmp.c: Likewise. * string/test-memcpy.c: Likewise. * string/test-memmove.c: Likewise. * string/test-memset.c: Likewise. * string/test-strcat.c: Likewise. * string/test-strchr.c: Likewise. * string/test-strcmp.c: Likewise. * string/test-strcpy.c: Likewise. * string/test-strlen.c: Likewise. * string/test-strncmp.c: Likewise. * string/test-strpbrk.c: Likewise. * string/test-strrchr.c: Likewise. * string/test-strspn.c: Likewise. --- string/test-memchr.c | 8 +++++--- string/test-memcmp.c | 4 +++- string/test-memcpy.c | 8 +++++--- string/test-memmove.c | 6 ++++-- string/test-memset.c | 6 ++++-- string/test-strcat.c | 6 ++++-- string/test-strchr.c | 10 ++++++---- string/test-strcmp.c | 4 +++- string/test-strcpy.c | 6 ++++-- string/test-strlen.c | 8 +++++--- string/test-strncmp.c | 4 +++- string/test-strpbrk.c | 6 ++++-- string/test-strrchr.c | 8 +++++--- string/test-strspn.c | 6 ++++-- 14 files changed, 59 insertions(+), 31 deletions(-) (limited to 'string') diff --git a/string/test-memchr.c b/string/test-memchr.c index e5c13a2..df866fe 100644 --- a/string/test-memchr.c +++ b/string/test-memchr.c @@ -1,5 +1,5 @@ /* Test and measure memchr functions. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Jakub Jelinek , 1999. @@ -50,7 +50,9 @@ do_one_test (impl_t *impl, const char *s, int c, size_t n, char *exp_res) if (HP_TIMING_AVAIL) { - hp_timing_t start, stop, best_time = ~ (hp_timing_t) 0; + hp_timing_t start __attribute ((unused)); + hp_timing_t stop __attribute ((unused)); + hp_timing_t best_time = ~ (hp_timing_t) 0; size_t i; for (i = 0; i < 32; ++i) @@ -74,7 +76,7 @@ do_test (size_t align, size_t pos, size_t len, int seek_char) align &= 7; if (align + len >= page_size) return; - + for (i = 0; i < len; ++i) { buf1[align + i] = 1 + 23 * i % 127; diff --git a/string/test-memcmp.c b/string/test-memcmp.c index 4d38ddb..89c1043 100644 --- a/string/test-memcmp.c +++ b/string/test-memcmp.c @@ -54,7 +54,9 @@ do_one_test (impl_t *impl, const char *s1, const char *s2, size_t len, if (HP_TIMING_AVAIL) { - hp_timing_t start, stop, best_time = ~ (hp_timing_t) 0; + hp_timing_t start __attribute ((unused)); + hp_timing_t stop __attribute ((unused)); + hp_timing_t best_time = ~ (hp_timing_t) 0; size_t i; for (i = 0; i < 32; ++i) diff --git a/string/test-memcpy.c b/string/test-memcpy.c index 5549ead..adc90da 100644 --- a/string/test-memcpy.c +++ b/string/test-memcpy.c @@ -1,5 +1,5 @@ /* Test and measure memcpy functions. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Jakub Jelinek , 1999. @@ -71,7 +71,9 @@ do_one_test (impl_t *impl, char *dst, const char *src, if (HP_TIMING_AVAIL) { - hp_timing_t start, stop, best_time = ~ (hp_timing_t) 0; + hp_timing_t start __attribute ((unused)); + hp_timing_t stop __attribute ((unused)); + hp_timing_t best_time = ~ (hp_timing_t) 0; size_t i; for (i = 0; i < 32; ++i) @@ -172,7 +174,7 @@ do_random_tests (void) if (align2 + len > size2) align2 = size2 - len; } - } + } p1 = buf1 + page_size - size1; p2 = buf2 + page_size - size2; c = random () & 255; diff --git a/string/test-memmove.c b/string/test-memmove.c index deb06e1..9531aa8 100644 --- a/string/test-memmove.c +++ b/string/test-memmove.c @@ -1,5 +1,5 @@ /* Test and measure memmove functions. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Jakub Jelinek , 1999. @@ -70,7 +70,9 @@ do_one_test (impl_t *impl, char *dst, char *src, const char *orig_src, if (HP_TIMING_AVAIL) { - hp_timing_t start, stop, best_time = ~ (hp_timing_t) 0; + hp_timing_t start __attribute ((unused)); + hp_timing_t stop __attribute ((unused)); + hp_timing_t best_time = ~ (hp_timing_t) 0; size_t i; for (i = 0; i < 32; ++i) diff --git a/string/test-memset.c b/string/test-memset.c index 2847502..9ae7741 100644 --- a/string/test-memset.c +++ b/string/test-memset.c @@ -1,5 +1,5 @@ /* Test and measure memset functions. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Jakub Jelinek , 1999. @@ -59,7 +59,9 @@ do_one_test (impl_t *impl, char *s, int c, size_t n) if (HP_TIMING_AVAIL) { - hp_timing_t start, stop, best_time = ~ (hp_timing_t) 0; + hp_timing_t start __attribute ((unused)); + hp_timing_t stop __attribute ((unused)); + hp_timing_t best_time = ~ (hp_timing_t) 0; size_t i; for (i = 0; i < 32; ++i) diff --git a/string/test-strcat.c b/string/test-strcat.c index d241741..a3adfe3 100644 --- a/string/test-strcat.c +++ b/string/test-strcat.c @@ -1,5 +1,5 @@ /* Test and measure strcat functions. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Jakub Jelinek , 1999. @@ -59,7 +59,9 @@ do_one_test (impl_t *impl, char *dst, const char *src) if (HP_TIMING_AVAIL) { - hp_timing_t start, stop, best_time = ~ (hp_timing_t) 0; + hp_timing_t start __attribute ((used)); + hp_timing_t stop __attribute ((used)); + hp_timing_t best_time = ~ (hp_timing_t) 0; size_t i; for (i = 0; i < 32; ++i) diff --git a/string/test-strchr.c b/string/test-strchr.c index 9483e71..1333ebc 100644 --- a/string/test-strchr.c +++ b/string/test-strchr.c @@ -1,5 +1,5 @@ /* Test and measure strchr functions. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Jakub Jelinek , 1999. @@ -34,7 +34,7 @@ simple_strchr (const char *s, int c) { for (; *s != (char) c; ++s) if (*s == '\0') - return NULL; + return NULL; return (char *) s; } @@ -63,7 +63,9 @@ do_one_test (impl_t *impl, const char *s, int c, char *exp_res) if (HP_TIMING_AVAIL) { - hp_timing_t start, stop, best_time = ~ (hp_timing_t) 0; + hp_timing_t start __attribute ((unused)); + hp_timing_t stop __attribute ((unused)); + hp_timing_t best_time = ~ (hp_timing_t) 0; size_t i; for (i = 0; i < 32; ++i) @@ -87,7 +89,7 @@ do_test (size_t align, size_t pos, size_t len, int seek_char, int max_char) align &= 7; if (align + len >= page_size) return; - + for (i = 0; i < len; ++i) { buf1[align + i] = 32 + 23 * i % (max_char - 32); diff --git a/string/test-strcmp.c b/string/test-strcmp.c index 63f14f1..af49f14 100644 --- a/string/test-strcmp.c +++ b/string/test-strcmp.c @@ -68,7 +68,9 @@ do_one_test (impl_t *impl, const char *s1, const char *s2, int exp_result) if (HP_TIMING_AVAIL) { - hp_timing_t start, stop, best_time = ~ (hp_timing_t) 0; + hp_timing_t start __attribute ((unused)); + hp_timing_t stop __attribute ((unused)); + hp_timing_t best_time = ~ (hp_timing_t) 0; size_t i; for (i = 0; i < 32; ++i) diff --git a/string/test-strcpy.c b/string/test-strcpy.c index c198a9d..dbfbb92 100644 --- a/string/test-strcpy.c +++ b/string/test-strcpy.c @@ -1,5 +1,5 @@ /* Test and measure strcpy functions. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Jakub Jelinek , 1999. @@ -61,7 +61,9 @@ do_one_test (impl_t *impl, char *dst, const char *src, if (HP_TIMING_AVAIL) { - hp_timing_t start, stop, best_time = ~ (hp_timing_t) 0; + hp_timing_t start __attribute ((unused)); + hp_timing_t stop __attribute ((unused));; + hp_timing_t best_time = ~ (hp_timing_t) 0; size_t i; for (i = 0; i < 32; ++i) diff --git a/string/test-strlen.c b/string/test-strlen.c index 22b7c1a..82ad95e 100644 --- a/string/test-strlen.c +++ b/string/test-strlen.c @@ -1,5 +1,5 @@ /* Test and measure strlen functions. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Jakub Jelinek , 1999. @@ -58,7 +58,9 @@ do_one_test (impl_t *impl, const char *s, size_t exp_len) if (HP_TIMING_AVAIL) { - hp_timing_t start, stop, best_time = ~ (hp_timing_t) 0; + hp_timing_t start __attribute ((unused)); + hp_timing_t stop __attribute ((unused)); + hp_timing_t best_time = ~ (hp_timing_t) 0; size_t i; for (i = 0; i < 32; ++i) @@ -81,7 +83,7 @@ do_test (size_t align, size_t len, int max_char) align &= 7; if (align + len >= page_size) return; - + for (i = 0; i < len; ++i) buf1[align + i] = 1 + 7 * i % max_char; buf1[align + len] = 0; diff --git a/string/test-strncmp.c b/string/test-strncmp.c index 4fed4e5..431b64d 100644 --- a/string/test-strncmp.c +++ b/string/test-strncmp.c @@ -68,7 +68,9 @@ do_one_test (impl_t *impl, const char *s1, const char *s2, size_t n, if (HP_TIMING_AVAIL) { - hp_timing_t start, stop, best_time = ~ (hp_timing_t) 0; + hp_timing_t start __attribute ((unused)); + hp_timing_t stop __attribute ((unused)); + hp_timing_t best_time = ~ (hp_timing_t) 0; size_t i; for (i = 0; i < 32; ++i) diff --git a/string/test-strpbrk.c b/string/test-strpbrk.c index a920c00..2ec52fd 100644 --- a/string/test-strpbrk.c +++ b/string/test-strpbrk.c @@ -1,5 +1,5 @@ /* Test and measure strpbrk functions. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Jakub Jelinek , 1999. @@ -73,7 +73,9 @@ do_one_test (impl_t *impl, const char *s, const char *rej, RES_TYPE exp_res) if (HP_TIMING_AVAIL) { - hp_timing_t start, stop, best_time = ~ (hp_timing_t) 0; + hp_timing_t start __attribute ((unused)); + hp_timing_t stop __attribute ((unused)); + hp_timing_t best_time = ~ (hp_timing_t) 0; size_t i; for (i = 0; i < 32; ++i) diff --git a/string/test-strrchr.c b/string/test-strrchr.c index 0f8da60..5aff75a 100644 --- a/string/test-strrchr.c +++ b/string/test-strrchr.c @@ -1,5 +1,5 @@ /* Test and measure strrchr functions. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Jakub Jelinek , 1999. @@ -53,7 +53,9 @@ do_one_test (impl_t *impl, const char *s, int c, char *exp_res) if (HP_TIMING_AVAIL) { - hp_timing_t start, stop, best_time = ~ (hp_timing_t) 0; + hp_timing_t start __attribute ((unused)); + hp_timing_t stop __attribute ((unused)); + hp_timing_t best_time = ~ (hp_timing_t) 0; size_t i; for (i = 0; i < 32; ++i) @@ -77,7 +79,7 @@ do_test (size_t align, size_t pos, size_t len, int seek_char, int max_char) align &= 7; if (align + len >= page_size) return; - + for (i = 0; i < len; ++i) { buf1[align + i] = random () & max_char; diff --git a/string/test-strspn.c b/string/test-strspn.c index 8701687..de7351f 100644 --- a/string/test-strspn.c +++ b/string/test-strspn.c @@ -1,5 +1,5 @@ /* Test and measure strspn functions. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Jakub Jelinek , 1999. @@ -77,7 +77,9 @@ do_one_test (impl_t *impl, const char *s, const char *acc, size_t exp_res) if (HP_TIMING_AVAIL) { - hp_timing_t start, stop, best_time = ~ (hp_timing_t) 0; + hp_timing_t start __attribute ((unused)); + hp_timing_t stop __attribute ((unused)); + hp_timing_t best_time = ~ (hp_timing_t) 0; size_t i; for (i = 0; i < 32; ++i) -- cgit v1.1