Wed Jun 8 05:31:43 2011 UTC ()
Adjust types.


(jruoho)
diff -r1.3 -r1.4 src/tests/lib/libc/stdlib/t_strtol.c
cvs diff -r1.3 -r1.4 src/tests/lib/libc/stdlib/t_strtol.c (expand / switch to unified diff)

--- src/tests/lib/libc/stdlib/t_strtol.c 2011/06/05 13:51:46 1.3
+++ src/tests/lib/libc/stdlib/t_strtol.c 2011/06/08 05:31:43 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: t_strtol.c,v 1.3 2011/06/05 13:51:46 jruoho Exp $ */ 1/* $NetBSD: t_strtol.c,v 1.4 2011/06/08 05:31:43 jruoho Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2011 The NetBSD Foundation, Inc. 4 * Copyright (c) 2011 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Jukka Ruohonen. 8 * by Jukka Ruohonen.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,37 +20,37 @@ @@ -20,37 +20,37 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__RCSID("$NetBSD: t_strtol.c,v 1.3 2011/06/05 13:51:46 jruoho Exp $"); 33__RCSID("$NetBSD: t_strtol.c,v 1.4 2011/06/08 05:31:43 jruoho Exp $");
34 34
35#include <atf-c.h> 35#include <atf-c.h>
36#include <errno.h> 36#include <errno.h>
37#include <stdlib.h> 37#include <stdlib.h>
38#include <string.h> 38#include <string.h>
39#include <limits.h> 39#include <limits.h>
40 40
41struct test { 41struct test {
42 const char *str; 42 const char *str;
43 long long int res; 43 int64_t res;
44 int base; 44 int base;
45 const char *end; 45 const char *end;
46}; 46};
47 47
48static void check(struct test *, long int, long long int, char *); 48static void check(struct test *, long int, long long int, char *);
49 49
50static void 50static void
51check(struct test *t, long int li, long long int lli, char *end) 51check(struct test *t, long int li, long long int lli, char *end)
52{ 52{
53 53
54 if (li != -1 && li != t->res) 54 if (li != -1 && li != t->res)
55 atf_tc_fail_nonfatal("strtol(%s, &end, %d) failed " 55 atf_tc_fail_nonfatal("strtol(%s, &end, %d) failed "
56 "(rv = %ld)", t->str, t->base, li); 56 "(rv = %ld)", t->str, t->base, li);