From f3c10487562b2a85534ffaf050e739169491abe7 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Thu, 13 Jun 2013 09:51:09 +0900 Subject: fix indent --- src/array.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/array.c b/src/array.c index 4e662d6e4..92359b033 100644 --- a/src/array.c +++ b/src/array.c @@ -1168,7 +1168,7 @@ mrb_init_array(mrb_state *mrb) mrb_define_method(mrb, a, "unshift", mrb_ary_unshift_m, MRB_ARGS_ANY()); /* 15.2.12.5.30 */ mrb_define_method(mrb, a, "inspect", mrb_ary_inspect, MRB_ARGS_NONE()); /* 15.2.12.5.31 (x) */ - mrb_define_alias(mrb, a, "to_s", "inspect"); /* 15.2.12.5.32 (x) */ + mrb_define_alias(mrb, a, "to_s", "inspect"); /* 15.2.12.5.32 (x) */ mrb_define_method(mrb, a, "==", mrb_ary_equal, MRB_ARGS_REQ(1)); /* 15.2.12.5.33 (x) */ mrb_define_method(mrb, a, "eql?", mrb_ary_eql, MRB_ARGS_REQ(1)); /* 15.2.12.5.34 (x) */ mrb_define_method(mrb, a, "<=>", mrb_ary_cmp, MRB_ARGS_REQ(1)); /* 15.2.12.5.36 (x) */ -- cgit v1.2.3 From cb057639289ff75b760a8c0b01dcc143b22ea804 Mon Sep 17 00:00:00 2001 From: kyab Date: Thu, 20 Jun 2013 18:00:10 +0900 Subject: Fix compile warning for abort --- src/gc.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/gc.c b/src/gc.c index 293fbf948..3e33c052c 100644 --- a/src/gc.c +++ b/src/gc.c @@ -11,6 +11,7 @@ # include #endif #include +#include #include "mruby.h" #include "mruby/array.h" #include "mruby/class.h" -- cgit v1.2.3 From 967c9cff2b236b38e78b35bfeef1c1799744245c Mon Sep 17 00:00:00 2001 From: cubicdaiya Date: Fri, 21 Jun 2013 09:53:10 +0900 Subject: make mrb_str_new_cstr DRY Using str_new eliminates duplicated codes in mrb_str_new_cstr. --- src/string.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src') diff --git a/src/string.c b/src/string.c index 77f81ecc6..a2e8f155d 100644 --- a/src/string.c +++ b/src/string.c @@ -261,14 +261,7 @@ mrb_str_new_cstr(mrb_state *mrb, const char *p) len = 0; } - s = mrb_obj_alloc_string(mrb); - s->ptr = (char *)mrb_malloc(mrb, len+1); - if (p) { - memcpy(s->ptr, p, len); - } - s->ptr[len] = 0; - s->len = (mrb_int)len; - s->aux.capa = (mrb_int)len; + s = str_new(mrb, p, len); return mrb_obj_value(s); } -- cgit v1.2.3 From e4ae05ed9ba49342507da080ae0e95fd6be4fc3c Mon Sep 17 00:00:00 2001 From: Masaki Muranaka Date: Fri, 21 Jun 2013 16:06:35 +0900 Subject: Cleanup mrb_str_resize(). --- src/string.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/string.c b/src/string.c index a2e8f155d..328266df9 100644 --- a/src/string.c +++ b/src/string.c @@ -104,10 +104,9 @@ mrb_str_resize(mrb_state *mrb, mrb_value str, mrb_int len) mrb_str_modify(mrb, s); slen = s->len; if (len != slen) { - if (slen < len || slen -len > 1024) { - s->ptr = (char *)mrb_realloc(mrb, s->ptr, len+1); + if (slen < len || slen - len > 256) { + RESIZE_CAPA(s, len); } - s->aux.capa = len; s->len = len; s->ptr[len] = '\0'; /* sentinel */ } -- cgit v1.2.3 From 31fbfb51dbcb18f4f8893aa03195ba050a722a29 Mon Sep 17 00:00:00 2001 From: kyab Date: Sat, 22 Jun 2013 03:55:49 +0900 Subject: Add fallback for allocate CRC buffer --- src/load.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/load.c b/src/load.c index 62010e425..e832de628 100644 --- a/src/load.c +++ b/src/load.c @@ -539,7 +539,9 @@ mrb_read_irep_file(mrb_state *mrb, FILE* fp) size_t sirep; struct rite_section_header section_header; long fpos; - const size_t block_size = 1 << 14; + size_t block_size = 1 << 14; + const uint8_t block_fallback_count = 4; + int i; const size_t buf_size = sizeof(struct rite_binary_header); if ((mrb == NULL) || (fp == NULL)) { @@ -564,7 +566,10 @@ mrb_read_irep_file(mrb_state *mrb, FILE* fp) /* verify CRC */ fpos = ftell(fp); /* You don't need use SIZE_ERROR as block_size is enough small. */ - buf = mrb_malloc(mrb, block_size); + for (i = 0; i < block_fallback_count; i++,block_size >>= 1){ + buf = mrb_malloc(mrb, block_size); + if (buf) break; + } if (!buf) { return MRB_DUMP_GENERAL_FAILURE; } -- cgit v1.2.3