1 files changed, 15 insertions, 11 deletions

diff --git a/csv.c b/csv.c
index d36eb63..4f3cd14 100644
--- a/csv.c
+++ b/csv.c
@@ -44,34 +44,34 @@ mul_overflow(size_t a, size_t b, size_t *out)
 #endif
 
 static void *
-csv_mem_allocate(size_t n, size_t sz, void *cb_arg)
+csv_mem_allocate(size_t number, size_t size, void *cb_arg)
 {
         UNUSED(cb_arg);
 
         size_t len = 0;
-        if ( n == 0 || sz == 0 || mul_overflow(n, sz, &len) ) {
+        if ( number == 0 || size == 0 || mul_overflow(number, size, &len) ) {
                 return NULL;
         }
         return malloc(len);
 }
 
 static void *
-csv_mem_reallocate(void *ptr, size_t n, size_t sz, void *cb_arg)
+csv_mem_reallocate(void *ptr, size_t number, size_t size, void *cb_arg)
 {
         UNUSED(cb_arg);
 
         size_t len = 0;
-        if ( n == 0 || sz == 0 || mul_overflow(n, sz, &len) ) {
+        if ( number == 0 || size == 0 || mul_overflow(number, size, &len) ) {
                 return NULL;
         }
         return realloc(ptr, len);
 }
 
 static void
-csv_mem_free(void *ptr, size_t n, size_t sz, void *cb_arg)
+csv_mem_free(void *ptr, size_t number, size_t size, void *cb_arg)
 {
-        UNUSED(n);
-        UNUSED(sz);
+        UNUSED(number);
+        UNUSED(size);
         UNUSED(cb_arg);
 
         free(ptr);
@@ -138,10 +138,12 @@ csv_string_append(csv_string_t *csv_string, int ch, const csv_options_t *const c
 
         if ( csv_string->pos == csv_string->cap ) { // grow if needed
                 if ( csv_string->str == NULL ) {        // first call?
-                        if ( (csv_string->str = csv_options->cb_allocate(INITIAL_CAP, 1, csv_options->cb_memory_arg)) == NULL ) {
+                        char *str = csv_options->cb_allocate(INITIAL_CAP, 1, csv_options->cb_memory_arg);
+                        if ( str == NULL ) {
                                 csv_fatal_error(CSV_ERR_OUT_OF_MEMORY, csv_options);
                                 return;
                         }
+                        csv_string->str = str;
                         csv_string->cap = INITIAL_CAP;
                 }
                 else {                                      // subsequent call
@@ -201,11 +203,13 @@ csv_field_append(csv_field_t *csv_field, size_t idx, const csv_options_t *const
 
         if ( csv_field->pos == csv_field->cap ) { // grow if needed
                 if ( csv_field->fields == NULL ) {    // first call
-                        if ( (csv_field->fields = csv_options->cb_allocate(INITIAL_CAP, sizeof(csv_field->fields[0]), csv_options->cb_memory_arg)) == NULL ) {
+                        size_t *fields = csv_options->cb_allocate(INITIAL_CAP, sizeof(csv_field->fields[0]), csv_options->cb_memory_arg);
+                        if ( fields == NULL ) {
                                 csv_fatal_error(CSV_ERR_OUT_OF_MEMORY, csv_options);
                                 return;
                         }
-                        csv_field->cap = INITIAL_CAP;
+                        csv_field->fields = fields;
+                        csv_field->cap    = INITIAL_CAP;
                 }
                 else {                                         // subsequent call
                         size_t  cap    = (csv_field->cap * 3) / 2; // *= 1.5
@@ -219,7 +223,7 @@ csv_field_append(csv_field_t *csv_field, size_t idx, const csv_options_t *const
                 }
         }
 
-        csv_field->fields[csv_field->pos++] = idx; // append idx
+        csv_field->fields[csv_field->pos++] = idx; // append index
 }
 
 static inline void