refactoring code with correct naming convention

3 files changed, 35 insertions, 33 deletions

diff --git a/src/list.c b/src/list.c
index b48d399..f73348c 100644
--- a/src/list.c
+++ b/src/list.c
@@ -2,9 +2,9 @@
 #include <string.h> /* memcpy */
 #include "list.h"
 
-List List_Create()
+list_t clist_create()
 {
-  List list;
+  list_t list;
 
   list.first = NULL;
   list.last  = NULL;
@@ -13,9 +13,9 @@ List List_Create()
   return list;
 }
 
-void List_Add(List*  list,
-	      void* data,
-	      int   size_of)
+void clist_add(list_t *list,
+               void   *data,
+               int     size_of)
 {
   struct list_item_t *item = malloc(sizeof(struct list_item_t));
 
@@ -34,16 +34,18 @@ void List_Add(List*  list,
   list->size ++;
 }
 
-void List_AddAll(List *dest, List *other)
+void clist_add_all(list_t *dest,
+                   list_t *other)
 {
   dest->last->next = other->first;
   dest->size += other->size;
 }
 
-void List_Remove(List *list, List_Item *item)
+void clist_remove(list_t *list,
+                  list_item_t *item)
 {
-  List_Item *curr = list->first->next;
-  List_Item *prev = list->first;
+  list_item_t *curr = list->first->next;
+  list_item_t *prev = list->first;
 
   if (list->first == item) {
     free(list->first);
@@ -61,7 +63,7 @@ void List_Remove(List *list, List_Item *item)
   }
 }
 
-Iterator List_Iterator(List* list)
+iterator_t clist_iterator(list_t *list)
 {
   struct iterator_t *iterator = malloc(sizeof(struct iterator_t));
   iterator->current = list->first;
@@ -69,12 +71,12 @@ Iterator List_Iterator(List* list)
   return *iterator;
 }
 
-int Iterator_HasNext(Iterator* iterator)
+int iterator_has_next(iterator_t *iterator)
 {
   return iterator->current != NULL;
 }
 
-List_Item *Iterator_Next(Iterator *iterator)
+list_item_t *iterator_next(iterator_t *iterator)
 {
   struct list_item_t *current = iterator->current;
   iterator->current = iterator->current->next;
diff --git a/src/list.h b/src/list.h
index 675ba3d..d31f6fd 100644
--- a/src/list.h
+++ b/src/list.h
@@ -4,24 +4,24 @@
 typedef struct list_item_t {
   void *data;
   struct list_item_t *next;
-} List_Item;
+} list_item_t;
 
 typedef struct list_t {
   struct list_item_t *first;
   struct list_item_t *last;
   int    size;
-} List;
+} list_t;
 
 typedef struct iterator_t {
   struct list_item_t *current;
-} Iterator;
+} iterator_t;
 
-List       List_Create     (void);
-void       List_Add        (List *, void *, int);
-void       List_AddAll     (List *, List *);
-void       List_Remove     (List *, List_Item *);
-Iterator   List_Iterator   (List *);
-int        Iterator_HasNext(Iterator *);
-List_Item *Iterator_Next   (Iterator *);
+list_t       clist_create           (void);
+void         clist_add              (list_t *, void *, int);
+void         clist_add_all          (list_t *, list_t *);
+void         clist_remove           (list_t *, list_item_t *);
+iterator_t   clist_iterator         (list_t *);
+int          clist_iterator_has_next(iterator_t *);
+list_item_t *iterator_next          (iterator_t *);
 
 #endif
diff --git a/src/main.c b/src/main.c
index b68b477..9ad5067 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,38 +6,38 @@
 int main(int argc, char** argv)
 {
   int i;
-  List_Item *current, *r;
+  list_item_t *current, *r;
   char buffer[4];
   char *dest = malloc(sizeof(char) * 4);
 
-  Iterator it;
+  iterator_t it;
 
-  List list1 = List_Create();
-  List list2 = List_Create();
+  list_t list1 = clist_create();
+  list_t list2 = clist_create();
 
   for (i = 0; i < 2; i++) {
     itoa(i, buffer, 10);
     strcpy(dest, "i");
     strcat(dest, buffer);
-    List_Add(&list1, dest, sizeof(int));
+    clist_add(&list1, dest, sizeof(int));
   }
 
   for (i = 0; i < 5; i++) {
     itoa(i, buffer, 10);
     strcpy(dest, "j");
     strcat(dest, buffer);
-    List_Add(&list2, dest, sizeof(int));
+    clist_add(&list2, dest, sizeof(int));
     if (i == 3) r = list2.last;
   }
 
-  List_Remove(&list2, r);
-  List_AddAll(&list1, &list2);
+  clist_remove(&list2, r);
+  clist_add_all(&list1, &list2);
 
   printf("read from list with iterator:\n");
   
-  it = List_Iterator(&list1);
-  while(Iterator_HasNext(&it)) {
-    current = Iterator_Next(&it);
+  it = clist_iterator(&list1);
+  while(iterator_has_next(&it)) {
+    current = iterator_next(&it);
     printf("%s\n", (char *) current->data);
   }