Skip to content

W
wine-cw
Commit a3717a2e authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Fixed EOF return value for sscanf.

parent 5778165d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
dlls/msvcrt/scanf.h
View file @ a3717a2e
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#ifdef WIDE_SCANF #ifdef WIDE_SCANF
#define _CHAR_ MSVCRT_wchar_t #define _CHAR_ MSVCRT_wchar_t
#define _EOF_ MSVCRT_WEOF #define _EOF_ MSVCRT_WEOF
#define _EOF_RET MSVCRT_WEOF
#define _ISSPACE_(c) MSVCRT_iswspace(c) #define _ISSPACE_(c) MSVCRT_iswspace(c)
#define _ISDIGIT_(c) MSVCRT_iswdigit(c) #define _ISDIGIT_(c) MSVCRT_iswdigit(c)
#define _CONVERT_(c) c /*** FIXME ***/ #define _CONVERT_(c) c /*** FIXME ***/
...@@ -33,6 +34,7 @@ ...@@ -33,6 +34,7 @@
#else /* WIDE_SCANF */ #else /* WIDE_SCANF */
#define _CHAR_ char #define _CHAR_ char
#define _EOF_ MSVCRT_EOF #define _EOF_ MSVCRT_EOF
#define _EOF_RET MSVCRT_EOF
#define _ISSPACE_(c) isspace(c) #define _ISSPACE_(c) isspace(c)
#define _ISDIGIT_(c) isdigit(c) #define _ISDIGIT_(c) isdigit(c)
#define _CONVERT_(c) c /*** FIXME ***/ #define _CONVERT_(c) c /*** FIXME ***/
...@@ -90,8 +92,8 @@ int _FUNCTION_ { ...@@ -90,8 +92,8 @@ int _FUNCTION_ {
#endif /* CONSOLE */ #endif /* CONSOLE */
#endif /* WIDE_SCANF */ #endif /* WIDE_SCANF */
nch = _GETC_(file); nch = _GETC_(file);
if (nch == _EOF_) return _EOF_; if (nch == _EOF_) return _EOF_RET;
va_start(ap, format); va_start(ap, format);
while (*format) { while (*format) {
/* a whitespace character in the format string causes scanf to read, /* a whitespace character in the format string causes scanf to read,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment