X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_scanw.c;h=1ed36a5213296212581d90a07d32180c2dbef9ba;hp=cc66613ff52f0495f2a99e8280e904bb830e06ab;hb=d6c65d287166c3105ece4a5e3f3ec7af5a5f26a3;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/base/lib_scanw.c b/ncurses/base/lib_scanw.c
index cc66613f..1ed36a52 100644
--- a/ncurses/base/lib_scanw.c
+++ b/ncurses/base/lib_scanw.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 1998-2009,2011 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -31,8 +32,6 @@
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
  ****************************************************************************/
 
-
-
 /*
 **	lib_scanw.c
 **
@@ -42,70 +41,86 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_scanw.c,v 1.8 1998/04/11 22:54:18 tom Exp $")
+MODULE_ID("$Id: lib_scanw.c,v 1.19 2020/02/02 23:34:34 tom Exp $")
+
+NCURSES_EXPORT(int)
+vwscanw(WINDOW *win, const char *fmt, va_list argp)
+{
+    char buf[BUFSIZ];
+    int code = ERR;
+
+    if (wgetnstr(win, buf, (int) sizeof(buf) - 1) != ERR) {
+	if ((code = vsscanf(buf, fmt, argp)) == EOF) {
+	    code = ERR;
+	}
+    }
 
-#if !HAVE_VSSCANF
-#if defined(__QNX__)
-extern int vsscanf(const char *str, const char *format, __va_list __arg);
-#else
-extern int vsscanf(const char *str, const char *format, ...);
-#endif
-#endif
+    return code;
+}
 
-int vwscanw(WINDOW *win, NCURSES_CONST char *fmt, va_list argp)
+NCURSES_EXPORT(int)
+vw_scanw(WINDOW *win, const char *fmt, va_list argp)
 {
-char buf[BUFSIZ];
+    char buf[BUFSIZ];
+    int code = ERR;
 
-	if (wgetnstr(win, buf, sizeof(buf)-1) == ERR)
-	    return(ERR);
+    if (wgetnstr(win, buf, (int) sizeof(buf) - 1) != ERR) {
+	if ((code = vsscanf(buf, fmt, argp)) == EOF) {
+	    code = ERR;
+	}
+    }
 
-	return(vsscanf(buf, fmt, argp));
+    return code;
 }
 
-int scanw(NCURSES_CONST char *fmt, ...)
+NCURSES_EXPORT(int)
+scanw(const char *fmt, ...)
 {
-int code;
-va_list ap;
+    int code;
+    va_list ap;
 
-	T(("scanw(\"%s\",...) called", fmt));
+    T(("scanw(\"%s\",...) called", fmt));
 
-	va_start(ap, fmt);
-	code = vwscanw(stdscr, fmt, ap);
-	va_end(ap);
-	return (code);
+    va_start(ap, fmt);
+    code = vw_scanw(stdscr, fmt, ap);
+    va_end(ap);
+    return (code);
 }
 
-int wscanw(WINDOW *win, NCURSES_CONST char *fmt, ...)
+NCURSES_EXPORT(int)
+wscanw(WINDOW *win, const char *fmt, ...)
 {
-int code;
-va_list ap;
+    int code;
+    va_list ap;
 
-	T(("wscanw(%p,\"%s\",...) called", win, fmt));
+    T(("wscanw(%p,\"%s\",...) called", (void *) win, fmt));
 
-	va_start(ap, fmt);
-	code = vwscanw(win, fmt, ap);
-	va_end(ap);
-	return (code);
+    va_start(ap, fmt);
+    code = vw_scanw(win, fmt, ap);
+    va_end(ap);
+    return (code);
 }
 
-int mvscanw(int y, int x, NCURSES_CONST char *fmt, ...)
+NCURSES_EXPORT(int)
+mvscanw(int y, int x, const char *fmt, ...)
 {
-int code;
-va_list ap;
+    int code;
+    va_list ap;
 
-	va_start(ap, fmt);
-	code = (move(y, x) == OK) ? vwscanw(stdscr, fmt, ap) : ERR;
-	va_end(ap);
-	return (code);
+    va_start(ap, fmt);
+    code = (move(y, x) == OK) ? vw_scanw(stdscr, fmt, ap) : ERR;
+    va_end(ap);
+    return (code);
 }
 
-int mvwscanw(WINDOW *win, int y, int x, NCURSES_CONST char *fmt, ...)
+NCURSES_EXPORT(int)
+mvwscanw(WINDOW *win, int y, int x, const char *fmt, ...)
 {
-int code;
-va_list ap;
+    int code;
+    va_list ap;
 
-	va_start(ap, fmt);
-	code = (wmove(win, y, x) == OK) ? vwscanw(win, fmt, ap) : ERR;
-	va_end(ap);
-	return (code);
+    va_start(ap, fmt);
+    code = (wmove(win, y, x) == OK) ? vw_scanw(win, fmt, ap) : ERR;
+    va_end(ap);
+    return (code);
 }