TP_13: Port the buildsystem to Mac OS X

[TD_C.git] / TP_13 / exo2 / lib / display.c

diff --git a/TP_13/exo2/lib/display.c b/TP_13/exo2/lib/display.c
index c60268a5dd80b783ae0b04ebf2f5a0093ea47ced..34343a05e215d7f91bf72025bd96799cfd7b778f 100644 (file)
--- a/TP_13/exo2/lib/display.c
+++ b/TP_13/exo2/lib/display.c
@@ -3,7 +3,7 @@
  *
  *       Filename:  display.c
  *
- *    Description:  Routines to handle the display 
+ *    Description:  Routines to handle the display
  *
  *        Version:  1.0
  *        Created:  15/03/2017 20:06:11
@@ -36,16 +36,16 @@ void print_board(int y, int x) {
     mvprintw(y+7, x, "    |    |");
 }
 
-/* there's only nine valid (y, x) 2-uplets for this two shapes 
+/* there's only nine valid (y, x) 2-uplets for this two shapes
  * that are : - base_y, base_x +1
  *            - base_y, base_x + 6
- *            - base_y, base_x + 11 
- *            - base_y + 3, base_x + 1 
- *            - base_y + 6, base_x + 1 
- *            - base_y + 3, base_x + 6 
- *            - base_y + 3, base_x + 11 
- *            - base_y + 6, base_x + 6 
- *            - base_y + 6, base_x + 11 
+ *            - base_y, base_x + 11
+ *            - base_y + 3, base_x + 1
+ *            - base_y + 6, base_x + 1
+ *            - base_y + 3, base_x + 6
+ *            - base_y + 3, base_x + 11
+ *            - base_y + 6, base_x + 6
+ *            - base_y + 6, base_x + 11
  * The added (y, x) couple values can be {0, 3, 6}x{1, 6, 11}
  */
 
@@ -71,9 +71,7 @@ static int remap_y(int y) {
     } else if (y > 1 && y <= 3) {
         return (remap_y(y - 1) + 3);
     }  else {
-        /* FIXME: return an error value like -1
-         * but for now there a bug somewhere */
-        return 6;
+        return -1;
     }
 }
 
@@ -84,16 +82,15 @@ static int remap_x(int x) {
     } else if (x > 1 && x <= 3) {
         return (remap_x(x - 1) + 5);
     } else {
-        /* FIXME: return an error value like -1
-         * but for now there a bug somewhere */
-        return 11;
+        return -1;
     }
 }
 
 void print_coordinates(coordinates_t coordinates_array[], int base_y, int base_x) {
     unsigned i = 0;
 
-    while ((coordinates_array + i)->y != 0 && (coordinates_array + i)->x != 0 && i < MAX_COORDINATES) {
+    while ((coordinates_array + i)->y != 0 && (coordinates_array + i)->x != 0 && \
+            i < MAX_COORDINATES) {
         if ((coordinates_array + i)->type == 0) {
             print_o(base_y + remap_y((coordinates_array + i)->y), base_x + remap_x((coordinates_array + i)->x));
         } else {