TP 13 exo1: create an array in the main()

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 0c56db6594ba5b9b13563048660f81431b498723..c9a824676c26d89ca5acd337742cb57e8324b9ec 100644 (file)
--- a/TP_13/exo1/lib/array.c
+++ b/TP_13/exo1/lib/array.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 
-#include "sort.h"
+#include "array.h"
 
 int create_tab(int tab[], unsigned tab_size) {
     tab = malloc(sizeof(unsigned) * tab_size);
@@ -17,6 +17,7 @@ void free_tab(int 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++) {
         dest_tab[i + index_offset] = src_tab[i];
     }

diff --git a/TP_13/exo1/lib/array.h b/TP_13/exo1/lib/array.h
index 3bc6573f4af22f8ec7b758027a6d32350cd5f542..9c06bc8eeee90c70d1f927565ca3dfd07ea2ee5e 100644 (file)
--- a/TP_13/exo1/lib/array.h
+++ b/TP_13/exo1/lib/array.h
@@ -1,6 +1,8 @@
 #ifndef ARRAY_H
 #define ARRAY_H
 
+#include "sort.h"
+
 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[]);

diff --git a/TP_13/exo1/src/main.c b/TP_13/exo1/src/main.c
index 315ed331a2007a350bef7fdc06cf70478041aee0..1b93898fe8cea2126dcfd4162f9f95446f0b227f 100644 (file)
--- a/TP_13/exo1/src/main.c
+++ b/TP_13/exo1/src/main.c
@@ -1,8 +1,13 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include "array.h"
+#include "utils.h"
+
 int main() {
-    printf("Hello world\n");
+    int* tab = NULL;
+    create_tab(tab, 11);
+    const unsigned tab_size = ARRAY_SIZE(tab);
 
     exit(EXIT_SUCCESS);
 }