From 77d10f94bf43b73394f9a3eaf1052c4bfc52905f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 13 Nov 1998 19:03:53 +0000 Subject: Update. * version.h (VERSION): Bump to 2.0.102. * stdio-common/tstdiomisc.c (t2): Update test case for last scanf change. * stdio-common/scanf7.c (main): Likewise. 1998-11-13 Ulrich Drepper --- stdio-common/scanf7.c | 2 +- stdio-common/tstdiomisc.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'stdio-common') diff --git a/stdio-common/scanf7.c b/stdio-common/scanf7.c index 17d087216b..c746e47666 100644 --- a/stdio-common/scanf7.c +++ b/stdio-common/scanf7.c @@ -16,7 +16,7 @@ main (int argc, char *argv[]) n = -2; ret = sscanf ("1000", "%llld", &n); printf ("%%llld: ret: %d, n: %Ld\n", ret, n); - if (ret != 0 || n >= 0L) + if (ret > 0 || n >= 0L) abort (); return 0; diff --git a/stdio-common/tstdiomisc.c b/stdio-common/tstdiomisc.c index 8dac4f2039..e99457f510 100644 --- a/stdio-common/tstdiomisc.c +++ b/stdio-common/tstdiomisc.c @@ -19,17 +19,17 @@ t2 (void) int retval; #define SCAN(INPUT, FORMAT, VAR, EXP_RES, EXP_VAL) \ VAR = -1; \ - retval = sscanf (INPUT, FORMAT, &VAR); \ + retval = sscanf (INPUT, FORMAT, &VAR); \ printf ("sscanf (\"%s\", \"%s\", &x) => %d, x = %ld\n", \ INPUT, FORMAT, retval, VAR); \ result |= retval != EXP_RES || VAR != EXP_VAL SCAN ("12345", "%ld", N, 1, 12345); - SCAN ("12345", "%llllld", N, 0, -1); - SCAN ("12345", "%LLLLLd", N, 0, -1); + SCAN ("12345", "%llllld", N, -1, -1); + SCAN ("12345", "%LLLLLd", N, -1, -1); SCAN ("test ", "%*s%n", n, 0, 4); - SCAN ("test ", "%2*s%n", n, 0, -1); - SCAN ("12 ", "%l2d", n, 0, -1); + SCAN ("test ", "%2*s%n", n, -1, -1); + SCAN ("12 ", "%l2d", n, -1, -1); SCAN ("12 ", "%2ld", N, 1, 12); return result; -- cgit v1.2.3