TP 13 exo1: Give more explicits name to callbacks

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 57c15def73cb8cebe2e6bbea5ec6d0bb2fc12a08..db8ab7e408d625d00db9873d5c363d5d22d1e0c8 100644 (file)
--- a/TP_13/exo1/lib/array.c
+++ b/TP_13/exo1/lib/array.c
@@ -63,7 +63,7 @@ unsigned count_tab_element(int tab[], unsigned tab_size, int element) {
     return el_count;
 }
 
-unsigned count_tab_criteria(int tab[], unsigned tab_size, count_criteria_cb c_criteria) {
+unsigned count_tab_criteria(int tab[], unsigned tab_size, c_criteria_cb c_criteria) {
     unsigned cr_count = 0;
 
     for (unsigned i = 0; i < tab_size; i++) {
@@ -83,6 +83,6 @@ bool is_odd(int a) {
 
 }
 
-void sort_tab(int tab[], unsigned tab_size, criteria_cb criteria) {
-    sort_bubble_array(tab, tab_size, criteria);
+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 216fa0aa0b3f2b01e2c7b9ec2e8a0129f90a4dd0..4e587541548ad77a00712f73eb710bcbf8e1df27 100644 (file)
--- a/TP_13/exo1/lib/array.h
+++ b/TP_13/exo1/lib/array.h
@@ -5,7 +5,7 @@
 
 #include "sort.h"
 
-typedef bool(*count_criteria_cb)(int a);
+typedef bool(*c_criteria_cb)(int a);
 
 bool is_even(int a);
 bool is_odd(int a);
@@ -15,7 +15,7 @@ void free_tab(int tab[]);
 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);
 unsigned count_tab_element(int tab[], unsigned tab_size, int element);
-unsigned count_tab_criteria(int tab[], unsigned tab_size, count_criteria_cb c_criteria);
-void sort_tab(int tab[], unsigned tab_size, criteria_cb criteria);
+unsigned count_tab_criteria(int tab[], unsigned tab_size, c_criteria_cb c_criteria);
+void sort_tab(int tab[], unsigned tab_size, s_criteria_cb sort_criteria);
 
 #endif /* ARRAY_H */

diff --git a/TP_13/exo1/lib/io.c b/TP_13/exo1/lib/io.c
index 884d4a0b730f1d6e266628f326866a4e829112a2..e5a300070d24305638d8f140b866b480950a93d6 100644 (file)
--- a/TP_13/exo1/lib/io.c
+++ b/TP_13/exo1/lib/io.c
@@ -50,7 +50,7 @@ void do_sort(int array[], unsigned size) {
     int errno = 0;
     int choice = 0;
     bool done = false;
-    criteria_cb criteria;
+    s_criteria_cb sort_criteria;
 
     printf("\n=== Menu de tri ===\n\n");
     printf("1) Croissant.\n");
@@ -68,23 +68,23 @@ void do_sort(int array[], unsigned size) {
     } while (!done);
     switch (choice) {
         case 1:
-            criteria = ascending;
+            sort_criteria = ascending;
             break;
         case 2:
-            criteria = descending;
+            sort_criteria = descending;
             break;
         case 3:
-            criteria = ascending_and_even;
+            sort_criteria = ascending_and_even;
             break;
         case 4:
-            criteria = ascending_and_odd;
+            sort_criteria = ascending_and_odd;
             break;
         default:
             /* sort ascending by default, unused code path */
-            criteria = ascending;
+            sort_criteria = ascending;
             break;
     }
-    sort_tab(array, size, criteria);
+    sort_tab(array, size, sort_criteria);
 }
 
 void do_count(int array[], unsigned size) {
@@ -102,6 +102,8 @@ void do_resize(int array[], unsigned* old_size) {
 
     errno = prompt_value("\nNouvelle taille?", (int*)&new_size);
     handle_prompt_error(errno);
+    /* FIXME: one should able the set the array new content if new_size > *old_size 
+     * for now, new values are zeroed */
     array = resize_tab(array, *old_size, new_size);
     *old_size = new_size;
 }

diff --git a/TP_13/exo1/lib/sort.c b/TP_13/exo1/lib/sort.c
index 01a742f7966d557ff7724409bbfa2f9e4fa48ce2..78625b652f804270487b101ecc07b024dbddc55e 100644 (file)
--- a/TP_13/exo1/lib/sort.c
+++ b/TP_13/exo1/lib/sort.c
@@ -19,10 +19,10 @@ bool ascending_and_odd(int a, int b) {
                 || ((a % 2 != 0) && (b % 2 != 0) && ascending(a, b)));
 }
 
-static bool sort_first(int* array, unsigned length, criteria_cb criteria) {
+static bool sort_first(int* array, unsigned length, s_criteria_cb sort_criteria) {
     bool rt = false;
     for (unsigned i = 0; i < length-1; i++) {
-        if (criteria(array[i], array[i+1])) {
+        if (sort_criteria(array[i], array[i+1])) {
             swap_int(&array[i], &array[i+1]);
             rt = true;
         }
@@ -31,9 +31,9 @@ static bool sort_first(int* array, unsigned length, criteria_cb criteria) {
 }
 
 /* the feature of this function is awaited in the array.c file */
-void sort_bubble_array(int* array, unsigned length, criteria_cb criteria) {
+void sort_bubble_array(int* array, unsigned length, s_criteria_cb sort_criteria) {
     bool rt;
     do {
-        rt = sort_first(array, length, criteria);
+        rt = sort_first(array, length, sort_criteria);
    } while (rt);
 }

diff --git a/TP_13/exo1/lib/sort.h b/TP_13/exo1/lib/sort.h
index 8986302931f4fe68402a8acc9b3f47ce34732803..3c499f7947b4e4835735c25345c3a4257e404652 100644 (file)
--- a/TP_13/exo1/lib/sort.h
+++ b/TP_13/exo1/lib/sort.h
@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-typedef bool(*criteria_cb)(int a, int b);
+typedef bool(*s_criteria_cb)(int a, int b);
 
 /* sort criteria */
 bool ascending(int a, int b);
@@ -11,6 +11,6 @@ bool descending(int a, int b);
 bool ascending_and_even(int a, int b);
 bool ascending_and_odd(int a, int b);
 
-void sort_bubble_array(int* array, unsigned length, criteria_cb criteria);
+void sort_bubble_array(int* array, unsigned length, s_criteria_cb sort_criteria);
 
 #endif /* SORT_H */