From: Jérôme Benoit <jerome.benoit@piment-noir.org>
Date: Mon, 13 Mar 2017 13:45:14 +0000 (+0100)
Subject: TP 13 exo1: return the dynamic array created or modified when necessary
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=34f864c6720b5e480db66430a218e2fd54743ce7;p=TD_C.git

TP 13 exo1: return the dynamic array created or modified when necessary

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
---

diff --git a/TP_13/exo1/lib/array.c b/TP_13/exo1/lib/array.c
index c9a8246..f7e324f 100644
--- a/TP_13/exo1/lib/array.c
+++ b/TP_13/exo1/lib/array.c
@@ -2,12 +2,16 @@
 
 #include "array.h"
 
-int create_tab(int tab[], unsigned tab_size) {
-    tab = malloc(sizeof(unsigned) * tab_size);
+int* create_tab(int tab[], unsigned tab_size) {
+    tab = malloc(sizeof(int) * tab_size);
     if (tab == NULL) {
-        return -1;
+        return NULL;
     } else {
-        return 0;
+        /* initialize to zero the integer array */
+        for (unsigned i = 0; i < tab_size; i++) {
+            tab[i] = 0;
+        }
+        return tab;
     }
 }
 
@@ -15,28 +19,29 @@ void free_tab(int tab[]) {
     free(tab);
 }
 
-/* we suppose both tab are already created */
-static void copy_tab(int src_tab[], int dest_tab[], unsigned min_tab_size, unsigned index_offset) {
-    /* FIXME: I think it's worth doing some sanity check on the array size */
-    for (unsigned i = 0; i < min_tab_size; i++) {
+/* we suppose both tabs are already created */
+static void copy_tab(int src_tab[], int dest_tab[], unsigned src_tab_size, unsigned index_offset) {
+    /* FIXME: I think it's worth doing some sanity checks on the array size:
+     * dest_tab_size >= src_tab_size */
+    for (unsigned i = 0; i < src_tab_size; i++) {
         dest_tab[i + index_offset] = src_tab[i];
     }
 }
 
-int concat_tab(int tab1[], unsigned tab_size1, int tab2[], unsigned tab_size2, int tab_dest[]) {
-    int rt = create_tab(tab_dest, tab_size1 + tab_size2);
+int* concat_tab(int tab1[], unsigned tab_size1, int tab2[], unsigned tab_size2, int tab_dest[]) {
+    int* rt = create_tab(tab_dest, tab_size1 + tab_size2);
 
     copy_tab(tab1, tab_dest, tab_size1, 0);
     copy_tab(tab2, tab_dest, tab_size2, tab_size1);
     return rt;
 }
 
-int resize_tab(int tab[], unsigned tab_size) {
-    tab = realloc(tab, sizeof(int) * tab_size);
+int* resize_tab(int tab[], unsigned new_tab_size) {
+    tab = realloc(tab, sizeof(int) * new_tab_size);
     if (tab == NULL) {
-        return -1;
+        return NULL;
     } else {
-        return 0;
+        return tab;
     }
 }
 
diff --git a/TP_13/exo1/lib/array.h b/TP_13/exo1/lib/array.h
index 9c06bc8..18596b2 100644
--- a/TP_13/exo1/lib/array.h
+++ b/TP_13/exo1/lib/array.h
@@ -3,10 +3,10 @@
 
 #include "sort.h"
 
-int create_tab(int tab[], unsigned tab_size);
+int* create_tab(int tab[], unsigned tab_size);
 void free_tab(int tab[]);
-int concat_tab(int tab1[], unsigned tab_size1, int tab2[], unsigned tab_size2, int tab_dest[]);
-int resize_tab(int tab[], unsigned tab_size);
+int* concat_tab(int tab1[], unsigned tab_size1, int tab2[], unsigned tab_size2, int tab_dest[]);
+int* resize_tab(int tab[], unsigned tab_size);
 int count_tab_element(int tab[], unsigned tab_size, int element);
 void sort_tab(int tab[], unsigned tab_size, criteria_cb criteria);
 
diff --git a/TP_13/exo1/lib/io.c b/TP_13/exo1/lib/io.c
index 4af0b66..2df5134 100644
--- a/TP_13/exo1/lib/io.c
+++ b/TP_13/exo1/lib/io.c
@@ -9,7 +9,9 @@ int prompt_value(const char* msg, int* result) {
 }
 
 void display_array(int* array, int size) {
+    printf("--array begin--\n");
     for (int i = 0; i < size; i++) {
         printf("value in array at index[%d]=%d\n", i, array[i]);
     }
+    printf("--array end--\n");
 }
diff --git a/TP_13/exo1/src/main.c b/TP_13/exo1/src/main.c
index 1b93898..658930e 100644
--- a/TP_13/exo1/src/main.c
+++ b/TP_13/exo1/src/main.c
@@ -3,11 +3,22 @@
 
 #include "array.h"
 #include "utils.h"
+#include "io.h"
 
 int main() {
     int* tab = NULL;
-    create_tab(tab, 11);
-    const unsigned tab_size = ARRAY_SIZE(tab);
+    const unsigned tab_size = 11;
+    tab = create_tab(tab, tab_size);
 
+    printf("%d\n", tab_size);
+
+    display_array(tab, tab_size);
+
+    const unsigned tab_new_size = 20;
+    tab = resize_tab(tab, tab_new_size);
+
+    display_array(tab, tab_new_size);
+
+    free_tab(tab);
     exit(EXIT_SUCCESS);
 }