1 files changed, 6 insertions, 21 deletions

diff --git a/csv.c b/csv.c
index b68189b..0915029 100644
--- a/csv.c
+++ b/csv.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-// === Compiletime Options ===
+// === Compile time options ===
 
 #ifndef CSV_DEFAULT_DELIMITER
 #       define CSV_DEFAULT_DELIMITER '"'
@@ -15,7 +15,7 @@
 #       define CSV_DEFAULT_SEPARATOR ','
 #endif
 
-// === some usefull Makros ===
+// === some useful Makros ===
 
 #define UNUSED(x) (void) (x) // mark a parameter as 'unused'
 #define STR(s) #s            // Stringify a Makro
@@ -32,33 +32,18 @@ const char csv_version[] = XSTR(CSV_VER_MAJOR) "." XSTR(CSV_VER_MINOR) "." XSTR(
 
 // === CSV-MEMORY Interface ===
 
-#if ( (defined(__GNUC__) && __GNUC__ >= 5) || (defined(__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 4))) )
-#       define mul_overflow __builtin_mul_overflow
-#else
-static inline int
-mul_overflow(size_t a, size_t b, size_t *out)
-{
-        *out = a * b;
-        return (a != 0 && (*out / a) != b);
-}
-#endif
-
 static void *
-csv_mem_reallocate(void *ptr, size_t number, size_t size, void *cb_arg)
+csv_mem_reallocate(void *ptr, size_t num, size_t size, void *cb_arg)
 {
         UNUSED(cb_arg);
 
-        size_t len = 0;
-        if ( number == 0 || size == 0 || mul_overflow(number, size, &len) ) {
-                return NULL;
-        }
-        return realloc(ptr, len);
+        return reallocarray(ptr, num, size);
 }
 
 static void
-csv_mem_free(void *ptr, size_t number, size_t size, void *cb_arg)
+csv_mem_free(void *ptr, size_t num, size_t size, void *cb_arg)
 {
-        UNUSED(number);
+        UNUSED(num);
         UNUSED(size);
         UNUSED(cb_arg);