diff options
| author | ksss <[email protected]> | 2014-03-24 23:05:44 +0900 |
|---|---|---|
| committer | ksss <[email protected]> | 2014-03-24 23:05:44 +0900 |
| commit | e6e462c07dfa9b3bb787793e899af52648309faa (patch) | |
| tree | fcfde76d4ccb17f9356286c6c68bcf06028d09a0 /src/string.c | |
| parent | c326ab877e8e9d04b672d14b37c7d5fa96d04e7b (diff) | |
| download | mruby-e6e462c07dfa9b3bb787793e899af52648309faa.tar.gz mruby-e6e462c07dfa9b3bb787793e899af52648309faa.zip | |
src/string.c RESIZE_CAPA use safe name variables
This has a possibility of naming conflicts
Diffstat (limited to 'src/string.c')
| -rw-r--r-- | src/string.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/string.c b/src/string.c index 648363a45..1fd43aa2e 100644 --- a/src/string.c +++ b/src/string.c @@ -72,12 +72,12 @@ mrb_str_strlen(mrb_state *mrb, struct RString *s) #define RESIZE_CAPA(s,capacity) do {\ if (STR_EMBED_P(s)) {\ if (RSTRING_EMBED_LEN_MAX < (capacity)) {\ - char *const tmp = (char *)mrb_malloc(mrb, (capacity)+1);\ - const mrb_int len = STR_EMBED_LEN(s);\ - memcpy(tmp, s->as.ary, len);\ + char *const __tmp__ = (char *)mrb_malloc(mrb, (capacity)+1);\ + const mrb_int __len__ = STR_EMBED_LEN(s);\ + memcpy(__tmp__, s->as.ary, __len__);\ STR_UNSET_EMBED_FLAG(s);\ - s->as.heap.ptr = tmp;\ - s->as.heap.len = len;\ + s->as.heap.ptr = __tmp__;\ + s->as.heap.len = __len__;\ s->as.heap.aux.capa = (capacity);\ }\ } else {\ |