about summary refs log tree commit diff
path: root/stdio-common/vfscanf.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-02-18 09:21:24 +0000
committerUlrich Drepper <drepper@redhat.com>2007-02-18 09:21:24 +0000
commit821d3e7031b4b96260f95aca4255c1e10f038701 (patch)
tree258ff4e9fc889235c4869de42b890cc535833258 /stdio-common/vfscanf.c
parent7acd205c59ff046d00ed5645fe744105e666242c (diff)
downloadglibc-821d3e7031b4b96260f95aca4255c1e10f038701.tar.gz
glibc-821d3e7031b4b96260f95aca4255c1e10f038701.tar.xz
glibc-821d3e7031b4b96260f95aca4255c1e10f038701.zip
* stdio-common/Makefile (tests): Add tst-swscanf.
	* stdio-common/tst-sscanf.c: Make tests usable for swscanf
	testing.
	* stdio-common/tst-swscanf.c: New file.
Diffstat (limited to 'stdio-common/vfscanf.c')
-rw-r--r--stdio-common/vfscanf.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 1ea9bc4e07..b7acd7993b 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2002, 2003, 2004, 2005, 2006
+/* Copyright (C) 1991-2002, 2003, 2004, 2005, 2006, 2007
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -59,7 +59,6 @@
 #define SUPPRESS	0x008	/* *: suppress assignment */
 #define POINTER		0x010	/* weird %p pointer (`fake hex') */
 #define NOSKIP		0x020	/* do not skip blanks */
-#define WIDTH		0x040	/* width was given */
 #define GROUP		0x080	/* ': group numbers */
 #define MALLOC		0x100	/* a: malloc strings */
 #define CHAR		0x200	/* hh: char */
@@ -424,7 +423,6 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
 	    {
 	      /* Oops; that was actually the field width.  */
 	      width = argpos;
-	      flags |= WIDTH;
 	      argpos = 0;
 	      goto got_width;
 	    }
@@ -446,10 +444,6 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
 	    break;
 	  }
 
-      /* We have seen width. */
-      if (ISDIGIT ((UCHAR_T) *f))
-	flags |= WIDTH;
-
       /* Find the maximum field width.  */
       width = 0;
       while (ISDIGIT ((UCHAR_T) *f))