Merge branch 'cleanup/allocator'

2 files changed, 27 insertions, 27 deletions

diff --git a/allocator.c b/allocator.c
index 6d13a17..98fa69f 100644
--- a/allocator.c
+++ b/allocator.c
@@ -1,23 +1,23 @@
 #include "allocator.h"
 
-#include <stdlib.h>
+#include <stdlib.h> /* malloc */
 
 /* Interface Code */
 static void *
-default_allocate(struct its1_allocator *allocator, size_t n)
+default_allocate(struct allocator *allocator, size_t n)
 {
         (void) allocator;
         return malloc(n);
 }
 
 static void
-default_deallocate(struct its1_allocator *allocator, void *ptr)
+default_deallocate(struct allocator *allocator, void *ptr)
 {
         (void) allocator;
         free(ptr);
 }
 
-struct its1_allocator its1_default_allocator = {
+struct allocator allocator_default_allocator = {
         .allocate   = &default_allocate,
         .deallocate = &default_deallocate
 };
@@ -26,34 +26,34 @@ struct its1_allocator its1_default_allocator = {
 #include <string.h>
 
 void *
-its1_malloc(struct its1_allocator *allocator, size_t n)
+allocator_malloc(struct allocator *allocator, size_t n)
 {
-        if ( allocator == NULL ) {
-                allocator = &its1_default_allocator;
+        if ( !allocator ) {
+                allocator = &allocator_default_allocator;
         }
 
         return allocator->allocate(allocator, n);
 }
 
 void
-its1_free(struct its1_allocator *allocator, void *ptr)
+allocator_free(struct allocator *allocator, void *ptr)
 {
-        if ( allocator == NULL ) {
-                allocator = &its1_default_allocator;
+        if ( !allocator ) {
+                allocator = &allocator_default_allocator;
         }
 
         allocator->deallocate(allocator, ptr);
 }
 
 char *
-its1_strdup(struct its1_allocator *allocator, const char *str)
+allocator_strdup(struct allocator *allocator, const char *str)
 {
         size_t n;
         char * dest;
 
         n    = strlen(str) + 1;
-        dest = its1_malloc(allocator, n);
-        if ( dest != NULL ) {
+        dest = allocator_malloc(allocator, n);
+        if ( dest ) {
                 memcpy(dest, str, n);
         }
 
@@ -61,12 +61,12 @@ its1_strdup(struct its1_allocator *allocator, const char *str)
 }
 
 void *
-its1_malloc_zero(struct its1_allocator *allocator, size_t n)
+allocator_malloc_zero(struct allocator *allocator, size_t n)
 {
         void *ptr;
 
-        ptr = its1_malloc(allocator, n);
-        if ( ptr != NULL ) {
+        ptr = allocator_malloc(allocator, n);
+        if ( ptr ) {
                 memset(ptr, 0, n);
         }
 
diff --git a/allocator.h b/allocator.h
index d47af52..dd9bb16 100644
--- a/allocator.h
+++ b/allocator.h
@@ -2,29 +2,29 @@
 
 #include <stddef.h> /* size_t */
 
-struct its1_allocator {
-        void *(*allocate)(struct its1_allocator *allocator, size_t n);
-        void (*deallocate)(struct its1_allocator *allocator, void *ptr);
+struct allocator {
+        void *(*allocate)(struct allocator *allocator, size_t n);
+        void (*deallocate)(struct allocator *allocator, void *ptr);
 };
 
-extern struct its1_allocator its1_default_allocator;
+extern struct allocator default_allocator;
 
 /* allocator interface */
-void *its1_malloc(struct its1_allocator *allocator, size_t n);
-void  its1_free(struct its1_allocator *allocator, void *ptr);
+void *allocator_malloc(struct allocator *allocator, size_t n);
+void  allocator_free(struct allocator *allocator, void *ptr);
 
 /* helper functions */
-char *its1_strdup(struct its1_allocator *allocator, const char *str);
-void *its1_malloc_zero(struct its1_allocator *allocator, size_t n);
+char *allocator_strdup(struct allocator *allocator, const char *str);
+void *allocator_malloc_zero(struct allocator *allocator, size_t n);
 
 #define ALLOCATE(n) \
-        its1_malloc(&its1_default_allocator, (n))
+        allocator_malloc(&allocator_default_allocator, (n))
 
 #define ALLOCATE_ZERO(n) \
-        its1_malloc_zero(&its1_default_allocator, (n))
+        allocator_malloc_zero(&allocator_default_allocator, (n))
 
 #define FREE(ptr) \
-        (its1_free(&its1_default_allocator, (ptr)), (ptr) = NULL)
+        (allocator_free(&allocator_default_allocator, (ptr)), (ptr) = NULL)
 
 #define NEW(ptr) ((ptr) = ALLOCATE(sizeof *(ptr)))
 #define NEW0(ptr) ((ptr) = ALLOCATE_ZERO(sizeof *(ptr)))