Changed smalloc prototype to used named parameters

Author: Snaipe

ChangeLog

@@ -1,10 +1,10 @@
 2015-03-18  Franklin "Snaipe" Mathieu  <[email protected]>
 
     * include/csptr/{smart_ptr.h,apply.h}: Removed the destructor helper macro
-    * include/csptr/smart_ptr.h: Changed the vararg usage to struct vararg
-    This change is **NOT** backward-compatible. Parenthesis around the value
-    were removed with this change, and metadata is no longer passed as two
-    separate parameters.
+    * include/csptr/{smart_ptr.h,smalloc.h}: Changed the vararg usage to
+    struct vararg. This change is **NOT** backward-compatible. Parenthesis
+    around the value were removed with this change, and metadata is no longer
+    passed as two separate parameters.
 
 2015-01-26  Franklin "Snaipe" Mathieu  <[email protected]>
 

Makefile.am

@@ -19,7 +19,6 @@ EXTRA_DIST = LICENSE README.md
 
 subdirincludedir = $(includedir)/csptr/
 subdirinclude_HEADERS = \
-	include/csptr/vararg.h \
 	include/csptr/smalloc.h \
 	include/csptr/array.h \
 	include/csptr/smart_ptr.h

check/test/misc.c

@@ -3,11 +3,6 @@
 #include "config.h"
 #include "utils.h"
 
