X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=TP_9%2Fexo2%2Fclist.c;h=edc296473e54c3910d0d4ea5fe3c3058aaf2913a;hb=748013584ebb9924f1300e733e31ef8a8ee80a0a;hp=0aa9e37da73e1271d043a5a82796f75742999754;hpb=0d650b413a907f0fd4e78ee1500c196e9fd41d9f;p=TD_C.git

diff --git a/TP_9/exo2/clist.c b/TP_9/exo2/clist.c
index 0aa9e37..edc2964 100644
--- a/TP_9/exo2/clist.c
+++ b/TP_9/exo2/clist.c
@@ -3,11 +3,11 @@
 #include "clist.h"
 
 link_t* list_new(int value) {
-    link_t* link_t_new;	
-    link_t_new = malloc(sizeof(link_t));
-    link_t_new->value = value;
-    link_t_new->next = NULL;
-    return link_t_new;
+    link_t* link_new;	
+    link_new = malloc(sizeof(link_t));
+    link_new->value = value;
+    link_new->next = NULL;
+    return link_new;
 }
 
 link_t* list_append(link_t* head, int value) {
@@ -32,33 +32,38 @@ link_t* list_prepend(link_t* head, int value) {
 }
 
 link_t* list_insert(link_t* head, unsigned index, int value) {
-    link_t* link_insrt = list_new(value);  
-    link_t* head_first = head;
-    //link_t* head_prev = NULL;
-    link_t* head_next = NULL;
 
-    for (unsigned i = 0; i < index; i++) {
-        head = head->next;
+    if (index == 0) {
+        return list_prepend(head, value);  
+    } else if (index == list_count(head)) {
+        return list_append(head, value);
+    } else {
+        link_t* link_insrt = list_new(value);  
+        link_t* head_first = head;
+        link_t* head_next = NULL;
+        for (unsigned i = 0; i < index-1; i++) {
+            head = head->next;
+        }
+        head_next = head->next;
+        head->next = link_insrt;
+        head = link_insrt;
+        head->next = head_next; 
+        return head_first;
     }
-    //head_prev = head;
-    head->next = link_insrt;
-    head_next = head->next;
-    head = link_insrt;
-    head->next = head_next; 
-    return head_first;
 }
 
 link_t* list_delete(link_t* head, unsigned index) {
-    link_t* head_first = head;
     link_t* head_prev = NULL;
     link_t* head_next = NULL;
+    link_t* head_ret = NULL;
    
     if (index == 0) {
         head_next = head->next;
         free(head);
         head = head_next;
-        return head;
+        head_ret = head;
     } else {
+        link_t* head_first = head;
         for (unsigned i = 0; i < index-1; i++) {
             head = head->next;
         }
@@ -68,16 +73,19 @@ link_t* list_delete(link_t* head, unsigned index) {
         free(head);
         head = head_prev;
         head->next = head_next;
-        return head_first;
+        head_ret = head_first;
+    }
+    if (head_ret != NULL) {
+        return head_ret;
+    } else {
+        return NULL;
     }
 }
 
 unsigned list_count(link_t* head) {
     int count = 0;
     
-    if (head == NULL) { return count; }
-    count = 1;
-    while (head->next != NULL) {
+    while (head != NULL) {
         ++count;
         head = head->next;
     } 
@@ -85,31 +93,35 @@ unsigned list_count(link_t* head) {
 }
 
 void list_set(link_t* head, unsigned index, int value) {
+    unsigned count = 0;
 
-    //FIXME: check for the index value validity
-    for (unsigned count = 0; count < index; count++) {
+    while (head != NULL && count < index) {
+        ++count;
         head = head->next;
     }
-    head->value = value;
+    if (head != NULL) { head->value = value; }
 }
 
 int list_get(link_t* head, unsigned index) {
-    
-    if (index < list_count(head)) {
-        for (unsigned i = 0; i < index; i++) {
-            head = head->next; 
-        }
+    unsigned count = 0;    
+
+    while (head != NULL && count < index) {
+        ++count;
+        head = head->next; 
+    }
+    if (head != NULL) { 
         return head->value;
-    } else { 
+    } else {
         return -1;
     }
 }
 
-void list_clear(link_t* link) {
+void list_clear(link_t* head) {
+    link_t* next_link = NULL;
 
-    while (link != NULL) {
-        link_t* next_link = link->next;
-        free(link);
-        link = next_link;
+    while (head != NULL) {
+        next_link = head->next;
+        free(head);
+        head = next_link;
     }
 }