remove BBUF_ENSURE_SIZE_FREE_ON_ERROR()

diff --git a/src/regint.h b/src/regint.h
index 701a4bcfe75c44a077291c8e41c25cd504a35406..9701ef1f0945b3d8f37baf7873bd2e6e5bf27af3 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -358,19 +358,6 @@ typedef struct _BBuf {
   }\
 } while (0)
 
-#define BBUF_ENSURE_SIZE_FREE_ON_ERROR(buf,size) do{\
-  unsigned int new_alloc = (buf)->alloc;\
-  while (new_alloc < (unsigned int )(size)) { new_alloc *= 2; }\
-  if ((buf)->alloc != new_alloc) {\
-    (buf)->p = (UChar* )xrealloc((buf)->p, new_alloc);\
-    if (IS_NULL((buf)->p)) {\
-      xfree(buf);\
-      return(ONIGERR_MEMORY);\
-    }\
-    (buf)->alloc = new_alloc;\
-  }\
-} while (0)
-
 #define BBUF_WRITE(buf,pos,bytes,n) do{\
   int used = (pos) + (n);\
   if ((buf)->alloc < (unsigned int )used) BBUF_EXPAND((buf),used);\

diff --git a/src/regparse.c b/src/regparse.c
index d64c75ba6a06c4cc8743070a86d6c49ebbe67e44..5d057ef1cd0ce354a8ffc03d040624f1d6673fa0 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -1726,7 +1726,7 @@ add_code_range_to_buf(BBuf** pbuf, OnigCodePoint from, OnigCodePoint to)
   }
 
   pos = SIZE_CODE_POINT * (1 + low * 2);
-  BBUF_ENSURE_SIZE_FREE_ON_ERROR(bbuf, pos + SIZE_CODE_POINT * 2);
+  BBUF_ENSURE_SIZE(bbuf, pos + SIZE_CODE_POINT * 2);
   BBUF_WRITE_CODE_POINT(bbuf, pos, from);
   BBUF_WRITE_CODE_POINT(bbuf, pos + SIZE_CODE_POINT, to);
   n += inc_n;