From 8c79b8b6b86f9c5a9dff46c0e6c99cf935b7f399 Mon Sep 17 00:00:00 2001
From: nari <nari@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 14 Jun 2011 02:13:51 +0000
Subject: * gc.c: use size_t.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 gc.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'gc.c')

diff --git a/gc.c b/gc.c
index 2b442d998b..c933423e28 100644
--- a/gc.c
+++ b/gc.c
@@ -1068,13 +1068,9 @@ assign_heap_slot(rb_objspace_t *objspace)
 }
 
 static void
-add_heap_slots(rb_objspace_t *objspace, int add)
+add_heap_slots(rb_objspace_t *objspace, size_t add)
 {
-    int i;
-
-    if (add < 1) {
-        add = 1;
-    }
+    size_t i;
 
     if ((heaps_used + add) > heaps_length) {
         allocate_sorted_heaps(objspace, heaps_used + add);
@@ -1088,10 +1084,7 @@ add_heap_slots(rb_objspace_t *objspace, int add)
 static void
 init_heap(rb_objspace_t *objspace)
 {
-    int add;
-
-    add = HEAP_MIN_SLOTS / HEAP_OBJ_LIMIT;
-    add_heap_slots(objspace, add);
+    add_heap_slots(objspace, HEAP_MIN_SLOTS / HEAP_OBJ_LIMIT);
 
     heaps_inc = 0;
     objspace->profile.invoke_time = getrusage_time();
@@ -1102,11 +1095,10 @@ init_heap(rb_objspace_t *objspace)
 static void
 initial_expand_heap(rb_objspace_t *objspace)
 {
-    int add;
+    size_t min_size = initial_heap_min_slots / HEAP_OBJ_LIMIT;
 
-    add = ((initial_heap_min_slots / HEAP_OBJ_LIMIT) - heaps_used);
-    if (add > 0) {
-        add_heap_slots(objspace, add);
+    if (min_size > heaps_used) {
+        add_heap_slots(objspace, min_size - heaps_used);
     }
 }
 #endif
-- 
cgit v1.2.3