浏览代码

no more MINPOWER2

Roberto Ierusalimschy 24 年之前
父节点
当前提交
fffb6f3814
共有 2 个文件被更改,包括 9 次插入10 次删除
  1. 1 5
      llimits.h
  2. 8 5
      lmem.c

+ 1 - 5
llimits.h

@@ -1,5 +1,5 @@
 /*
-** $Id: llimits.h,v 1.32 2001/09/07 17:39:10 roberto Exp $
+** $Id: llimits.h,v 1.33 2001/10/02 16:45:03 roberto Exp $
 ** Limits, basic types, and some other `installation-dependent' definitions
 ** See Copyright Notice in lua.h
 */
@@ -71,10 +71,6 @@ typedef unsigned char lu_byte;
 
 
 
-#define MINPOWER2       4       /* minimum size for `growing' vectors */
-
-
-
 #ifndef DEFAULT_STACK_SIZE
 #define DEFAULT_STACK_SIZE      1024
 #endif

+ 8 - 5
lmem.c

@@ -1,5 +1,5 @@
 /*
-** $Id: lmem.c,v 1.49 2001/03/26 14:31:49 roberto Exp $
+** $Id: lmem.c,v 1.50 2001/08/31 19:46:07 roberto Exp $
 ** Interface to Memory Manager
 ** See Copyright Notice in lua.h
 */
@@ -23,15 +23,18 @@
 #endif
 
 
+#define MINSIZEARRAY	4
+
+
 void *luaM_growaux (lua_State *L, void *block, int *size, int size_elems,
                     int limit, const l_char *errormsg) {
   void *newblock;
   int newsize = (*size)*2;
-  if (newsize < MINPOWER2)
-    newsize = MINPOWER2;  /* minimum size */
+  if (newsize < MINSIZEARRAY)
+    newsize = MINSIZEARRAY;  /* minimum size */
   else if (*size >= limit/2) {  /* cannot double it? */
-    if (*size < limit - MINPOWER2)  /* try something smaller... */
-      newsize = limit;  /* still have at least MINPOWER2 free places */
+    if (*size < limit - MINSIZEARRAY)  /* try something smaller... */
+      newsize = limit;  /* still have at least MINSIZEARRAY free places */
     else luaD_error(L, errormsg);
   }
   newblock = luaM_realloc(L, block,