Revert this:

	* scanf/sscanffuns.c (scan): Take varargs per gmp_doscan_scan_t, to
	avoid any possible problems with a varargs call to a fixargs function.

vsscanf is not available everywhere, need another approach.

1 files changed, 2 insertions, 28 deletions

diff --git a/scanf/sscanffuns.c b/scanf/sscanffuns.c
index f5dff8385..9152c1cc9 100644
--- a/scanf/sscanffuns.c
+++ b/scanf/sscanffuns.c
@@ -27,37 +27,11 @@ MA 02111-1307, USA. */
 #include "gmp.h"
 #include "gmp-impl.h"
 
-#if HAVE_STDARG
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
 
 static int
-#if HAVE_STDARG
-scan (const char **sp, const char *fmt, ...)
-#else
-scan (va_alist)
-     va_dcl
-#endif
+scan (const char **sp, const char *fmt, void *p1, void *p2)
 {
-  va_list  ap;
-  int      ret;
-#if HAVE_STDARG
-  va_start (ap, fmt);
-#else
-  const char **sp;
-  const char *fmt;
-  va_start (ap);
-  sp = va_arg (ap, const char **);
-  fmt = va_arg (ap, const char *);
-#endif
-
-  ret = vsscanf (*sp, fmt, ap);
-
-  va_end (ap);
-  return ret;
+  return sscanf (*sp, fmt, p1, p2);
 }
 
 static void