1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extract common code from rb_enc_vsprintf and rb_str_vcatf

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2022-08-17 17:39:40 +09:00
parent 72adee6e36
commit ddb81b9307
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
1 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
sprintf.c
View File

@ -1145,17 +1145,35 @@ ruby__sfvextra(rb_printf_buffer *fp, size_t valsize, void *valp, long *sz, int s
return cp;
}
VALUE
rb_enc_vsprintf(rb_encoding *enc, const char *fmt, va_list ap)
static void
ruby_vsprintf0(VALUE result, char *p, const char *fmt, va_list ap)
{
rb_printf_buffer_extra buffer;
#define f buffer.base
VALUE result;
VALUE klass = RBASIC(result)->klass;
f._flags = __SWR | __SSTR;
f._bf._size = 0;
f._w = 120;
result = rb_str_buf_new(f._w);
f._w = rb_str_capacity(result);
f._bf._base = (unsigned char *)result;
f._p = (unsigned char *)p;
RBASIC_CLEAR_CLASS(result);
f.vwrite = ruby__sfvwrite;
f.vextra = ruby__sfvextra;
buffer.value = 0;
BSD_vfprintf(&f, fmt, ap);
RBASIC_SET_CLASS_RAW(result, klass);
rb_str_resize(result, (char *)f._p - RSTRING_PTR(result));
#undef f
}
VALUE
rb_enc_vsprintf(rb_encoding *enc, const char *fmt, va_list ap)
{
const int initial_len = 120;
VALUE result;
result = rb_str_buf_new(initial_len);
if (enc) {
if (rb_enc_mbminlen(enc) > 1) {
/* the implementation deeply depends on plain char */
@ -1164,16 +1182,7 @@ rb_enc_vsprintf(rb_encoding *enc, const char *fmt, va_list ap)
}
rb_enc_associate(result, enc);
}
f._bf._base = (unsigned char *)result;
f._p = (unsigned char *)RSTRING_PTR(result);
RBASIC_CLEAR_CLASS(result);
f.vwrite = ruby__sfvwrite;
f.vextra = ruby__sfvextra;
buffer.value = 0;
BSD_vfprintf(&f, fmt, ap);
RBASIC_SET_CLASS_RAW(result, rb_cString);
rb_str_resize(result, (char *)f._p - RSTRING_PTR(result));
#undef f
ruby_vsprintf0(result, RSTRING_PTR(result), fmt, ap);
return result;
}
@ -1213,26 +1222,9 @@ rb_sprintf(const char *format, ...)
VALUE
rb_str_vcatf(VALUE str, const char *fmt, va_list ap)
{
rb_printf_buffer_extra buffer;
#define f buffer.base
VALUE klass;
StringValue(str);
rb_str_modify(str);
f._flags = __SWR | __SSTR;
f._bf._size = 0;
f._w = rb_str_capacity(str);
f._bf._base = (unsigned char *)str;
f._p = (unsigned char *)RSTRING_END(str);
klass = RBASIC(str)->klass;
RBASIC_CLEAR_CLASS(str);
f.vwrite = ruby__sfvwrite;
f.vextra = ruby__sfvextra;
buffer.value = 0;
BSD_vfprintf(&f, fmt, ap);
RBASIC_SET_CLASS_RAW(str, klass);
rb_str_resize(str, (char *)f._p - RSTRING_PTR(str));
#undef f
ruby_vsprintf0(str, RSTRING_END(str), fmt, ap);
return str;
}