diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-04-28 02:10:51 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-04-28 02:10:51 +0000 |
| commit | fb7c7d1e7959954d8e0d84958d8f1a3d44f9c188 () | |
| tree | 9b06d5ff21a6537c82e32ad38c82e03a0c314f49 | |
| parent | cd9463849a05ec42a59e9db65199ece9d5e75a7e (diff) | |
sprintf.c: format by utility functions
* sprintf.c (rb_str_format, fmt_setup): format by utility functions in vsnprintf.c instead of `snprintf`. * sprintf.c (rb_str_format): format and append by `rb_str_catf` instead of formatting by `snprintf` and then copy. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | sprintf.c | 76 |
1 files changed, 38 insertions, 38 deletions
@@ -23,7 +23,8 @@ #define BIT_DIGITS(N) (((N)*146)/485 + 1) /* log2(10) =~ 146/485 */ -static void fmt_setup(char*,size_t,int,int,int,int); static char sign_bits(int base, const char *p) @@ -938,9 +939,8 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) sc = ' '; width--; } - snprintf(nbuf, sizeof(nbuf), "%ld", v); - s = nbuf; - len = (int)strlen(s); } else { tmp = rb_big2str(val, 10); @@ -1122,12 +1122,11 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) { VALUE val = GETARG(); double fval; - int i, need; - char fbuf[32]; fval = RFLOAT_VALUE(rb_Float(val)); if (isnan(fval) || isinf(fval)) { const char *expr; int elen; char sign = '\0'; @@ -1162,23 +1161,16 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) } break; } - - fmt_setup(fbuf, sizeof(fbuf), *p, flags, width, prec); - need = 0; - if (*p != 'e' && *p != 'E') { - i = INT_MIN; - frexp(fval, &i); - if (i > 0) - need = BIT_DIGITS(i); } - need += (flags&FPREC) ? prec : default_float_precision; - if ((flags&FWIDTH) && need < width) - need = width; - need += 20; - - CHECK(need); - snprintf(&buf[blen], need, fbuf, fval); - blen += strlen(&buf[blen]); } break; } @@ -1200,29 +1192,29 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt) return result; } -static void fmt_setup(char *buf, size_t size, int c, int flags, int width, int prec) { - char *end = buf + size; - *buf++ = '%'; - if (flags & FSHARP) *buf++ = '#'; - if (flags & FPLUS) *buf++ = '+'; - if (flags & FMINUS) *buf++ = '-'; - if (flags & FZERO) *buf++ = '0'; - if (flags & FSPACE) *buf++ = ' '; - if (flags & FWIDTH) { - snprintf(buf, end - buf, "%d", width); - buf += strlen(buf); } - if (flags & FPREC) { - snprintf(buf, end - buf, ".%d", prec); - buf += strlen(buf); } - *buf++ = c; - *buf = '\0'; } #undef FILE @@ -1255,6 +1247,14 @@ fmt_setup(char *buf, size_t size, int c, int flags, int width, int prec) #define upper_hexdigits (ruby_hexdigits+16) #include "vsnprintf.c" int ruby_vsnprintf(char *str, size_t n, const char *fmt, va_list ap) { |