diff options
author | Mike Pall <mike> | 2014-12-20 00:17:50 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2014-12-20 00:17:50 +0100 |
commit | 6e9145a882ea70fe438d59959ac4e65481fe5e85 (patch) | |
tree | 98e7c78e5aab6bd0360d9e00e4c82e9f1634c96d /src/lj_buf.c | |
parent | 82e6e5fb5f17e497b3341322998ede75ec29e554 (diff) | |
download | luajit-6e9145a882ea70fe438d59959ac4e65481fe5e85.tar.gz luajit-6e9145a882ea70fe438d59959ac4e65481fe5e85.tar.bz2 luajit-6e9145a882ea70fe438d59959ac4e65481fe5e85.zip |
Cleanup of memory vs. GC sizes. No functional changes.
Diffstat (limited to 'src/lj_buf.c')
-rw-r--r-- | src/lj_buf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lj_buf.c b/src/lj_buf.c index 05ff1f51..05b35615 100644 --- a/src/lj_buf.c +++ b/src/lj_buf.c | |||
@@ -31,7 +31,7 @@ static void buf_grow(SBuf *sb, MSize sz) | |||
31 | LJ_NOINLINE char *LJ_FASTCALL lj_buf_need2(SBuf *sb, MSize sz) | 31 | LJ_NOINLINE char *LJ_FASTCALL lj_buf_need2(SBuf *sb, MSize sz) |
32 | { | 32 | { |
33 | lua_assert(sz > sbufsz(sb)); | 33 | lua_assert(sz > sbufsz(sb)); |
34 | if (LJ_UNLIKELY(sz > LJ_MAX_MEM)) | 34 | if (LJ_UNLIKELY(sz > LJ_MAX_BUF)) |
35 | lj_err_mem(sbufL(sb)); | 35 | lj_err_mem(sbufL(sb)); |
36 | buf_grow(sb, sz); | 36 | buf_grow(sb, sz); |
37 | return sbufB(sb); | 37 | return sbufB(sb); |
@@ -41,7 +41,7 @@ LJ_NOINLINE char *LJ_FASTCALL lj_buf_more2(SBuf *sb, MSize sz) | |||
41 | { | 41 | { |
42 | MSize len = sbuflen(sb); | 42 | MSize len = sbuflen(sb); |
43 | lua_assert(sz > sbufleft(sb)); | 43 | lua_assert(sz > sbufleft(sb)); |
44 | if (LJ_UNLIKELY(sz > LJ_MAX_MEM || len + sz > LJ_MAX_MEM)) | 44 | if (LJ_UNLIKELY(sz > LJ_MAX_BUF || len + sz > LJ_MAX_BUF)) |
45 | lj_err_mem(sbufL(sb)); | 45 | lj_err_mem(sbufL(sb)); |
46 | buf_grow(sb, len + sz); | 46 | buf_grow(sb, len + sz); |
47 | return sbufP(sb); | 47 | return sbufP(sb); |
@@ -178,7 +178,7 @@ SBuf *lj_buf_puttab(SBuf *sb, GCtab *t, GCstr *sep, int32_t i, int32_t e) | |||
178 | char *p; | 178 | char *p; |
179 | if (!o) { | 179 | if (!o) { |
180 | badtype: /* Error: bad element type. */ | 180 | badtype: /* Error: bad element type. */ |
181 | setsbufP(sb, (intptr_t)i); /* Store failing index. */ | 181 | setsbufP(sb, (void *)(intptr_t)i); /* Store failing index. */ |
182 | return NULL; | 182 | return NULL; |
183 | } else if (tvisstr(o)) { | 183 | } else if (tvisstr(o)) { |
184 | MSize len = strV(o)->len; | 184 | MSize len = strV(o)->len; |