Do some more work on the linked list

5 files changed, 80 insertions, 12 deletions

diff --git a/.gitignore b/.gitignore
index b635958..2bba462 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
 main
 encryption
+ll
 a.out
 bin/
 *.o
 *test*
-*.enc
\ No newline at end of file
+*.enc
+.vscode/
\ No newline at end of file
diff --git a/src/Makefile b/src/Makefile
index d12eb72..c5a08c7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -28,6 +28,7 @@ arena.o: arena.c arena.h shared.h
 shared.o: shared.c shared.h
 
 encryption: encryption.c encryption.h shared.o shared.h
+ll: ll.o shared.o
 
 c clean:
         rm -rvf $(BINARIES) $(wildcard *.o) $(wildcard *.test*) $(wildcard *.enc)
\ No newline at end of file
diff --git a/src/ll.c b/src/ll.c
index ae62e89..4819226 100644
--- a/src/ll.c
+++ b/src/ll.c
@@ -47,17 +47,26 @@ int dllnode_free(dllnode **n) {
     return 0;
 }
 
-void dlinkedlist_init(dlinkedlist **ll) {
-    (*ll) = xcalloc(1, sizeof(**ll));
+dlinkedlist * dlinkedlist_init(void) {
+    dlinkedlist *ll = xcalloc(1, sizeof(*ll));
     
-    (*ll)->start = NULL;
-    (*ll)->end = NULL;
-    (*ll)->size = 0;
+    ll->start = NULL;
+    ll->end = NULL;
+    ll->size = 0;
 
-    return;
+    return ll;
 }
 
-void dlinkedlist_free(dlinkedlist **ll) {
+int dlinkedlist_free(dlinkedlist **ll) {
+    if(!ll) {
+        errno = EINVAL;
+        return -1;
+    }
+    if(!(*ll)) {
+        errno = EINVAL;
+        return -1;
+    }
+
     dllnode *p = (*ll)->start, *n;
     while(p != NULL) {
         n = p->next;
@@ -67,7 +76,7 @@ void dlinkedlist_free(dlinkedlist **ll) {
 
     free(*ll);
     (*ll) = NULL;
-    return;
+    return 0;
 }
 
 int dlinkedlist_firstitem(dlinkedlist * const ll, void *data, dlinkedlist_freecallback dfreecb) {
@@ -210,4 +219,52 @@ int dlinkedlist_remove(dlinkedlist * const ll, size_t index) {
     ll->size--;
 
     return 0;
-}
\ No newline at end of file
+}
+
+size_t dlinkedlist_size(const dlinkedlist * const ll) {
+    if(!ll)
+        RETURNWERR(EINVAL, -1);
+
+    return ll->size;
+}
+
+int dlinkedlist_isempty(const dlinkedlist * const ll) {
+    if(!ll)
+        RETURNWERR(EINVAL, -1);
+
+    return (ll->size == 0);
+}
+
+
+
+
+// Sample code
+#define COMPILE_SAMPLE
+#ifdef COMPILE_SAMPLE
+
+#include <stdio.h>
+#include <string.h>
+
+int genfree(void *data) {
+    free(data);
+    return 0;
+}
+
+int main() {
+    dlinkedlist *dll = dlinkedlist_init();
+    dlinkedlist_append(dll, (void*)strdup("THIS"),      genfree);
+    dlinkedlist_append(dll, (void*)strdup("IS"),        genfree);
+    dlinkedlist_append(dll, (void*)strdup("A"),         genfree);
+    dlinkedlist_append(dll, (void*)strdup("STRING"),    genfree);
+
+    // This is crashing as of right now
+    char *retval;
+    for(int i = 0; i < dlinkedlist_size(dll); i++)
+        printf("%s ", (((retval = (char*)dlinkedlist_get(dll, i)) != NULL) ? retval : "null") );
+    printf("\n");
+
+    dlinkedlist_free(&dll);
+
+    return 0;
+}
+#endif
\ No newline at end of file
diff --git a/src/ll.h b/src/ll.h
index f5846fb..6e79ccd 100644
--- a/src/ll.h
+++ b/src/ll.h
@@ -6,8 +6,8 @@
 typedef int (*dlinkedlist_freecallback)(void*);
 typedef struct dlinkedlist dlinkedlist;
 
-void dlinkedlist_init(dlinkedlist **ll);
-void dlinkedlist_free(dlinkedlist **ll);
+dlinkedlist * dlinkedlist_init(void);
+int dlinkedlist_free(dlinkedlist **ll);
 
 int dlinkedlist_insert(dlinkedlist * const ll, void *data, dlinkedlist_freecallback dfreecb);
 int dlinkedlist_append(dlinkedlist * const ll, void *data, dlinkedlist_freecallback dfreecb);
@@ -16,4 +16,7 @@ void *dlinkedlist_getfirst(const dlinkedlist * const ll);
 void *dlinkedlist_getlast(const dlinkedlist * const ll);
 int dlinkedlist_remove(dlinkedlist * const ll, size_t index);
 
+size_t dlinkedlist_size(const dlinkedlist * const ll);
+int dlinkedlist_isempty(const dlinkedlist * const ll);
+
 #endif
\ No newline at end of file
diff --git a/src/shared.h b/src/shared.h
index ee3e06b..af6c56e 100644
--- a/src/shared.h
+++ b/src/shared.h
@@ -5,6 +5,11 @@
 
 #define STATIC_ARRAY_LEN(arr) (sizeof((arr))/sizeof((arr)[0]))
 
+#define RETURNWERR(errval, retval) do {\
+    errno = (errval);\
+    return (retval);\
+} while (0)
+
 // Defines how `x___alloc()` functions should exit. `___VXGG___XALLOC_EXIT_ON_ERROR___ > 0` calls `error()`, and thus functions
 // registered with `atexit()` and `on_exit()`. `___VXGG___XALLOC_EXIT_ON_ERROR___ <= 0` calls `abort()` on error. `x___alloc()` 
 // type functions will ALWAYS 'abort', doing otherwise defeats the purpose of the function type