From 4713cd9eb76bdac24201b6ef85cc3c372c393aff Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Wed, 1 Aug 2018 16:50:44 +0900
Subject: Simply use `snprintf` instead of custom `fmt_fp`,

Unless `MRB_DISABLE_STDIO` is set. `snprintf` is used anyway
if mruby is configured to use `stdio`. This change reduces 8KB
of program size on the Linux box.
---
 src/fmt_fp.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/fmt_fp.c')

diff --git a/src/fmt_fp.c b/src/fmt_fp.c
index f8a8f7904..783cc6c02 100644
--- a/src/fmt_fp.c
+++ b/src/fmt_fp.c
@@ -1,3 +1,5 @@
+#ifndef MRB_WITHOUT_FLOAT
+#ifdef MRB_DISABLE_STDIO
 /*
 
 Most code in this file originates from musl (src/stdio/vfprintf.c)
@@ -36,7 +38,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <mruby.h>
 #include <mruby/string.h>
 
-#ifndef MRB_WITHOUT_FLOAT
 struct fmt_args {
   mrb_state *mrb;
   mrb_value str;
@@ -371,4 +372,17 @@ mrb_float_to_str(mrb_state *mrb, mrb_value flo, const char *fmt)
   }
   return f.str;
 }
+#else   /* MRB_DISABLE_STDIO */
+#include <mruby.h>
+#include <stdio.h>
+
+mrb_value
+mrb_float_to_str(mrb_state *mrb, mrb_value flo, const char *fmt)
+{
+  char buf[24];
+
+  snprintf(buf, sizeof(buf), fmt, mrb_float(flo));
+  return mrb_str_new_cstr(mrb, buf);
+}
+#endif  /* MRB_DISABLE_STDIO */
 #endif
-- 
cgit v1.2.3


From 7d7f9feee7302ffabb04fa6ea9fb4e46db5682a2 Mon Sep 17 00:00:00 2001
From: Hiroshi Mimaki <hiroshi.mimaki@gmail.com>
Date: Wed, 7 Nov 2018 17:20:18 +0900
Subject: Wrong pool data length for negative floating value in a mrb file.

---
 src/fmt_fp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/fmt_fp.c')

diff --git a/src/fmt_fp.c b/src/fmt_fp.c
index 783cc6c02..7028d3aac 100644
--- a/src/fmt_fp.c
+++ b/src/fmt_fp.c
@@ -379,7 +379,7 @@ mrb_float_to_str(mrb_state *mrb, mrb_value flo, const char *fmt)
 mrb_value
 mrb_float_to_str(mrb_state *mrb, mrb_value flo, const char *fmt)
 {
-  char buf[24];
+  char buf[25];
 
   snprintf(buf, sizeof(buf), fmt, mrb_float(flo));
   return mrb_str_new_cstr(mrb, buf);
-- 
cgit v1.2.3


From 63b8f5cf5762dba08812210809fbf8e82c0aa7ab Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp>
Date: Fri, 15 Mar 2019 13:17:40 +0900
Subject: Use `fmt_fp()` for portable float representation.

---
 src/fmt_fp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/fmt_fp.c')

diff --git a/src/fmt_fp.c b/src/fmt_fp.c
index 7028d3aac..14c74ef9e 100644
--- a/src/fmt_fp.c
+++ b/src/fmt_fp.c
@@ -1,5 +1,5 @@
 #ifndef MRB_WITHOUT_FLOAT
-#ifdef MRB_DISABLE_STDIO
+#if defined(MRB_DISABLE_STDIO) || defined(_WIN32) || defined(_WIN64)
 /*
 
 Most code in this file originates from musl (src/stdio/vfprintf.c)
-- 
cgit v1.2.3


From 5e0caefa58bb0fae4174858abb3ba8cd7ccf7058 Mon Sep 17 00:00:00 2001
From: KOBAYASHI Shuji <shuujii@gmail.com>
Date: Wed, 3 Apr 2019 19:25:06 +0900
Subject: Modify `#else` and `#endif` annotations in `src/fmt_fp.c` [ci skip]

---
 src/fmt_fp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/fmt_fp.c')

diff --git a/src/fmt_fp.c b/src/fmt_fp.c
index 14c74ef9e..1f1af6764 100644
--- a/src/fmt_fp.c
+++ b/src/fmt_fp.c
@@ -372,7 +372,7 @@ mrb_float_to_str(mrb_state *mrb, mrb_value flo, const char *fmt)
   }
   return f.str;
 }
-#else   /* MRB_DISABLE_STDIO */
+#else   /* MRB_DISABLE_STDIO || _WIN32 || _WIN64 */
 #include <mruby.h>
 #include <stdio.h>
 
@@ -384,5 +384,5 @@ mrb_float_to_str(mrb_state *mrb, mrb_value flo, const char *fmt)
   snprintf(buf, sizeof(buf), fmt, mrb_float(flo));
   return mrb_str_new_cstr(mrb, buf);
 }
-#endif  /* MRB_DISABLE_STDIO */
+#endif  /* MRB_DISABLE_STDIO || _WIN32 || _WIN64 */
 #endif
-- 
cgit v1.2.3