diff options
| author | Michael McConville <mmcconville@mykolab.com> | 2015-12-08 21:12:21 -0500 |
|---|---|---|
| committer | Will Estes <westes575@gmail.com> | 2015-12-09 09:51:17 -0500 |
| commit | 1cc5d870326d0c574a21bbe85457bfc50d6cc43e (patch) | |
| tree | 8bbb5c8f2195d326bf914fc4755f3f62e27db81d /src | |
| parent | c53d722b0b4e81b08cfc2f9ff6675a7abe0de2c3 (diff) | |
Removed flex_realloc().
As with flex_alloc(), replace calls to flex_realloc(), which was just a
wrapper around realloc().
Diffstat (limited to 'src')
| -rw-r--r-- | src/filter.c | 7 | ||||
| -rw-r--r-- | src/flexdef.h | 1 | ||||
| -rw-r--r-- | src/misc.c | 5 | ||||
| -rw-r--r-- | src/scan.l | 5 | ||||
| -rw-r--r-- | src/scanflags.c | 3 |
5 files changed, 6 insertions, 15 deletions
diff --git a/src/filter.c b/src/filter.c index ac2f799..aebc2fc 100644 --- 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 227ba9f..098eb04 100644 --- 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) \ @@ -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")); @@ -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 ccdb8ff..aa3de8a 100644 --- 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]; |