TP 13 exo1: Rename the integer values swap function

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

diff --git a/TP_13/exo1/lib/sort.c b/TP_13/exo1/lib/sort.c
index aef713d8a69db4c9df3dddfda882d349ae06846b..8b196ffe3c6662ad1ec687a117ec09ca0bd70943 100644 (file)
--- a/TP_13/exo1/lib/sort.c
+++ b/TP_13/exo1/lib/sort.c
@@ -13,7 +13,7 @@ static bool sort_first(int* array, int length, criteria_cb criteria) {
     bool rt = false;
     for (int i = 0; i < length-1; i++) {
         if (criteria(array[i], array[i+1])) {
-            swap_int_ptr(&array[i], &array[i+1]);
+            swap_int(&array[i], &array[i+1]);
             if (!rt) { rt = true; };
         }
     }

diff --git a/TP_13/exo1/lib/utils.c b/TP_13/exo1/lib/utils.c
index c48206fed5be5edc6f7f4eab98eb383f1c1b5545..04a20e4e1ed363eb9d7cd229967423bddd4faf50 100644 (file)
--- a/TP_13/exo1/lib/utils.c
+++ b/TP_13/exo1/lib/utils.c
@@ -1,6 +1,6 @@
 #include "utils.h"
 
-void swap_int_ptr(int* v1, int* v2) {
+void swap_int(int* v1, int* v2) {
     int tmp = *v1;
     *v1 = *v2;
     *v2 = tmp;

diff --git a/TP_13/exo1/lib/utils.h b/TP_13/exo1/lib/utils.h
index 1acc243e1441162a6c0362f1fbbf350967fda598..03f1226cd677d034a7285dff4cfe3cc0081ff150 100644 (file)
--- a/TP_13/exo1/lib/utils.h
+++ b/TP_13/exo1/lib/utils.h
@@ -1,7 +1,9 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-void swap_int_ptr(int* v1, int* v2);
+#include "macros.h"
+
+void swap_int(int* v1, int* v2);
 void swap_ptr(void* v1, void* v2);
 
 #endif /* UTILS_H */

diff --git a/TP_13/exo1/src/main.c b/TP_13/exo1/src/main.c
index 68b30087ae455f71e44db62e49cbb62f8161bac1..06f5f8d66140d669cb3a97bedd47405c4593e2f5 100644 (file)
--- a/TP_13/exo1/src/main.c
+++ b/TP_13/exo1/src/main.c
@@ -1,7 +1,5 @@
 #include <stdio.h>
 
-#include "macros.h"
-
 int main() {
     printf("Hello world\n");