diff options
| author | Arjun Shankar <arjun.is@lostca.se> | 2014-12-16 15:19:51 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-12-16 16:55:23 +0530 |
| commit | fa13e15b9a5cc49c9c6dee33084c3ff54d48e50e (patch) | |
| tree | 2b267df3aa043b8190ec18c41952ab1eb0dc1b48 | |
| parent | 0e426475a70800b6a17daa7a8ebbafeabfcbc022 (diff) | |
| download | glibc-fa13e15b9a5cc49c9c6dee33084c3ff54d48e50e.tar.gz glibc-fa13e15b9a5cc49c9c6dee33084c3ff54d48e50e.tar.xz glibc-fa13e15b9a5cc49c9c6dee33084c3ff54d48e50e.zip | |
Modify stdlib/tst-bsearch.c to use test-skeleton.c
This test used to define a 'struct entry' that conflicts with the definition in search.h included in test-skeleton. The struct is now renamed 'item'.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | stdlib/tst-bsearch.c | 27 |
2 files changed, 19 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index 7b724d0d12..ce2d639423 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-12-16 Arjun Shankar <arjun.is@lostca.se> + * stdlib/tst-bsearch.c: Use test-skeleton.c. + (entry): Rename to ITEM. + (do_test, comp): Adjust. + * stdio-common/tst-fseek.c: Use test-skeleton.c. 2014-12-16 Torvald Riegel <triegel@redhat.com> diff --git a/stdlib/tst-bsearch.c b/stdlib/tst-bsearch.c index e539275930..35b1f7ffa7 100644 --- a/stdlib/tst-bsearch.c +++ b/stdlib/tst-bsearch.c @@ -20,7 +20,7 @@ #include <stdlib.h> #include <tst-stack-align.h> -struct entry +struct item { int val; const char *str; @@ -45,8 +45,8 @@ static int align_check; static int comp (const void *p1, const void *p2) { - struct entry *e1 = (struct entry *) p1; - struct entry *e2 = (struct entry *) p2; + struct item *e1 = (struct item *) p1; + struct item *e2 = (struct item *) p2; if (!align_check) align_check = TEST_STACK_ALIGN () ? -1 : 1; @@ -55,20 +55,20 @@ comp (const void *p1, const void *p2) } -int -main (void) +static int +do_test (void) { size_t cnt; int result = 0; - struct entry key; - struct entry *res; + struct item key; + struct item *res; for (cnt = 0; cnt < narr; ++cnt) { key.val = arr[cnt].val; - res = (struct entry *) bsearch (&key, arr, narr, sizeof (arr[0]), comp); + res = (struct item *) bsearch (&key, arr, narr, sizeof (arr[0]), comp); if (res == NULL) { printf ("entry %zd not found\n", cnt); @@ -83,7 +83,7 @@ main (void) /* And some special tests that shouldn't find any entry. */ key.val = -1; - res = (struct entry *) bsearch (&key, arr, narr, sizeof (arr[0]), comp); + res = (struct item *) bsearch (&key, arr, narr, sizeof (arr[0]), comp); if (res != NULL) { puts ("found an entry that's not there"); @@ -91,7 +91,7 @@ main (void) } key.val = 11; - res = (struct entry *) bsearch (&key, arr, narr, sizeof (arr[0]), comp); + res = (struct item *) bsearch (&key, arr, narr, sizeof (arr[0]), comp); if (res != NULL) { puts ("found an entry that's not there"); @@ -99,7 +99,7 @@ main (void) } key.val = 11; - res = (struct entry *) bsearch (&key, arr, 0, sizeof (arr[0]), comp); + res = (struct item *) bsearch (&key, arr, 0, sizeof (arr[0]), comp); if (res != NULL) { puts ("found an entry that's not there"); @@ -111,7 +111,7 @@ main (void) { key.val = arr[cnt].val; - res = (struct entry *) bsearch (&key, &arr[5], 1, sizeof (arr[0]), comp); + res = (struct item *) bsearch (&key, &arr[5], 1, sizeof (arr[0]), comp); if (cnt == 5) { if (res == NULL) @@ -148,3 +148,6 @@ main (void) return result; } + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" |