summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--README4
-rw-r--r--stdio-common/scanf7.c2
-rw-r--r--stdio-common/tstdiomisc.c10
-rw-r--r--version.h2
5 files changed, 17 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index bdc8530bf4..3cfe7f0511 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 1998-11-13  Ulrich Drepper  <drepper@cygnus.com>
 
+	* 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  <drepper@cygnus.com>
+
 	* stdio-common/vfscanf.c: Return EOF for invalid format
 	characters.
 
diff --git a/README b/README
index 0c89272193..99d9a0f23c 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This directory contains the version 2.0.100 test release of the GNU C Library.
+This directory contains the version 2.0.101 test release of the GNU C Library.
 Many bugs have been fixed since the last release.
 Some bugs surely remain.
 
@@ -53,7 +53,7 @@ provides the Unix `crypt' function, plus some other entry points.
 Because of the United States export restriction on DES implementations,
 we are distributing this code separately from the rest of the C
 library.  There is an extra distribution tar file just for crypt; it is
-called `glibc-crypt-2.0.100.tar.gz'.  You can just unpack the crypt
+called `glibc-crypt-2.0.101.tar.gz'.  You can just unpack the crypt
 distribution along with the rest of the C library and build; you can
 also build the library without getting crypt.  Users outside the USA
 can get the crypt distribution via anonymous FTP from ftp.ifi.uio.no
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;
diff --git a/version.h b/version.h
index 8bbeef7913..78efe87c4d 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 /* This file just defines the current version number of libc.  */
 
 #define RELEASE "experimental"
-#define VERSION "2.0.101"
+#define VERSION "2.0.102"