summaryrefslogtreecommitdiff
path: root/src/lmem.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lmem.c')
-rw-r--r--[-rwxr-xr-x]src/lmem.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lmem.c b/src/lmem.c
index c3775df..792deb3 100755..100644
--- a/src/lmem.c
+++ b/src/lmem.c
@@ -1,5 +1,5 @@
/*
-** $Id: lmem.c,v 1.81 2010/12/20 19:40:07 roberto Exp $
+** $Id: lmem.c,v 1.83 2011/11/30 12:42:49 roberto Exp $
** Interface to Memory Manager
** See Copyright Notice in lua.h
*/
@@ -63,9 +63,8 @@ void *luaM_growaux_ (lua_State *L, void *block, int *size, size_t size_elems,
}
-void *luaM_toobig (lua_State *L) {
+l_noret luaM_toobig (lua_State *L) {
luaG_runerror(L, "memory allocation error: block too big");
- return NULL; /* to avoid warnings */
}
@@ -106,7 +105,7 @@ void *luaM_realloc_ (lua_State *L, void *block, size_t osize, size_t nsize) {
if ((total % 200) == 0) {
if (f == NULL) f = fopen(TRACEMEM, "w");
fprintf(f, "%lu %u %d %d\n", total,
- g->totalbytes, g->GCdebt, g->gcstate * 1000);
+ gettotalbytes(g), g->GCdebt, g->gcstate * 10000);
}
}
#endif