[Cleanup] Array #2

Hi,

	sorry - I've been out for a while. (Thanks for commiting cleanup
	for Array #1).

	This is the rest. (Opt. mult with 2 should be optimalized as
	shifting and adding could be also faster than pointed deref.)

	Do you agree?

		Michal


Index: array.c
===================================================================
RCS file: /src/ruby/array.c,v
retrieving revision 1.82
diff -u -r1.82 array.c
--- array.c	2002/05/21 05:39:18	1.82
+++ array.c	2002/05/21 10:35:24
@@ -303,10 +303,10 @@
 	    capa_inc = ARY_DEFAULT_SIZE;
 	}
 	RARRAY(ary)->aux.capa = idx + capa_inc;
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, idx + capa_inc);
     }
     if (idx > RARRAY(ary)->len) {
-	rb_mem_clear(RARRAY(ary)->ptr+RARRAY(ary)->len,
+	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len,
 		idx-RARRAY(ary)->len + 1);
     }
 
@@ -1225,7 +1225,7 @@
     if (i2 * 2 < RARRAY(ary)->aux.capa &&
 	    RARRAY(ary)->aux.capa > ARY_DEFAULT_SIZE) {
 	RARRAY(ary)->aux.capa = i2 * 2;
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, i2 * 2);
     }
 
     return item;
@@ -1348,7 +1348,7 @@
     RARRAY(ary)->len = 0;
     if (ARY_DEFAULT_SIZE * 2 < RARRAY(ary)->aux.capa) {
 	RARRAY(ary)->aux.capa = ARY_DEFAULT_SIZE * 2;
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
+	REALLOC_N(RARRAY(ary)->ptr, VALUE, ARY_DEFAULT_SIZE * 2);
     }
     return ary;
 }

-- 
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
Michal Rokos                         Czech Technical University, Prague
E-mail:[e-mail]  ICQ:36118339  Jabber:[e-mail]
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-