X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=list%2Flist.c;h=64a104a1cd3f7e0eb651e60cfc5782e07b898960;hb=b75390faa6d63ccc1a940bbe5db66141c8e0a1a0;hp=64a282a14e1f33dfd505fdaec215f5668bb8701a;hpb=40946b581d43a81ef427115bc284a4240c389e8f;p=my-code%2Fapi.git

diff --git a/list/list.c b/list/list.c
index 64a282a..64a104a 100644
--- a/list/list.c
+++ b/list/list.c
@@ -8,39 +8,63 @@
 
 int list_init(t_list *list,int outfd) {
 
-  dprintf(outfd,"[list] list initilaization ...\n");
+  dprintf(outfd,"[list] list initialization ...\n");
 
   list->outfd=outfd;
   list->start=NULL;
-  list->current=NULL;
+  list_reset(list);
 
   return L_SUCCESS;
 }
 
-int list_del_next(t_list *list,t_list_element *element) {
+int list_shutdown(t_list *list) {
 
-  t_list_element *tmp;
+  if(list->start!=NULL) list_destroy(list);
+
+  dprintf(list->outfd,"[list] shutdown\n");
+
+  return L_SUCCESS;
+}
+
+int list_next(t_list *list) {
+
+  if(list->current->next==NULL) return L_NO_NEXT_ELEMENT;
+
+  list->current=list->current->next;
+
+  return L_SUCCESS;
+}
+
+int list_reset(t_list *list) {
+
+  list->current=list->start;
+
+  return L_SUCCESS;
+}
+
+int list_del_element(t_list *list,t_list_element *element) {
 
   if(element==NULL) {
     dprintf(list->outfd,"[list] empty element\n");
     return L_INVALID_ELEMENT;
   }
 
-  if(element->next!=NULL) {
-    dprintf(list->outfd,"[list] destroying element number %d\n"
-    tmp=element->next->next;
-    if(element->next->data!=NULL) free(element->next->data);
-    free(element->next);
-    element->next=tmp;
-  }
-  else {
-    dprintf(list->outfd,"[list] no next element\n");
-    return L_NO_NEXT_ELEMENT;
-  }
+  if(element->next!=NULL) element->next->prev=element->prev;
+  if(element->prev!=NULL) element->prev->next=element->next;
+  if(element==list->start) list->start=element->next;
+  list_reset(list);
+  if(element->data!=NULL) free(element->data);
+  free(element);
+  dprintf(list->outfd,"[list] element deleted\n");
 
   return L_SUCCESS;
 }
 
+int list_del_current(t_list *list) {
+
+  return(list_del_element(list,list->current));
+}
+
 int list_destroy(t_list *list) {
 
   if(list->start==NULL) {
@@ -48,72 +72,98 @@ int list_destroy(t_list *list) {
     return L_EMPTY_LIST;
   }
 
-  list->current=list->start;
+  list_reset(list);
 
-  while(list->current->next!=NULL)
-    list_del_next(list,list->current);
+  while(list->current!=NULL) list_del_element(list,list->current);
 
   return L_SUCCESS;
 }
 
-int list_del_nr(t_list *list,int nr) {
+int list_search_data(t_list *list,void *data,int first_bytes) {
+
+  list_reset(list);
 
   if(list->start==NULL) {
     dprintf(list->outfd,"[list] empty list\n");
     return L_EMPTY_LIST;
   }
 
-  if(list->start->number==nr) {
-
-  }  
-
-  list->current=&(list->start);
-
-  while(list->current->next!=NULL) {
-    if(list->current->next->number==nr) {
-      list_del_next(list,list->current);
-      return L_SUCCESS;
-    }
-    list->current=list->current->next;
-  }
+  do {
+    if(list->current!=NULL)
+      if(first_bytes<=list->current->data_len)
+        if(!(memcmp(list->current->data,data,first_bytes))) return L_SUCCESS;
+  } while(list_next(list)!=L_NO_NEXT_ELEMENT);
 
   return L_NO_SUCH_ELEMENT;
 }
 
-int list_search_data(t_list *list,void *data,int data_len) {
-
-  t_element *help;
+int list_add_element(t_list *list,void *data,int data_len) {
 
-  help=&(list->start);
+  list_reset(list);
 
-  while(help->next!=NULL) {
-    if(help->next->data_len==data_len) {
-      if(!(memcmp(help->next->data,data,data_len)) {
-        list->current=help->next;
-        return L_SUCCESS;
+  while(list->current!=NULL) {
+    if(data_len==list->current->data_len) {
+      if(!memcmp(list->current->data,data,data_len)) {
+        dprintf(list->outfd,"[list] element already in list\n");
+        return L_ELEMENT_IN_LIST;
       }
     }
-    list->current=list->current->next;
-  }
-
-  return L_NO_SUCH_ELEMENT;
-}
+    if(list->current->next==NULL) {
+      list->current->next=(t_list_element *)malloc(sizeof(t_list_element));
+      if(list->current->next==NULL) {
+        dprintf(list->outfd,"[list] unable to allocate element memory\n");
+        return L_E_MEM;
+      }
+      list->current->next->prev=list->current;
+      list->current->next->next=NULL;
+      if((list->current->next->data=malloc(data_len))==NULL) {
+        dprintf(list->outfd,"[list] unable to allocate data memory\n");
+        return L_E_MEM;
+      }
+      memcpy(list->current->next->data,data,data_len);
+      list->current->next->data_len=data_len;
 
-int list_search_nr(t_list *list,int nr) {
+      list->current=list->current->next;
 
-  list->current=&(list->start);
+      dprintf(list->outfd,"[list] element added\n");
 
-  while(list->current->next!=NULL) {
-    if(list->current->next->number==nr) {
-      list->current=list->current->next;
       return L_SUCCESS;
     }
-    list->current=list->current->next;
+    else list_next(list);
   }
 
-  return L_NO_SUCH_ELEMENT;
+  /* if this is the first element */
+  list->start=(t_list_element *)malloc(sizeof(t_list_element));
+  if(list->start==NULL) {
+    dprintf(list->outfd,"[list] unable to allocate list element memory\n");
+    return L_E_MEM;
+  }
+  if((list->start->data=malloc(data_len))==NULL) {
+    dprintf(list->outfd,"[list] unable to allocate data memory\n");
+    return L_E_MEM;
+  }
+  memcpy(list->start->data,data,data_len);
+  list->start->data_len=data_len;
+  list->start->next=NULL;
+  list->start->prev=NULL;
+
+  list->current=list->start;
+
+  dprintf(list->outfd,"[list] added initial element\n");
+
+  return L_SUCCESS;
 }
 
-int list_append_element(t_list *list,t_list_element *element) {
+int list_count(t_list *list) {
+
+  int count;
+
+  count=0;
 
-  list->current=&(list->start);
+  list_reset(list);
+
+  if(list->current!=NULL) count++;
+  if(count) while(list_next(list)!=L_NO_NEXT_ELEMENT) count++;
+
+  return count;
+}