Merge pull request #1318 from Fleurer/refactor_realloc

refactor mrb_realloc() in gc.c

2 files changed, 14 insertions, 10 deletions

diff --git a/include/mruby.h b/include/mruby.h
index 29d13c553..568ed4876 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -242,6 +242,7 @@ mrb_sym mrb_intern(mrb_state *mrb,const char *cstr)
 void *mrb_malloc(mrb_state*, size_t);         /* raise RuntimeError if no mem */
 void *mrb_calloc(mrb_state*, size_t, size_t); /* ditto */
 void *mrb_realloc(mrb_state*, void*, size_t); /* ditto */
+void *mrb_realloc_simple(mrb_state*, void*, size_t); /* return NULL if no memory available */
 void *mrb_malloc_simple(mrb_state*, size_t);  /* return NULL if no memory available */
 struct RBasic *mrb_obj_alloc(mrb_state*, enum mrb_vtype, struct RClass*);
 void mrb_free(mrb_state*, void*);
diff --git a/src/gc.c b/src/gc.c
index 7eee61dc1..6fc400e32 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -148,18 +148,28 @@ gettimeofday_time(void)
 
 #define GC_STEP_SIZE 1024
 
+
 void*
-mrb_realloc(mrb_state *mrb, void *p, size_t len)
+mrb_realloc_simple(mrb_state *mrb, void *p,  size_t len)
 {
   void *p2;
 
   p2 = (mrb->allocf)(mrb, p, len, mrb->ud);
-
   if (!p2 && len > 0 && mrb->heaps) {
     mrb_garbage_collect(mrb);
     p2 = (mrb->allocf)(mrb, p, len, mrb->ud);
   }
 
+  return p2;
+}
+
+
+void*
+mrb_realloc(mrb_state *mrb, void *p, size_t len)
+{
+  void *p2;
+
+  p2 = mrb_realloc_simple(mrb, p, len);
   if (!p2 && len) {
     if (mrb->out_of_memory) {
       /* mrb_panic(mrb); */
@@ -185,14 +195,7 @@ mrb_malloc(mrb_state *mrb, size_t len)
 void*
 mrb_malloc_simple(mrb_state *mrb, size_t len)
 {
-  void *p2;
-
-  p2 = (mrb->allocf)(mrb, 0, len, mrb->ud);
-  if (!p2 && len > 0 && mrb->heaps) {
-    mrb_garbage_collect(mrb);
-    p2 = (mrb->allocf)(mrb, 0, len, mrb->ud);
-  }
-  return p2;
+  return mrb_realloc_simple(mrb, 0, len);
 }
 
 void*