Removed flex_realloc().

As with flex_alloc(), replace calls to flex_realloc(), which was just a
wrapper around realloc().

diff --git a/src/filter.c b/src/filter.c
index ac2f799a7bae2cb57386026c7159dd9eafd683de..aebc2fcb43cad4def08c15366da6b9f6658703d8 100644 (file)
--- a/src/filter.c
+++ b/src/filter.c
@@ -75,12 +75,7 @@ struct filter *filter_create_ext (struct filter *chain, const char *cmd,
        while ((s = va_arg (ap, const char *)) != NULL) {
                if (f->argc >= max_args) {
                        max_args += 8;
-                       f->argv =
-                               (const char **) flex_realloc (f->argv,
-                                                             sizeof (char
-                                                                     *) *
-                                                             (max_args +
-                                                              1));
+                       f->argv = realloc(f->argv, sizeof(char*) * (max_args + 1));
                }
                f->argv[f->argc++] = s;
        }

diff --git a/src/flexdef.h b/src/flexdef.h
index 227ba9f086bc02362b28bb12773a540ce8c6c6ee..098eb044df53eabf347c5883ba1583b2707751da 100644 (file)
--- a/src/flexdef.h
+++ b/src/flexdef.h
@@ -677,7 +677,6 @@ extern int num_backing_up, bol_needed;
 void   *allocate_array PROTO ((int, size_t));
 void   *reallocate_array PROTO ((void *, int, size_t));
 
-void   *flex_realloc PROTO ((void *, size_t));
 void flex_free PROTO ((void *));
 
 #define allocate_integer_array(size) \

diff --git a/src/misc.c b/src/misc.c
index a67adbe186e49f8dca2ee197c59d4ca854a5233f..523ff9222dccd78d5ba63a189225044111b998bd 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -67,7 +67,8 @@ static void sko_push(bool dc)
     }
     if(sko_len >= sko_sz){
         sko_sz *= 2;
-        sko_stack = (struct sko_state*)flex_realloc(sko_stack,sizeof(struct sko_state)*sko_sz);
+        sko_stack = realloc(sko_stack,
+                       sizeof(struct sko_state) * sko_sz);
     }
     
     /* initialize to zero and push */
@@ -719,7 +720,7 @@ void   *reallocate_array (void *array, int size, size_t element_size)
        void *new_array;
        size_t  num_bytes = element_size * size;
 
-       new_array = flex_realloc (array, num_bytes);
+       new_array = realloc(array, num_bytes);
        if (!new_array)
                flexfatal (_("attempt to increase array size failed"));
 

diff --git a/src/scan.l b/src/scan.l
index 8407fea39e6837897988129ea942ec7b2463b914..c5c25ec616015c0e587147a6fc1fcc88137bfaed 100644 (file)
--- a/src/scan.l
+++ b/src/scan.l
@@ -1013,11 +1013,6 @@ void set_input_file( char *file )
 
 /* Wrapper routines for accessing the scanner's malloc routines. */
 
-void *flex_realloc( void *ptr, size_t size )
-       {
-       return realloc(ptr, size);
-       }
-
 void flex_free( void *ptr )
        {
        if ( ptr )

diff --git a/src/scanflags.c b/src/scanflags.c
index ccdb8ff4e41db83c4033fe754113d38f2c34a588..aa3de8a1a394865ae6b8a0348d63e98968244c15 100644 (file)
--- a/src/scanflags.c
+++ b/src/scanflags.c
@@ -40,7 +40,8 @@ void
 sf_push (void)
 {
     if (_sf_top_ix + 1 >= _sf_max)
-        _sf_stk = (scanflags_t*) flex_realloc ( (void*) _sf_stk, sizeof(scanflags_t) * (_sf_max += 32));
+        _sf_max += 32;
+        _sf_stk = realloc(_sf_stk, sizeof(scanflags_t) * _sf_max);
 
     // copy the top element
     _sf_stk[_sf_top_ix + 1] = _sf_stk[_sf_top_ix];

diff --git a/to.do/unicode/flexdef.h b/to.do/unicode/flexdef.h
index 72d8156ef8e3bad28e3e8aa61d2cf005d7d06ee6..9c0bbd4508d46885efe13828690e3a6ed3d62166 100644 (file)
--- a/to.do/unicode/flexdef.h
+++ b/to.do/unicode/flexdef.h
@@ -663,7 +663,6 @@ extern int num_backing_up, bol_needed;
 void *allocate_array PROTO((int, size_t));
 void *reallocate_array PROTO((void*, int, size_t));
 
-void *flex_realloc PROTO((void*, size_t));
 void flex_free PROTO((void*));
 
 #define allocate_integer_array(size) \

diff --git a/to.do/unicode/misc.c b/to.do/unicode/misc.c
index c0f382817129620553ef046df43a4d4ba12fee01..340707e622633e78634a5e8316b0d6d1439eb7b3 100644 (file)
--- a/to.do/unicode/misc.c
+++ b/to.do/unicode/misc.c
@@ -718,7 +718,7 @@ size_t element_size;
        register void *new_array;
        size_t num_bytes = element_size * size;
 
-       new_array = flex_realloc( array, num_bytes );
+       new_array = realloc(array, num_bytes);
        if ( ! new_array )
                flexfatal( _( "attempt to increase array size failed" ) );
 

diff --git a/to.do/unicode/scan.l b/to.do/unicode/scan.l
index 1214490ca26c087636a8f69f2547cd290c461953..6b8daac923b8e356cb4430064424b7fa5cf8d0ca 100644 (file)
--- a/to.do/unicode/scan.l
+++ b/to.do/unicode/scan.l
@@ -689,13 +689,6 @@ char *file;
 
 /* Wrapper routines for accessing the scanner's malloc routines. */
 
-void *flex_realloc( ptr, size )
-void *ptr;
-size_t size;
-       {
-       return realloc(ptr, size);
-       }
-
 void flex_free( ptr )
 void *ptr;
        {