* sprintf.c (rb_vsprintf, rb_sprintf): new functions return new String,

  using missing/vsnprintf.c.  [ruby-dev:26580]

*  missing/vsnprintf.c: made the output changeable.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 3 insertions, 7 deletions

diff --git a/win32/win32.c b/win32/win32.c
index 7345f3d2df..1839aeebb0 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3602,9 +3602,7 @@ rb_w32_utime(const char *path, struct utimbuf *times)
 int
 rb_w32_vsnprintf(char *buf, size_t size, const char *format, va_list va)
 {
-    int ret = _vsnprintf(buf, size, format, va);
-    if (size > 0) buf[size - 1] = 0;
-    return ret;
+    return vsnprintf(buf, size, format, va);
 }
 
 int
diff --git a/win32/win32.h b/win32/win32.h
index a347f04f7a..68d9c488c2 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -178,10 +178,8 @@ extern int    rb_w32_rename(const char *, const char *);
 extern char **rb_w32_get_environ(void);
 extern void   rb_w32_free_environ(char **);
 
-#define vsnprintf(s,n,f,l) rb_w32_vsnprintf(s,n,f,l)
-#define snprintf   rb_w32_snprintf
-extern int rb_w32_vsnprintf(char *, size_t, const char *, va_list);
-extern int rb_w32_snprintf(char *, size_t, const char *, ...);
+DEPRECATED(extern int rb_w32_vsnprintf(char *, size_t, const char *, va_list));
+DEPRECATED(extern int rb_w32_snprintf(char *, size_t, const char *, ...));
 
 extern int chown(const char *, int, int);
 extern int link(const char *, const char *);