summaryrefslogtreecommitdiffhomepage
path: root/src/error.c
diff options
context:
space:
mode:
authorKOBAYASHI Shuji <[email protected]>2019-08-03 17:46:11 +0900
committerKOBAYASHI Shuji <[email protected]>2019-08-03 19:42:22 +0900
commit1e9cb74cc6dd2fbe1b68edf3b73c7acfe7fc7831 (patch)
tree8903a53a20fe88193d02ea36f2ece483b7805528 /src/error.c
parentf6c41c186200e54eaf5d25d301d945570a829f55 (diff)
downloadmruby-1e9cb74cc6dd2fbe1b68edf3b73c7acfe7fc7831.tar.gz
mruby-1e9cb74cc6dd2fbe1b68edf3b73c7acfe7fc7831.zip
Change second argument to `%l` of `mrb_vformat()` to `size_t` from `mrb_int`
- `size_t` is more commonly used. - `len` argument of `mrb_str_new()` is `size_t`. NOTE: The test for `%l` is temporarily disabled because adding a new type to `mrbgems/mruby-test/vformat.c` causes an error (memory error?) on Visual Studio 2017 in AppVeyor.
Diffstat (limited to 'src/error.c')
-rw-r--r--src/error.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/error.c b/src/error.c
index 3ee137c95..0ca7f5917 100644
--- a/src/error.c
+++ b/src/error.c
@@ -285,7 +285,7 @@ mrb_raise(mrb_state *mrb, struct RClass *c, const char *msg)
* d | int |
* f | mrb_float |
* i | mrb_int |
- * l | char*, mrb_int | Arguments are string and length.
+ * l | char*, size_t | Arguments are string and length.
* n | mrb_sym |
* s | char* | Argument is NUL terminated string.
* t | mrb_value | Convert to type (class) of object.
@@ -303,8 +303,9 @@ mrb_vformat(mrb_state *mrb, const char *format, va_list ap)
{
const char *chars, *p = format, *b = format, *e;
char ch;
+ size_t len;
+ mrb_int i;
struct RClass *cls;
- mrb_int len, i;
mrb_bool inspect = FALSE;
mrb_value result = mrb_str_new_capa(mrb, 128), obj, str;
int ai = mrb_gc_arena_save(mrb);
@@ -335,7 +336,7 @@ mrb_vformat(mrb_state *mrb, const char *format, va_list ap)
#endif
case 'l':
chars = va_arg(ap, char*);
- len = va_arg(ap, mrb_int);
+ len = va_arg(ap, size_t);
L_cat:
if (inspect) {
obj = mrb_str_new(mrb, chars, len);