diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-06-27 15:22:08 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-06-27 15:22:08 +0900 |
| commit | 3de0a625225968faa301feabaddef96b38025e2c (patch) | |
| tree | 7fcc62b683f6bfdb0011d6ab45513ade5e6285ed /src/error.c | |
| parent | 0a88499f32f38b5608d50da59fc7d22132767c0d (diff) | |
| parent | 50f38a7df33e8814cb7333310cfecceb6adde14d (diff) | |
| download | mruby-3de0a625225968faa301feabaddef96b38025e2c.tar.gz mruby-3de0a625225968faa301feabaddef96b38025e2c.zip | |
resolve conflict in class.c
Diffstat (limited to 'src/error.c')
| -rw-r--r-- | src/error.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/error.c b/src/error.c index 1183d8643..e46e37cbb 100644 --- a/src/error.c +++ b/src/error.c @@ -180,7 +180,7 @@ mrb_raise(mrb_state *mrb, struct RClass *c, const char *fmt, ...) int n; va_start(args, fmt); - n = vsnprintf(buf, 256, fmt, args); + n = vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); if (n < 0) { n = 0; @@ -197,7 +197,7 @@ mrb_name_error(mrb_state *mrb, mrb_sym id, const char *fmt, ...) int n; va_start(args, fmt); - n = vsnprintf(buf, 256, fmt, args); + n = vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); if (n < 0) { n = 0; @@ -216,7 +216,7 @@ mrb_sprintf(mrb_state *mrb, const char *fmt, ...) int n; va_start(args, fmt); - n = vsnprintf(buf, 256, fmt, args); + n = vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); if (n < 0) { n = 0; |