get rid of shadowing variables (mrbgems)

Mostly renaming, except that the definition of struct accessor methods
is now done in a new function.

1 files changed, 7 insertions, 7 deletions

diff --git a/mrbgems/mruby-sprintf/src/sprintf.c b/mrbgems/mruby-sprintf/src/sprintf.c
index 3fce60237..f7a4c4b55 100644
--- a/mrbgems/mruby-sprintf/src/sprintf.c
+++ b/mrbgems/mruby-sprintf/src/sprintf.c
@@ -664,23 +664,23 @@ retry:
 
       case 'c': {
         mrb_value val = GETARG();
-        mrb_value tmp;
+        mrb_value ctmp;
         char *c;
 
-        tmp = mrb_check_string_type(mrb, val);
-        if (!mrb_nil_p(tmp)) {
-          if (mrb_fixnum(mrb_funcall(mrb, tmp, "size", 0)) != 1 ) {
+        ctmp = mrb_check_string_type(mrb, val);
+        if (!mrb_nil_p(ctmp)) {
+          if (mrb_fixnum(mrb_funcall(mrb, ctmp, "size", 0)) != 1 ) {
             mrb_raise(mrb, E_ARGUMENT_ERROR, "%c requires a character");
           }
         }
         else if (mrb_fixnum_p(val)) {
-          tmp = mrb_funcall(mrb, val, "chr", 0);
+          ctmp = mrb_funcall(mrb, val, "chr", 0);
         }
         else {
           mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid character");
         }
-        c = RSTRING_PTR(tmp);
-        n = RSTRING_LEN(tmp);
+        c = RSTRING_PTR(ctmp);
+        n = RSTRING_LEN(ctmp);
         if (!(flags & FWIDTH)) {
           CHECK(n);
           memcpy(buf+blen, c, n);