From patchwork Mon Dec 15 22:24:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arjun Shankar X-Patchwork-Id: 4266 Received: (qmail 10006 invoked by alias); 15 Dec 2014 22:22:28 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 9986 invoked by uid 89); 15 Dec 2014 22:22:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: arati.lostca.se Date: Mon, 15 Dec 2014 22:24:39 +0000 From: Arjun Shankar To: libc-alpha@sourceware.org Subject: [PATCH 2/3] Modify stdlib/tst-bsearch.c to use test-skeleton.c Message-ID: <20141215222439.GC68022@arati.lostca.se> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) 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'. ChangeLog: 2014-12-15 Arjun Shankar * stdlib/tst-bsearch.c: Rename struct; use test-skeleton.c. --- stdlib/tst-bsearch.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/stdlib/tst-bsearch.c b/stdlib/tst-bsearch.c index e539275..35b1f7f 100644 --- a/stdlib/tst-bsearch.c +++ b/stdlib/tst-bsearch.c @@ -20,7 +20,7 @@ #include #include -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"