diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-03-12 17:24:02 -0700 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-03-12 17:24:02 -0700 |
| commit | 7ba309600a26c14e799252ebb5bca6e556d7702e (patch) | |
| tree | 22bf6f159dad28995a2881be85cf601098456f8b | |
| parent | 2134d6b4273988c06eadeea737c8cd425550e572 (diff) | |
| parent | e2d31ba3f3b3bfd4cf39fe97636da5237e655f22 (diff) | |
| download | mruby-7ba309600a26c14e799252ebb5bca6e556d7702e.tar.gz mruby-7ba309600a26c14e799252ebb5bca6e556d7702e.zip | |
Merge pull request #982 from monaka/pr-make-MRB_STR_BUF_MIN_SIZE-configurable
Rename STR_BUF_MIN_SIZE to MRB_STR_BUF_MIN_SIZE. Make it configurable.
| -rw-r--r-- | include/mrbconf.h | 4 | ||||
| -rw-r--r-- | include/mruby/string.h | 2 | ||||
| -rw-r--r-- | src/string.c | 8 |
3 files changed, 10 insertions, 4 deletions
diff --git a/include/mrbconf.h b/include/mrbconf.h index 52490ceba..cabc10b4f 100644 --- a/include/mrbconf.h +++ b/include/mrbconf.h @@ -46,6 +46,10 @@ /* page size of memory pool */ //#define POOL_PAGE_SIZE 16000 +/* initial minimum size for string buffer */ +//#define MRB_STR_BUF_MIN_SIZE 128 + + /* -DDISABLE_XXXX to drop following features */ //#define DISABLE_STDIO /* use of stdio */ diff --git a/include/mruby/string.h b/include/mruby/string.h index 9e6de485d..850cb56db 100644 --- a/include/mruby/string.h +++ b/include/mruby/string.h @@ -13,8 +13,6 @@ extern "C" { #define IS_EVSTR(p,e) ((p) < (e) && (*(p) == '$' || *(p) == '@' || *(p) == '{')) -#define STR_BUF_MIN_SIZE 128 - extern const char mrb_digitmap[]; typedef struct mrb_shared_string { diff --git a/src/string.c b/src/string.c index d58886b38..465398b18 100644 --- a/src/string.c +++ b/src/string.c @@ -158,6 +158,10 @@ mrb_str_new_empty(mrb_state *mrb, mrb_value str) return mrb_obj_value(s); } +#ifndef MRB_STR_BUF_MIN_SIZE +# define MRB_STR_BUF_MIN_SIZE 128 +#endif + mrb_value mrb_str_buf_new(mrb_state *mrb, int capa) { @@ -165,8 +169,8 @@ mrb_str_buf_new(mrb_state *mrb, int capa) s = mrb_obj_alloc_string(mrb); - if (capa < STR_BUF_MIN_SIZE) { - capa = STR_BUF_MIN_SIZE; + if (capa < MRB_STR_BUF_MIN_SIZE) { + capa = MRB_STR_BUF_MIN_SIZE; } s->len = 0; s->aux.capa = capa; |
