refactor MACRO to avoid local variable name conflict; ref #2585

1 files changed, 11 insertions, 11 deletions

diff --git a/mrbgems/mruby-sprintf/src/sprintf.c b/mrbgems/mruby-sprintf/src/sprintf.c
index f7a4c4b55..d88e242c6 100644
--- a/mrbgems/mruby-sprintf/src/sprintf.c
+++ b/mrbgems/mruby-sprintf/src/sprintf.c
@@ -178,17 +178,18 @@ mrb_fix2binstr(mrb_state *mrb, mrb_value x, int base)
   }
 
 #define GETASTER(num) do { \
+  mrb_value tmp_v; \
   t = p++; \
   n = 0; \
   GETNUM(n, val); \
   if (*p == '$') { \
-    tmp = GETPOSARG(n); \
+    tmp_v = GETPOSARG(n); \
   } \
   else { \
-    tmp = GETARG(); \
+    tmp_v = GETARG(); \
     p = t; \
   } \
-  num = mrb_fixnum(tmp); \
+  num = mrb_fixnum(tmp_v); \
 } while (0)
 
 static mrb_value
@@ -500,7 +501,6 @@ mrb_str_format(mrb_state *mrb, int argc, const mrb_value *argv, mrb_value fmt)
   int nextarg = 1;
   int posarg = 0;
   mrb_value nextvalue;
-  mrb_value tmp;
   mrb_value str;
   mrb_value hash = mrb_undef_value();
 
@@ -664,23 +664,23 @@ retry:
 
       case 'c': {
         mrb_value val = GETARG();
-        mrb_value ctmp;
+        mrb_value tmp;
         char *c;
 
-        ctmp = mrb_check_string_type(mrb, val);
-        if (!mrb_nil_p(ctmp)) {
-          if (mrb_fixnum(mrb_funcall(mrb, ctmp, "size", 0)) != 1 ) {
+        tmp = mrb_check_string_type(mrb, val);
+        if (!mrb_nil_p(tmp)) {
+          if (mrb_fixnum(mrb_funcall(mrb, tmp, "size", 0)) != 1 ) {
             mrb_raise(mrb, E_ARGUMENT_ERROR, "%c requires a character");
           }
         }
         else if (mrb_fixnum_p(val)) {
-          ctmp = mrb_funcall(mrb, val, "chr", 0);
+          tmp = mrb_funcall(mrb, val, "chr", 0);
         }
         else {
           mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid character");
         }
-        c = RSTRING_PTR(ctmp);
-        n = RSTRING_LEN(ctmp);
+        c = RSTRING_PTR(tmp);
+        n = RSTRING_LEN(tmp);
         if (!(flags & FWIDTH)) {
           CHECK(n);
           memcpy(buf+blen, c, n);