[Mingw-w64-public] [PATCH 04/11] crt: Use _CRT_INTERNAL_LOCAL_SCANF_OPTIONS in non-inline scanf functions

[Martin Storsjö]

Now that these options can be set globally (within an executable),
we should honor it within the non-inline functions as well.

Signed-off-by: Martin Storsjö <mar...@martin.st>
---
 mingw-w64-crt/stdio/ucrt__snscanf.c | 2 +-
 mingw-w64-crt/stdio/ucrt_fscanf.c   | 2 +-
 mingw-w64-crt/stdio/ucrt_scanf.c    | 2 +-
 mingw-w64-crt/stdio/ucrt_sscanf.c   | 2 +-
 mingw-w64-crt/stdio/ucrt_vfscanf.c  | 2 +-
 mingw-w64-crt/stdio/ucrt_vscanf.c   | 2 +-
 mingw-w64-crt/stdio/ucrt_vsscanf.c  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mingw-w64-crt/stdio/ucrt__snscanf.c 
b/mingw-w64-crt/stdio/ucrt__snscanf.c
index 341b0e5ad..cef3c03d9 100644
--- a/mingw-w64-crt/stdio/ucrt__snscanf.c
+++ b/mingw-w64-crt/stdio/ucrt__snscanf.c
@@ -14,7 +14,7 @@ int __cdecl _snscanf(const char * __restrict__ _Src, size_t 
_MaxCount, const cha
   int ret;
   va_list _ArgList;
   va_start(_ArgList, _Format);
-  ret = __stdio_common_vsscanf(0, _Src, _MaxCount, _Format, NULL, _ArgList);
+  ret = __stdio_common_vsscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _Src, 
_MaxCount, _Format, NULL, _ArgList);
   va_end(_ArgList);
   return ret;
 }
diff --git a/mingw-w64-crt/stdio/ucrt_fscanf.c 
b/mingw-w64-crt/stdio/ucrt_fscanf.c
index 4b013f0a7..511f297ae 100644
--- a/mingw-w64-crt/stdio/ucrt_fscanf.c
+++ b/mingw-w64-crt/stdio/ucrt_fscanf.c
@@ -12,7 +12,7 @@ int __cdecl fscanf(FILE * __restrict__ _File,const char * 
__restrict__ _Format,.
   __builtin_va_list __ap;
   int __ret;
   __builtin_va_start(__ap, _Format);
-  __ret = __stdio_common_vfscanf(0, _File, _Format, NULL, __ap);
+  __ret = __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _File, 
_Format, NULL, __ap);
   __builtin_va_end(__ap);
   return __ret;
 }
diff --git a/mingw-w64-crt/stdio/ucrt_scanf.c b/mingw-w64-crt/stdio/ucrt_scanf.c
index 0e5035d15..eca475879 100644
--- a/mingw-w64-crt/stdio/ucrt_scanf.c
+++ b/mingw-w64-crt/stdio/ucrt_scanf.c
@@ -12,7 +12,7 @@ int __cdecl scanf(const char * __restrict__ _Format,...) {
   __builtin_va_list __ap;
   int __ret;
   __builtin_va_start(__ap, _Format);
-  __ret = __stdio_common_vfscanf(0, stdin, _Format, NULL, __ap);
+  __ret = __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, 
_Format, NULL, __ap);
   __builtin_va_end(__ap);
   return __ret;
 }
diff --git a/mingw-w64-crt/stdio/ucrt_sscanf.c 
b/mingw-w64-crt/stdio/ucrt_sscanf.c
index eb87379c4..5c7c202c4 100644
--- a/mingw-w64-crt/stdio/ucrt_sscanf.c
+++ b/mingw-w64-crt/stdio/ucrt_sscanf.c
@@ -12,7 +12,7 @@ int __cdecl sscanf(const char * __restrict__ _Src,const char 
* __restrict__ _For
   __builtin_va_list __ap;
   int __ret;
   __builtin_va_start(__ap, _Format);
-  __ret = __stdio_common_vsscanf(0, _Src, (size_t)-1, _Format, NULL, __ap);
+  __ret = __stdio_common_vsscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, _Src, 
(size_t)-1, _Format, NULL, __ap);
   __builtin_va_end(__ap);
   return __ret;
 }
diff --git a/mingw-w64-crt/stdio/ucrt_vfscanf.c 
b/mingw-w64-crt/stdio/ucrt_vfscanf.c
index 8d1a76a8b..288c77aa4 100644
--- a/mingw-w64-crt/stdio/ucrt_vfscanf.c
+++ b/mingw-w64-crt/stdio/ucrt_vfscanf.c
@@ -9,6 +9,6 @@
 #include <stdio.h>
 
 int __cdecl vfscanf (FILE *__stream,  const char *__format, __builtin_va_list 
__local_argv) {
-  return __stdio_common_vfscanf(0, __stream, __format, NULL, __local_argv);
+  return __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, __stream, 
__format, NULL, __local_argv);
 }
 int __cdecl (*__MINGW_IMP_SYMBOL(vfscanf))(FILE *, const char *, 
__builtin_va_list) = vfscanf;
diff --git a/mingw-w64-crt/stdio/ucrt_vscanf.c 
b/mingw-w64-crt/stdio/ucrt_vscanf.c
index fc5ae1b1e..7c9c92a2b 100644
--- a/mingw-w64-crt/stdio/ucrt_vscanf.c
+++ b/mingw-w64-crt/stdio/ucrt_vscanf.c
@@ -9,6 +9,6 @@
 #include <stdio.h>
 
 int __cdecl vscanf(const char *__format, __builtin_va_list __local_argv) {
-  return __stdio_common_vfscanf(0, stdin, __format, NULL, __local_argv);
+  return __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, 
__format, NULL, __local_argv);
 }
 int __cdecl (*__MINGW_IMP_SYMBOL(vscanf))(const char *, __builtin_va_list) = 
vscanf;
diff --git a/mingw-w64-crt/stdio/ucrt_vsscanf.c 
b/mingw-w64-crt/stdio/ucrt_vsscanf.c
index 1fb76fcf1..bbb901643 100644
--- a/mingw-w64-crt/stdio/ucrt_vsscanf.c
+++ b/mingw-w64-crt/stdio/ucrt_vsscanf.c
@@ -9,6 +9,6 @@
 #include <stdio.h>
 
 int __cdecl vsscanf (const char * __restrict__ __source, const char * 
__restrict__ __format, __builtin_va_list __local_argv) {
-  return __stdio_common_vsscanf(0, __source, (size_t)-1, __format, NULL, 
__local_argv);
+  return __stdio_common_vsscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, __source, 
(size_t)-1, __format, NULL, __local_argv);
 }
 int __cdecl (*__MINGW_IMP_SYMBOL(vsscanf))(const char *__restrict, const char 
*__restrict__, __builtin_va_list) = vsscanf;
-- 
2.43.0



_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public