-START_TEST (test_more_args) {
-    smart void *ptr = smalloc(sizeof (int), 0, UNIQUE, NULL, NULL, NULL, NULL);
-    assert_valid_ptr(ptr);
-} END_TEST
-
 START_TEST (test_zero_size) {
     void *ptr = smalloc(0, 0, UNIQUE);
     ck_assert_msg(ptr == NULL, "Expected NULL pointer to be returned.");
@@ -26,7 +21,6 @@ START_TEST (test_alloc_failure) {
 #endif
 
 TFun misc_tests[] = {
-    test_more_args,
 #ifndef SMALLOC_FIXED_ALLOCATOR
     test_alloc_failure,
 #endif

include/csptr/smalloc.h

@@ -26,7 +26,6 @@
 # define CSPTR_SMALLOC_H_
 
 # include <stdlib.h>
-# include "vararg.h"
 
 enum pointer_kind {
     UNIQUE,
@@ -44,13 +43,26 @@ typedef struct {
 
 extern s_allocator smalloc_allocator;
 
+typedef struct {
+    int sentinel_;
+    size_t size;
+    size_t nmemb;
+    enum pointer_kind kind;
+    f_destructor dtor;
+    struct {
+        const void *data;
+        size_t size;
+    } meta;
+} s_smalloc_args;
+
 __attribute__ ((pure))
 void *get_smart_ptr_meta(void *ptr);
 void *sref(void *ptr);
 __attribute__((malloc))
-void *smalloc(size_t size, size_t nmemb, int kind, int count, ...);
+void *smalloc(s_smalloc_args *args);
 void sfree(void *ptr);
 
-# define smalloc(Size, Nmemb, Kind, Args...) smalloc(Size, Nmemb, Kind, ARG_LENGTH(Args), ## Args)
+# define smalloc(...) \
+    smalloc(&(s_smalloc_args) { .sentinel_ = 0, __VA_ARGS__ })
 
 #endif /* !CSPTR_SMALLOC_H_ */

include/csptr/smart_ptr.h

@@ -35,7 +35,7 @@ inline void sfree_stack(void *ptr) {
     *real_ptr = NULL;
 }
 
-# define ARGS_ args.dtor, args.meta.ptr, args.meta.size
+# define ARGS_ args.dtor, { args.meta.ptr, args.meta.size }
 
 # define smart __attribute__ ((cleanup(sfree_stack)))
 # define smart_ptr(Kind, Type, Args...)                                     \

include/csptr/vararg.h

@@ -87,85 +87,60 @@ INLINE static void dealloc_entry(s_meta *meta, void *ptr) {
 }
 
 __attribute__ ((malloc))
-static void *smalloc_impl(size_t size, int kind, f_destructor dtor, void *meta, size_t metasize) {
-    if (!size)
+static void *smalloc_impl(s_smalloc_args *args) {
+    if (!args->size)
         return NULL;
 
     // align the sizes to the size of a word
-    size_t aligned_metasize = align(metasize);
-    size = align(size);
+    size_t aligned_metasize = align(args->meta.size);
+    size_t size = align(args->size);
 
-    size_t head_size = kind & SHARED ? sizeof (s_meta_shared) : sizeof (s_meta);
+    size_t head_size = args->kind & SHARED ? sizeof (s_meta_shared) : sizeof (s_meta);
     s_meta_shared *ptr = alloc_entry(head_size, size, aligned_metasize);
     if (ptr == NULL)
         return NULL;
 
     char *shifted = (char *) ptr + head_size;
-    if (metasize && meta)
-        memcpy(shifted, meta, metasize);
+    if (args->meta.size && args->meta.data)
+        memcpy(shifted, args->meta.data, args->meta.size);
 
     size_t *sz = (size_t *) (shifted + aligned_metasize);
     *sz = head_size + aligned_metasize;
 
     *(s_meta*) ptr = (s_meta) {
-        .kind = kind,
-        .dtor = dtor,
+        .kind = args->kind,
+        .dtor = args->dtor,
 #ifndef NDEBUG
         .ptr = sz + 1
 #endif
     };
 
-    if (kind & SHARED)
+    if (args->kind & SHARED)
         ptr->ref_count = ATOMIC_VAR_INIT(1);
 
     return sz + 1;
 }
 
 __attribute__ ((malloc))
-INLINE static void *smalloc_array(size_t size, size_t nmemb, int kind, f_destructor dtor, void *meta, size_t metasize) {
-    char new_meta[align(metasize + sizeof(s_meta_array))];
+INLINE static void *smalloc_array(s_smalloc_args *args) {
+    char new_meta[align(args->meta.size + sizeof(s_meta_array))];
     s_meta_array *arr_meta = (void *) new_meta;
     *arr_meta = (s_meta_array) {
-        .size = size,
-        .nmemb = nmemb
+        .size = args->size,
+        .nmemb = args->nmemb,
     };
-    memcpy(arr_meta + 1, meta, metasize);
-    return smalloc_impl(nmemb * size, kind | ARRAY, dtor, &new_meta, sizeof (new_meta));
+    memcpy(arr_meta + 1, args->meta.data, args->meta.size);
+    return smalloc_impl(&(s_smalloc_args) {
+            .size = args->nmemb * args->size,
+            .kind = args->kind | ARRAY,
+            .dtor = args->dtor,
+            .meta = { &new_meta, sizeof (new_meta) },
+        });
 }
 
 __attribute__ ((malloc))
-void *smalloc(size_t size, size_t nmemb, int kind, int count, ...) {
-    va_list args;
-
-    int params = 0;
-    if (count == 2) {
-        ++count;
-        ++params;
-    }
-    if (count > 3)
-        count = 3;
-
-    va_start(args, count);
-
-    struct {
-        f_destructor dtor;
-        void *meta_ptr;
-        size_t meta_size;
-    } values = { NULL, NULL, 0 };
-
-    while (params < count) {
-        switch (params++) {
-            case 0: values.dtor      = va_arg(args, f_destructor); break;
-            case 1: values.meta_ptr  = va_arg(args, void *);       break;
-            case 2: values.meta_size = va_arg(args, size_t);       break;
-        }
-    }
-
-    va_end(args);
-    if (nmemb == 0)
-        return smalloc_impl(size, kind, values.dtor, values.meta_ptr, values.meta_size);
-    else
-        return smalloc_array(size, nmemb, kind, values.dtor, values.meta_ptr, values.meta_size);
+void *smalloc(s_smalloc_args *args) {
+    return (args->nmemb == 0 ? smalloc_impl : smalloc_array)(args);
 }
 
 void sfree(void *ptr) {