TP 13 exo1: Only free when needed the array

[TD_C.git] / TP_13 / exo1 / lib / array.c

diff --git a/TP_13/exo1/lib/array.c b/TP_13/exo1/lib/array.c
index 7743ca5132345894f8423c7287bb522411537b8d..4445ca81fa00178d9b78d9b07f2656597300aa0a 100644 (file)
--- a/TP_13/exo1/lib/array.c
+++ b/TP_13/exo1/lib/array.c
@@ -15,7 +15,8 @@ int* create_tab(int tab[], unsigned tab_size) {
 }
 
 void free_tab(int tab[]) {
-    free(tab);
+    if (!tab)
+        free(tab);
 }
 
 /* we suppose both tabs are already created */
@@ -41,8 +42,14 @@ int* concat_tab(int tab1[], unsigned tab_size1, int tab2[], unsigned tab_size2)
     return tab_dest;
 }
 
-int* resize_tab(int tab[], unsigned new_tab_size) {
+int* resize_tab(int tab[], unsigned old_tab_size, unsigned new_tab_size) {
     tab = realloc(tab, sizeof(int) * new_tab_size);
+    /* zero by default the added cells */
+    if (old_tab_size < new_tab_size) {
+        for (unsigned i = old_tab_size; i < new_tab_size; i++) {
+            tab[i] = 0;
+        }
+    }
     return tab;
 }
 
@@ -58,7 +65,7 @@ unsigned count_tab_element(int tab[], unsigned tab_size, int element) {
     return el_count;
 }
 
-unsigned count_tab_criteria(int tab[], unsigned tab_size, count_criteria_cb c_criteria) {
+unsigned count_tab_criteria(int tab[], unsigned tab_size, c_criteria_cb c_criteria) {
     unsigned cr_count = 0;
 
     for (unsigned i = 0; i < tab_size; i++) {
@@ -78,6 +85,6 @@ bool is_odd(int a) {
 
 }
 
-void sort_tab(int tab[], unsigned tab_size, criteria_cb criteria) {
-    sort_bubble_array(tab, tab_size, criteria);
+void sort_tab(int tab[], unsigned tab_size, s_criteria_cb sort_criteria) {
+    sort_bubble_array(tab, tab_size, sort_criteria);
 }