Some corrections for v scanf methods. But they seem to be broken here. I have to rethink this issue completly.



git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@291 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-crt/stdio/vscanf.c b/mingw-w64-crt/stdio/vscanf.c
index a97a18c..4635b4b 100644
--- a/mingw-w64-crt/stdio/vscanf.c
+++ b/mingw-w64-crt/stdio/vscanf.c
@@ -9,6 +9,7 @@
 #include <stdarg.h>

 #include <stdio.h>

 

-int vscanf(const char * __restrict__ format, va_list arg) {

+int vscanf(const char * __restrict__ format, va_list arg)

+{

   return vfscanf(stdin, format, arg);

 }

diff --git a/mingw-w64-crt/stdio/vsnprintf.c b/mingw-w64-crt/stdio/vsnprintf.c
index 4dfa494..3f73d1b 100644
--- a/mingw-w64-crt/stdio/vsnprintf.c
+++ b/mingw-w64-crt/stdio/vsnprintf.c
@@ -7,4 +7,6 @@
 #include <stdio.h>

 

 int vsnprintf (char* s, size_t n, const char* format, va_list arg)

-  { return _vsnprintf ( s, n, format, arg); }

+{

+    return _vsnprintf(s, n, format, arg);

+}

diff --git a/mingw-w64-crt/stdio/vsnwprintf.c b/mingw-w64-crt/stdio/vsnwprintf.c
index f61e9e5..2cdfc08 100644
--- a/mingw-w64-crt/stdio/vsnwprintf.c
+++ b/mingw-w64-crt/stdio/vsnwprintf.c
@@ -8,4 +8,6 @@
 #include <wchar.h>

 

 int  vsnwprintf(wchar_t *buffer,  size_t n, const wchar_t * format, va_list argptr)

-  { return _vsnwprintf( buffer, n, format, argptr );}

+{

+    return _vsnwprintf(buffer, n, format, argptr);

+}

diff --git a/mingw-w64-crt/stdio/vswscanf.c b/mingw-w64-crt/stdio/vswscanf.c
index 5eadefb..56cf91c 100644
--- a/mingw-w64-crt/stdio/vswscanf.c
+++ b/mingw-w64-crt/stdio/vswscanf.c
@@ -11,7 +11,8 @@
 

 

 int vswscanf(const wchar_t * __restrict__ s, const wchar_t * __restrict__ format,

-  va_list arg) {

+  va_list arg)

+{

   int ret;

 

 #ifdef _WIN64

@@ -19,7 +20,7 @@
 

     // allocate stack (esp += frame - arg3 - (8[arg1,2] + 12))

     "movq	%%rsp, %%r10\n\t"

-    "lea	0xFFFFFFD8(%%rsp, %6), %%rsp\n\t"

+    "lea	0xFFFFFFFFFFFFFFD8(%%rsp, %6), %%rsp\n\t"

     "subq	%5, %%rsp\n\t"

 

     // set up stack

diff --git a/mingw-w64-crt/stdio/vwscanf.c b/mingw-w64-crt/stdio/vwscanf.c
index 104046c..4911fc2 100644
--- a/mingw-w64-crt/stdio/vwscanf.c
+++ b/mingw-w64-crt/stdio/vwscanf.c
@@ -10,6 +10,7 @@
 #include <wchar.h>

 #include <stdio.h>

 

-int vwscanf(const wchar_t * __restrict__ format, va_list arg) {

+int vwscanf(const wchar_t * __restrict__ format, va_list arg)

+{

   return vfwscanf(stdin, format, arg);

 }