realloc_array: apply refactoring where it's appropriate

goatshriek · Oct 29, 2024 · 9e270aa · 9e270aa
1 parent 9e119b4
commit 9e270aa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/src/cache.c b/src/cache.c
@@ -67,7 +67,7 @@ add_page( struct cache *c ) {
   char **new_pages;
   char *new_page;
 
-  new_pages = realloc_mem( c->pages, sizeof( char * ) * ( c->page_count + 1 ) );
+  new_pages = realloc_array( c->pages, ( c->page_count + 1 ), sizeof( char * ) );
   if( !new_pages ) {
     return -1;
   }

diff --git a/src/element.c b/src/element.c
@@ -56,18 +56,13 @@ struct stumpless_element *
 stumpless_add_param( struct stumpless_element *element,
                      struct stumpless_param *param ) {
   struct stumpless_param **new_params;
-  size_t old_params_size;
-  size_t new_params_size;
 
   VALIDATE_ARG_NOT_NULL( element );
   VALIDATE_ARG_NOT_NULL( param );
 
   lock_element( element );
 
-  old_params_size = sizeof( param ) * element->param_count;
-  new_params_size = old_params_size + sizeof( param );
-
-  new_params = realloc_mem( element->params, new_params_size );
+  new_params = realloc_array( element->params, element->param_count, sizeof( struct stumpless_param * ) );
   if( !new_params ) {
     unlock_element( element );
     return NULL;

diff --git a/src/target/journald.c b/src/target/journald.c
@@ -191,7 +191,7 @@ void
 init_fields( size_t field_count ) {
   struct iovec *new_fields;
 
-  new_fields = realloc_mem( fields, sizeof( *fields ) * field_count );
+  new_fields = realloc_array( fields, field_count, sizeof( *fields ) );
   if( !new_fields ) {
     return;
   }