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/codegen.c | |
| parent | 0a88499f32f38b5608d50da59fc7d22132767c0d (diff) | |
| parent | 50f38a7df33e8814cb7333310cfecceb6adde14d (diff) | |
| download | mruby-3de0a625225968faa301feabaddef96b38025e2c.tar.gz mruby-3de0a625225968faa301feabaddef96b38025e2c.zip | |
resolve conflict in class.c
Diffstat (limited to 'src/codegen.c')
| -rw-r--r-- | src/codegen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/codegen.c b/src/codegen.c index cbf401a1f..fb0006625 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -1537,7 +1537,7 @@ codegen(codegen_scope *s, node *tree, int val) int len; int sym; - len = snprintf(buf, 3, "$%c", (int)(intptr_t)tree); + len = snprintf(buf, sizeof(buf), "$%c", (int)(intptr_t)tree); sym = new_sym(s, mrb_intern2(s->mrb, buf, len)); genop(s, MKOP_ABx(OP_GETGLOBAL, cursp(), sym)); push(); @@ -1550,7 +1550,7 @@ codegen(codegen_scope *s, node *tree, int val) int len; int sym; - len = snprintf(buf, 3, "$%d", (int)(intptr_t)tree); + len = snprintf(buf, sizeof(buf), "$%d", (int)(intptr_t)tree); sym = new_sym(s, mrb_intern2(s->mrb, buf, len)); genop(s, MKOP_ABx(OP_GETGLOBAL, cursp(), sym)); push(); |
