1 files changed, 86 insertions(+), 75 deletions(-)

M linkedlist/linkedlist.c

@@ 6,120 6,131 @@
 
 int main(int argc, char **argv)
 {
-  struct linked_list *l;
-  /* struct linked_list_node *n; */
+	struct linked_list *l;
+	/* struct linked_list_node *n; */
 
-  l= linked_list_new();
-  /* n = linked_list_new_string_node("Thomas"); */
+	l= linked_list_new();
+	/* n = linked_list_new_string_node("Thomas"); */
 
-  linked_list_insert(l, linked_list_new_string_node("Diana"));
-  linked_list_insert(l, linked_list_new_string_node("Belea"));
-  linked_list_insert(l, linked_list_new_string_node("Thomas"));
-  linked_list_insert(l, linked_list_new_string_node("Bracht"));
-  linked_list_insert(l, linked_list_new_string_node("Laumann"));
-  linked_list_insert(l, linked_list_new_string_node("Jespersen"));
-  linked_list_insert(l, linked_list_new_string_node("BITCHES!"));
+	linked_list_insert(l, linked_list_new_string_node("Diana"));
+	linked_list_insert(l, linked_list_new_string_node("Belea"));
+	linked_list_insert(l, linked_list_new_string_node("Thomas"));
+	linked_list_insert(l, linked_list_new_string_node("Bracht"));
+	linked_list_insert(l, linked_list_new_string_node("Laumann"));
+	linked_list_insert(l, linked_list_new_string_node("Jespersen"));
+	linked_list_insert(l, linked_list_new_string_node("BITCHES!"));
 
-  linked_list_print(l);
+	linked_list_print(l);
 
-  return 0;
+	return 0;
 }
 
 void
 linked_list_print(struct linked_list* l)
 {
-  struct linked_list_node* n = l->first;
-  printf("Size: %d\n[", l->size);
+	struct linked_list_node* n = l->first;
+	printf("Size: %d\n[", l->size);
 
-  while (1) {
-    printf("'%s'", (char*) n->elm);
-    if (n->next == NULL) break;
-    else printf(" <-> ");
-    n = n->next;
-  }
+	while (1) {
+		printf("'%s'", (char*) n->elm);
+		if (n->next == NULL) break;
+		else printf(" <-> ");
+		n = n->next;
+	}
 
-  printf("]\n");
+	printf("]\n");
 }
 
 struct linked_list* linked_list_new()
 {
-  struct linked_list* list;
+	struct linked_list* list;
 
-  list = (struct linked_list*)malloc(sizeof(struct linked_list));
+	list = (struct linked_list*)malloc(sizeof(struct linked_list));
 
-  list->first = NULL;
-  list->size  = 0;
+	list->first = NULL;
+	list->size  = 0;
 
-  return list;
+	return list;
 }
 
 struct linked_list_node* linked_list_new_node()
 {
-  struct linked_list_node* node;
+	struct linked_list_node* node;
 
-  /* Allocate! */
-  node = (struct linked_list_node*)malloc(sizeof(struct linked_list_node));
+	/* Allocate! */
+	node = (struct linked_list_node*)malloc(sizeof(struct linked_list_node));
 
-  node->next = NULL;
-  node->prev = NULL;
-  node->elm  = NULL;
+	node->next = NULL;
+	node->prev = NULL;
+	node->elm  = NULL;
 
-  return node;
+	return node;
 }
 
 struct linked_list_node*
-linked_list_new_string_node(char * str)
+linked_list_new_string_node(char *str)
 {
-  struct linked_list_node* node;
+	struct linked_list_node* node;
 
-  node = linked_list_new_node();
+	node = linked_list_new_node();
 
-  node->elm = (void*) malloc(sizeof(str));
-  node->elm = str;
+	node->elm = (void*) malloc(sizeof(str));
+	node->elm = str;
 
-  return node;
+	return node;
 }
 
-int linked_list_insert(struct linked_list* list, struct linked_list_node* item)
+int linked_list_insert(struct linked_list *list, struct linked_list_node *item)
 {
-  if (list->first == NULL) {
-    list->first = item;
-    list->size++;
-    return 0;
-  }
-
-  struct linked_list_node *n, *last;
-  n = list->first;
-
-  while (1) {
-    if (n==NULL)
-      break;
-    last = n;
-    n = n->next;
-  }
-
-  n = item;
-
-  /* Make them point to each other */
-  item->prev = last;
-  last->next = item;
-  list->size++;
-
-  return 0;
+	if (list->first == NULL) {
+		list->first = item;
+		goto end;
+	}
+
+	struct linked_list_node *n, *last;
+	n = list->first;
+
+	/* Shorthand method
+	for (last = n; n ; last = n, n = n->next)
+		;
+	*/
+
+	while (1) {
+		if (n==NULL)
+			break;
+		last = n;
+		n = n->next;
+	}
+
+	n = item;
+
+	/* Make them point to each other */
+	item->prev = last;
+	last->next = item;
+
+end:
+	list->size++;
+	return 0;
 }
 
 /* Linear time pop */
 struct linked_list_node* linked_list_pop(struct linked_list* l)
 {
-  struct linked_list_node* n = l->first;
-
-  while (1) {
-    if (n->next)
-      n = n->next;
-    else
-      break;
-  }
-
-  return n;
+	struct linked_list_node* n;
+
+	/* Shorthand method */
+	/*
+	for (n = l->first; n->next ; n = n->next)
+		;
+	*/
+
+	while (1) {
+		if (n->next)
+			n = n->next;
+		else
+			break;
+	}
+
+	return n;
 }