diff options
Diffstat (limited to 'sprintf.c')
-rw-r--r-- | sprintf.c | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -444,6 +444,7 @@ rb_f_sprintf(argc, argv) long v = 0; int base, bignum = 0; int len, pos; + VALUE tmp; switch (*p) { case 'd': @@ -544,7 +545,7 @@ rb_f_sprintf(argc, argv) if (base == 10) { rb_warning("negative number for %%u specifier"); } - else if (!(flags&FPREC)) { + if (!(flags&(FPREC|FZERO))) { strcpy(s, ".."); s += 2; } @@ -571,8 +572,8 @@ rb_f_sprintf(argc, argv) } if (sign) { - val = rb_big2str(val, base); - s = RSTRING(val)->ptr; + tmp = rb_big2str(val, base); + s = RSTRING(tmp)->ptr; if (s[0] == '-') { s++; sc = '-'; @@ -592,8 +593,8 @@ rb_f_sprintf(argc, argv) val = rb_big_clone(val); rb_big_2comp(val); } - val = rb_big2str(val, base); - s = RSTRING(val)->ptr; + tmp = rb_big2str(val, base); + s = RSTRING(tmp)->ptr; if (*s == '-') { if (base == 10) { rb_warning("negative number for %%u specifier"); @@ -601,9 +602,9 @@ rb_f_sprintf(argc, argv) } else { remove_sign_bits(++s, base); - val = rb_str_new(0, 3+strlen(s)); - t = RSTRING(val)->ptr; - if (!(flags&FPREC)) { + tmp = rb_str_new(0, 3+strlen(s)); + t = RSTRING(tmp)->ptr; + if (!(flags&(FPREC|FZERO))) { strcpy(t, ".."); t += 2; } @@ -619,7 +620,7 @@ rb_f_sprintf(argc, argv) bignum = 2; } } - s = RSTRING(val)->ptr; + s = RSTRING(tmp)->ptr; format_integer: pos = -1; |