* mingwex/snprintf.c: Split out vsnprintf to....

	* mingwex/vsnprintf.c: New file.
	* mingwex/snwprintf.c: Split out vsnwprintf to...
	* mingwex/vsnwprintf.c: New file.
	* mingwex/Makefile.in: Adjust DISTFILES and STDIO_STUB_OBJS.

5 files changed, 26 insertions, 21 deletions

diff --git a/winsup/mingw/mingwex/Makefile.in b/winsup/mingw/mingwex/Makefile.in
index 90306740338..72a9d1493a5 100644
--- a/winsup/mingw/mingwex/Makefile.in
+++ b/winsup/mingw/mingwex/Makefile.in
@@ -88,6 +88,8 @@ DISTFILES = Makefile.in configure configure.in \
 	trunc.c \
 	ulltoa.c \
 	ulltow.c \
+	vsnprintf.c \
+	vsnwprintf.c \
 	wcstof.c \
 	wcstoimax.c \
 	wcstoumax.c \
@@ -141,7 +143,7 @@ STDLIB_STUB_OBJS = \
 	strtof.o wcstof.o \
 	_Exit.o
 STDIO_STUB_OBJS = \
-	snprintf.o snwprintf.o
+	snprintf.o  vsnprintf.o snwprintf.o vsnwprintf.o
 MATH_OBJS = \
 	fpclassify.o fpclassifyf.o fpclassifyl.o \
 	fucom.o \
@@ -156,7 +158,6 @@ MATH_OBJS = \
 	fma.o  fmaf.o fmal.o \
 	log2.o log2f.o log2l.o  \
 	copysignl.o
-
 MATH_STUB_OBJS = \
 	math_stubs.o
 FENV_OBJS = fesetround.o  fegetround.o \
diff --git a/winsup/mingw/mingwex/snprintf.c b/winsup/mingw/mingwex/snprintf.c
index e533d5035ad..c8d2a7b2008 100644
--- a/winsup/mingw/mingwex/snprintf.c
+++ b/winsup/mingw/mingwex/snprintf.c
@@ -1,16 +1,13 @@
-#include <stdarg.h>

-#include <stdio.h>

-

-int snprintf(char* buffer, size_t n, const char* format, ...)

-{

-  int retval;

-  va_list argptr;

-         

-  va_start( argptr, format );

-  retval = _vsnprintf( buffer, n, format, argptr );

-  va_end( argptr );

-  return retval;

-}

-

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

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

+#include <stdarg.h>
+#include <stdio.h>
+
+int snprintf(char* buffer, size_t n, const char* format, ...)
+{
+  int retval;
+  va_list argptr;
+         
+  va_start( argptr, format );
+  retval = _vsnprintf( buffer, n, format, argptr );
+  va_end( argptr );
+  return retval;
+}
diff --git a/winsup/mingw/mingwex/snwprintf.c b/winsup/mingw/mingwex/snwprintf.c
index 51422bc4bb0..42b05b2928a 100644
--- a/winsup/mingw/mingwex/snwprintf.c
+++ b/winsup/mingw/mingwex/snwprintf.c
@@ -11,6 +11,3 @@ int  snwprintf(wchar_t* buffer, size_t n, const wchar_t* format, ...)
     va_end( argptr );
     return retval;
 }
-
-int  vsnwprintf(wchar_t *buffer,  size_t n, const wchar_t * format, va_list argptr)
-{ return _vsnwprintf( buffer, n, format, argptr );}
diff --git a/winsup/mingw/mingwex/vsnprintf.c b/winsup/mingw/mingwex/vsnprintf.c
new file mode 100644
index 00000000000..466e064e900
--- /dev/null
+++ b/winsup/mingw/mingwex/vsnprintf.c
@@ -0,0 +1,5 @@
+#include <stdarg.h>

+#include <stdio.h>

+

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

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

diff --git a/winsup/mingw/mingwex/vsnwprintf.c b/winsup/mingw/mingwex/vsnwprintf.c
new file mode 100644
index 00000000000..05a1ec9b02b
--- /dev/null
+++ b/winsup/mingw/mingwex/vsnwprintf.c
@@ -0,0 +1,5 @@
+#include <stdarg.h>

+#include <wchar.h>

+

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

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