Move callback functions into the same file

diff --git a/TP_13/exo1/lib/array.c b/TP_13/exo1/lib/array.c
index 0922fe247add3bfe1e833061d2b238a509efb57f..2077b3fde188848225829cb065ee2d01e8bdaeae 100644 (file)
--- a/TP_13/exo1/lib/array.c
+++ b/TP_13/exo1/lib/array.c
@@ -4,7 +4,7 @@
 #include "array.h"
 
 int* create_tab(int tab[], unsigned tab_size) {
-    tab = malloc(sizeof(int) * tab_size);
+    tab = (int*)malloc(sizeof(int) * tab_size);
     if (tab != NULL) {
         /* initialize to zero the integer array */
         for (unsigned i = 0; i < tab_size; i++) {
@@ -43,7 +43,7 @@ int* concat_tab(int tab1[], unsigned tab_size1, int tab2[], unsigned tab_size2)
 }
 
 int* resize_tab(int tab[], unsigned old_tab_size, unsigned new_tab_size) {
-    tab = realloc(tab, sizeof(int) * new_tab_size);
+    tab = (int*)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++) {
@@ -76,15 +76,6 @@ unsigned count_tab_criteria(int tab[], unsigned tab_size, c_criteria_cb c_criter
     return cr_count;
 }
 
-bool is_even(int a) {
-    return (a % 2 == 0);
-}
-
-bool is_odd(int a) {
-    return (a % 2 != 0);
-
-}
-
 void sort_tab(int tab[], unsigned tab_size, s_criteria_cb sort_criteria) {
     sort_bubble_array(tab, tab_size, sort_criteria);
 }

diff --git a/TP_13/exo1/lib/array.h b/TP_13/exo1/lib/array.h
index 4e587541548ad77a00712f73eb710bcbf8e1df27..b31cbc06b7c881c0a2a29741fda597fc2df47024 100644 (file)
--- a/TP_13/exo1/lib/array.h
+++ b/TP_13/exo1/lib/array.h
@@ -5,11 +5,6 @@
 
 #include "sort.h"
 
-typedef bool(*c_criteria_cb)(int a);
-
-bool is_even(int a);
-bool is_odd(int a);
-
 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);

diff --git a/TP_13/exo1/lib/sort.c b/TP_13/exo1/lib/sort.c
index 78625b652f804270487b101ecc07b024dbddc55e..0bd005ed639c0921fcc0ecedab050a2df352137d 100644 (file)
--- a/TP_13/exo1/lib/sort.c
+++ b/TP_13/exo1/lib/sort.c
@@ -1,6 +1,15 @@
 #include "utils.h"
 #include "sort.h"
 
+bool is_even(int a) {
+    return (a % 2 == 0);
+}
+
+bool is_odd(int a) {
+    return (a % 2 != 0);
+
+}
+
 bool ascending(int a, int b) {
     return a > b;
 }

diff --git a/TP_13/exo1/lib/sort.h b/TP_13/exo1/lib/sort.h
index 3c499f7947b4e4835735c25345c3a4257e404652..0dce2136b88ed3cf5d386a074cbebc6b3a786e13 100644 (file)
--- a/TP_13/exo1/lib/sort.h
+++ b/TP_13/exo1/lib/sort.h
@@ -3,6 +3,11 @@
 
 #include <stdbool.h>
 
+typedef bool(*c_criteria_cb)(int a);
+
+bool is_even(int a);
+bool is_odd(int a);
+
 typedef bool(*s_criteria_cb)(int a, int b);
 
 /* sort criteria */