TP 11 exo1: simplify the logic in the array creation and resizing

[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 0c56db6594ba5b9b13563048660f81431b498723..d2e6182808f6dea9fa87ff335d02771d6782c58f 100644 (file)
--- a/TP_13/exo1/lib/array.c
+++ b/TP_13/exo1/lib/array.c
@@ -1,42 +1,42 @@
 #include <stdlib.h>
 
-#include "sort.h"
-
-int create_tab(int tab[], unsigned tab_size) {
-    tab = malloc(sizeof(unsigned) * tab_size);
-    if (tab == NULL) {
-        return -1;
-    } else {
-        return 0;
+#include "array.h"
+
+int* create_tab(int tab[], unsigned tab_size) {
+    tab = malloc(sizeof(int) * tab_size);
+    if (tab != NULL) {
+        /* initialize to zero the integer array */
+        for (unsigned i = 0; i < tab_size; i++) {
+            tab[i] = 0;
+        }
     }
+    return tab;
 }
 
 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) {
-    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);
-    if (tab == NULL) {
-        return -1;
-    } else {
-        return 0;
-    }
+int* resize_tab(int tab[], unsigned new_tab_size) {
+    tab = realloc(tab, sizeof(int) * new_tab_size);
+    return tab;
 }
 
 /* number of occurences of an element in an unsorted array  */