summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2006-01-03 00:57:46 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2006-01-03 00:57:46 +0000
commitd211e3ae05051f865f78712ff1c2d29df3007709 (patch)
tree8788203a8e96a07bdce95aa278b2be56003f7e11
parentf2f6b14bfb5bc9ad0276efe011c3d186010ce1a2 (diff)
Do not overlap flags; problem introduced when new escapes were added.
-rw-r--r--lib/libc/stdio/vfscanf.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
index b319271aecf..fa3815d59ee 100644
--- a/lib/libc/stdio/vfscanf.c
+++ b/lib/libc/stdio/vfscanf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfscanf.c,v 1.16 2005/12/19 19:39:25 millert Exp $ */
+/* $OpenBSD: vfscanf.c,v 1.17 2006/01/03 00:57:45 millert Exp $ */
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -61,14 +61,14 @@
* SIGNOK, NDIGITS, DPTOK, and EXPOK are for floating point;
* SIGNOK, NDIGITS, PFXOK, and NZDIGITS are for integral.
*/
-#define SIGNOK 0x080 /* +/- is (still) legal */
-#define NDIGITS 0x100 /* no digits detected */
+#define SIGNOK 0x0200 /* +/- is (still) legal */
+#define NDIGITS 0x0400 /* no digits detected */
-#define DPTOK 0x200 /* (float) decimal point is still legal */
-#define EXPOK 0x400 /* (float) exponent (e+3, etc) still legal */
+#define DPTOK 0x0800 /* (float) decimal point is still legal */
+#define EXPOK 0x1000 /* (float) exponent (e+3, etc) still legal */
-#define PFXOK 0x200 /* 0x prefix is (still) legal */
-#define NZDIGITS 0x400 /* no zero digits detected */
+#define PFXOK 0x0800 /* 0x prefix is (still) legal */
+#define NZDIGITS 0x1000 /* no zero digits detected */
/*
* Conversion types.