full adaptation to c99

diff --git a/block.c b/block.c
index 3460d0305246bdce34dd5174d5878bd79c267454..ffb4a427a07b1dde59c5d6f127917c68a3480116 100644 (file)
--- a/block.c
+++ b/block.c
@@ -50,9 +50,8 @@ static int _color_trans (_color_t c)
 }
 
 static void _init_color_pairs () {
 }
 
 static void _init_color_pairs () {

-    int fg, bg;
-    for (bg = 0; bg < 8; bg++) {
-        for (fg = 0; fg < 8; fg ++) {
+    for (int bg = 0; bg < 8; bg++) {
+        for (int fg = 0; fg < 8; fg ++) {

             init_pair (_color_num (fg, bg), _color_trans (fg), _color_trans (bg));
         }
     }
             init_pair (_color_num (fg, bg), _color_trans (fg), _color_trans (bg));
         }
     }

diff --git a/display.c b/display.c
index 3e709519e3dbd687404b6026e1883d0a85701026..a3cbf26a4040b7c7665f61e14a26d827e8de90d6 100644 (file)
--- a/display.c
+++ b/display.c
@@ -32,8 +32,7 @@ int _helpwindow (char *msg, int xoffset, int yoffset, int length)
 
 void _displaytitle (char *title, int xoffset, int yoffset)
 {
 
 void _displaytitle (char *title, int xoffset, int yoffset)
 {

-    int i;
-    for (i = 0; title[i] != '\0'; i++) {
+    for (int i = 0; title[i] != '\0'; i++) {

         mvaddch (yoffset, xoffset + i, title[i]);
         mvaddch (yoffset + 1, xoffset + i, ACS_HLINE);
     }
         mvaddch (yoffset, xoffset + i, title[i]);
         mvaddch (yoffset + 1, xoffset + i, ACS_HLINE);
     }


@@ -41,13 +40,11 @@ void _displaytitle (char *title, int xoffset, int yoffset)
 
 void _dobound (int xsize, int ysize, int xoffset, int yoffset)
 {
 
 void _dobound (int xsize, int ysize, int xoffset, int yoffset)
 {

-    int i, j;
-
-    for (i = 0; i < xsize; i++) {
+    for (int i = 0; i < xsize; i++) {

         mvaddch (yoffset - 1, xoffset + i, ACS_HLINE);
         mvaddch (yoffset + ysize, xoffset + i, ACS_HLINE);
     }
         mvaddch (yoffset - 1, xoffset + i, ACS_HLINE);
         mvaddch (yoffset + ysize, xoffset + i, ACS_HLINE);
     }

-    for (j = 0; j < ysize; j++) {
+    for (int j = 0; j < ysize; j++) {

         mvaddch (yoffset + j, xoffset - 1, ACS_VLINE);
         mvaddch (yoffset + j, xoffset + xsize, ACS_VLINE);
     }
         mvaddch (yoffset + j, xoffset - 1, ACS_VLINE);
         mvaddch (yoffset + j, xoffset + xsize, ACS_VLINE);
     }


@@ -149,14 +146,12 @@ void _element (board_t *board, int x, int y, int symb)
 
 void boardwindow (board_t *board, int mode)
 {
 
 void boardwindow (board_t *board, int mode)
 {

-    int i, j;
-

     setcolor (mode ? gray_black : black_gray);
     _dobound (board->xsize, board->ysize, board->xoffset, board->yoffset);
     setcolor (gray_black);
 
     setcolor (mode ? gray_black : black_gray);
     _dobound (board->xsize, board->ysize, board->xoffset, board->yoffset);
     setcolor (gray_black);
 

-    for (i = 0; i < board->width; i++) {
-        for (j = 0; j < board->height; j++) {
+    for (int i = 0; i < board->width; i++) {
+        for (int j = 0; j < board->height; j++) {

             _element (board, i, j, *getcell (board, i, j));
         }
     }
             _element (board, i, j, *getcell (board, i, j));
         }
     }


@@ -190,8 +185,6 @@ void scorewindow (int xoffset, int yoffset, int length, int score, int score2, i
 
 void displayblock (board_t *board, block_t *block, int x, int y)
 {
 
 void displayblock (board_t *board, block_t *block, int x, int y)
 {

-    int i, j;
-

     if (x == -1) {
         x = board->width / 2;
     }
     if (x == -1) {
         x = board->width / 2;
     }


@@ -200,8 +193,8 @@ void displayblock (board_t *board, block_t *block, int x, int y)
         y = (board->height - block->height) / 2;
     }
 
         y = (board->height - block->height) / 2;
     }
 

-    for (i = 0; i < block->width; i++) {
-        for (j = 0; j < block->height; j++) {
+    for (int i = 0; i < block->width; i++) {
+        for (int j = 0; j < block->height; j++) {

             if (*getcell (block, i, j) != ' ') {
                 _element (board, x - block->width / 2 + i, y + j, '0' + block->color);
             }
             if (*getcell (block, i, j) != ' ') {
                 _element (board, x - block->width / 2 + i, y + j, '0' + block->color);
             }


@@ -219,10 +212,10 @@ char *savewindow (int length, int xoffset, int yoffset)
     _dobound (length, 1, xoffset, yoffset);
     setcolor (gray_black);
 
     _dobound (length, 1, xoffset, yoffset);
     setcolor (gray_black);
 

-    int i = 0, j;
+    int i = 0;

     int stop = 0;
     while (!stop) {
     int stop = 0;
     while (!stop) {

-        for (j = 0; j < length; j++) {
+        for (int j = 0; j < length; j++) {

             setcolor ((j == i) ? yellow_black : black_gray);
             mvaddch (yoffset, xoffset + j, name[j]);
             setcolor (gray_black);
             setcolor ((j == i) ? yellow_black : black_gray);
             mvaddch (yoffset, xoffset + j, name[j]);
             setcolor (gray_black);


@@ -267,7 +260,7 @@ char *savewindow (int length, int xoffset, int yoffset)
     }
 
     if (name) {
     }
 
     if (name) {

-        for (j = length - 1; j >= 0; j--) {
+        for (int j = length - 1; j >= 0; j--) {

             if (name[j] == ' ') {
                 name[j] = '\0';
             }
             if (name[j] == ' ') {
                 name[j] = '\0';
             }


@@ -286,8 +279,7 @@ void msgwindow (char *msg, int xoffset, int yoffset, int length)
     setcolor (gray_black);
     _dobound ((length > 0) ? length : (int)strlen (msg), 1, xoffset, yoffset);
     if (length > 0) {
     setcolor (gray_black);
     _dobound ((length > 0) ? length : (int)strlen (msg), 1, xoffset, yoffset);
     if (length > 0) {

-        int i;
-        for (i = 0; i < length; i++) {
+        for (int i = 0; i < length; i++) {

             mvaddch (yoffset, xoffset + i, ' ');
         }
     }
             mvaddch (yoffset, xoffset + i, ' ');
         }
     }

diff --git a/function.c b/function.c
index ac067b83dfef18fa2b753641edcf0913abf5343d..a26d8facc35461058d4fde3c9f5b0d8107481388 100644 (file)
--- a/function.c
+++ b/function.c
@@ -102,10 +102,10 @@ void freeboard (board_t *board)
 
 int _makecomments (char *buffer, board_t *board)
 {
 
 int _makecomments (char *buffer, board_t *board)
 {

-    int i, j, l = 0;
-    for (j = 0; j < board->height; j++) {
+    int l = 0;
+    for (int j = 0; j < board->height; j++) {

         l += sprintf (buffer + l, "rem: \"");
         l += sprintf (buffer + l, "rem: \"");

-        for (i = 0; i < board->width; i++) {
+        for (int i = 0; i < board->width; i++) {

             l += sprintf (buffer + l, "%c", *getcell (board, i, j));
         }
         l += sprintf (buffer + l, "\"\n");
             l += sprintf (buffer + l, "%c", *getcell (board, i, j));
         }
         l += sprintf (buffer + l, "\"\n");


@@ -288,9 +288,8 @@ block_t *copyblock (block_t *block)
 
 int maxblockheight (block_t *blocks, int nb)
 {
 
 int maxblockheight (block_t *blocks, int nb)
 {

-    int i;

     int height = 0;
     int height = 0;

-    for (i = 0; i < nb; i++) {
+    for (int i = 0; i < nb; i++) {

         if (height < (blocks + i)->height) {
             height = (blocks + i)->height;
         }
         if (height < (blocks + i)->height) {
             height = (blocks + i)->height;
         }


@@ -300,9 +299,8 @@ int maxblockheight (block_t *blocks, int nb)
 
 int maxblockwidth (block_t *blocks, int nb)
 {
 
 int maxblockwidth (block_t *blocks, int nb)
 {

-    int i;

     int width = 0;
     int width = 0;

-    for (i = 0; i < nb; i++) {
+    for (int i = 0; i < nb; i++) {

         if (width < (blocks + i)->width) {
             width = (blocks + i)->width;
         }
         if (width < (blocks + i)->width) {
             width = (blocks + i)->width;
         }


@@ -320,8 +318,6 @@ void freeblock (block_t *block)
 
 block_t *rotateblock (block_t *block, int rot)
 {
 
 block_t *rotateblock (block_t *block, int rot)
 {

-    int i, j;
-

     rot = (rot > 0) ? rot % 4 : ((1 - rot / 4) * 4 + rot) % 4;
 
     block_t *newblock = NULL;
     rot = (rot > 0) ? rot % 4 : ((1 - rot / 4) * 4 + rot) % 4;
 
     block_t *newblock = NULL;


@@ -333,8 +329,8 @@ block_t *rotateblock (block_t *block, int rot)
     case 1:
         newblock = initblock (block->height, block->width);
         newblock->color = block->color;
     case 1:
         newblock = initblock (block->height, block->width);
         newblock->color = block->color;

-        for (i = 0; i < block->width; i++) {
-            for (j = 0; j < block->height; j++) {
+        for (int i = 0; i < block->width; i++) {
+            for (int j = 0; j < block->height; j++) {

                 *getcell (newblock, block->height - 1 - j, i) = *getcell (block, i, j);
             }
         }
                 *getcell (newblock, block->height - 1 - j, i) = *getcell (block, i, j);
             }
         }


@@ -342,8 +338,8 @@ block_t *rotateblock (block_t *block, int rot)
     case 2:
         newblock = initblock (block->width, block->height);
         newblock->color = block->color;
     case 2:
         newblock = initblock (block->width, block->height);
         newblock->color = block->color;

-        for (i = 0; i < block->width; i++) {
-            for (j = 0; j < block->height; j++) {
+        for (int i = 0; i < block->width; i++) {
+            for (int j = 0; j < block->height; j++) {

                 *getcell (newblock, block->width - 1 - i, block->height - 1 - j) = *getcell (block, i, j);
             }
         }
                 *getcell (newblock, block->width - 1 - i, block->height - 1 - j) = *getcell (block, i, j);
             }
         }


@@ -351,8 +347,8 @@ block_t *rotateblock (block_t *block, int rot)
     case 3:
         newblock = initblock (block->height, block->width);
         newblock->color = block->color;
     case 3:
         newblock = initblock (block->height, block->width);
         newblock->color = block->color;

-        for (i = 0; i < block->width; i++) {
-            for (j = 0; j < block->height; j++) {
+        for (int i = 0; i < block->width; i++) {
+            for (int j = 0; j < block->height; j++) {

                 *getcell (newblock, j, block->width - 1 - i) = *getcell (block, i, j);
             }
         }
                 *getcell (newblock, j, block->width - 1 - i) = *getcell (block, i, j);
             }
         }


@@ -372,9 +368,8 @@ int testvalidpos (board_t *board, block_t *block, int x, int y)
         (y + block->height > board->height)) {
        ret = 0;
     } else {
         (y + block->height > board->height)) {
        ret = 0;
     } else {

-        int i, j;
-        for (i = 0; i < block->width; i++) {
-            for (j = 0; j < block->height; j++) {
+        for (int i = 0; i < block->width; i++) {
+            for (int j = 0; j < block->height; j++) {

                 if (*getcell (block, i, j) == '.') {
                     if (*getcell (board, x - block->width / 2 + i, y + j) != ' ') {
                         ret = 0;
                 if (*getcell (block, i, j) == '.') {
                     if (*getcell (board, x - block->width / 2 + i, y + j) != ' ') {
                         ret = 0;


@@ -388,9 +383,8 @@ int testvalidpos (board_t *board, block_t *block, int x, int y)
 
 void settleblock (board_t *board, block_t *block, int x, int y)
 {
 
 void settleblock (board_t *board, block_t *block, int x, int y)
 {

-    int i, j;
-    for (i = 0; i < block->width; i++) {
-        for (j = 0; j < block->height; j++) {
+    for (int i = 0; i < block->width; i++) {
+        for (int j = 0; j < block->height; j++) {

             if (*getcell (block, i, j) == '.') {
                 *getcell (board, x - block->width / 2 + i, y + j) = '0' + block->color;
             }
             if (*getcell (block, i, j) == '.') {
                 *getcell (board, x - block->width / 2 + i, y + j) = '0' + block->color;
             }


@@ -401,10 +395,9 @@ void settleblock (board_t *board, block_t *block, int x, int y)
 int checkline (board_t *board, int *score, int *lines)
 {
     int nb = 0;
 int checkline (board_t *board, int *score, int *lines)
 {
     int nb = 0;

-    int i, j;
-    for (j = 0; j < board->height; j++) {
+    for (int j = 0; j < board->height; j++) {

         int isfull = 1;
         int isfull = 1;

-        for (i = 0; i < board->width; i++) {
+        for (int i = 0; i < board->width; i++) {

             if (*getcell (board, i, j) == ' ') {
                 isfull = 0;
                 break;
             if (*getcell (board, i, j) == ' ') {
                 isfull = 0;
                 break;


@@ -412,7 +405,7 @@ int checkline (board_t *board, int *score, int *lines)
         }
         if (isfull) {
             nb++;
         }
         if (isfull) {
             nb++;

-            for (i = 0; i < board->width; i++) {
+            for (int i = 0; i < board->width; i++) {

                 *getcell (board, i, j) = ' ';
             }
         }
                 *getcell (board, i, j) = ' ';
             }
         }


@@ -426,11 +419,9 @@ int checkline (board_t *board, int *score, int *lines)
 
 void stackboard (board_t *board)
 {
 
 void stackboard (board_t *board)
 {

-    int i, j;
-
-    for (j = board->height - 1; j >= 0; j--) {
+    for (int j = board->height - 1; j >= 0; j--) {

         int isempty = 1;
         int isempty = 1;

-        for (i = 0; i < board->width; i++) {
+        for (int i = 0; i < board->width; i++) {

             if (*getcell (board, i, j) != ' ') {
                 isempty = 0;
                 break;
             if (*getcell (board, i, j) != ' ') {
                 isempty = 0;
                 break;


@@ -438,7 +429,7 @@ void stackboard (board_t *board)
         }
         if (isempty) {
             while (j > 0) {
         }
         if (isempty) {
             while (j > 0) {

-                for (i = 0; i < board->width; i++) {
+                for (int i = 0; i < board->width; i++) {

                     *getcell (board, i, j) = *getcell (board, i, j - 1);
                 }
                 j--;
                     *getcell (board, i, j) = *getcell (board, i, j - 1);
                 }
                 j--;


@@ -450,11 +441,9 @@ void stackboard (board_t *board)
 
 int addline (board_t *board, int nbholes)
 {
 
 int addline (board_t *board, int nbholes)
 {

-    int i, j;
-

     /* check empty ligne */
     int isempty = 1;
     /* check empty ligne */
     int isempty = 1;

-    for (i = 0; i < board->width; i++) {
+    for (int i = 0; i < board->width; i++) {

         if (*getcell (board, i, 0) != ' ') {
             isempty = 0;
             break;
         if (*getcell (board, i, 0) != ' ') {
             isempty = 0;
             break;


@@ -462,18 +451,18 @@ int addline (board_t *board, int nbholes)
     }
 
     /* move up */
     }
 
     /* move up */

-    for (j = 1; j < board->height; j++) {
-        for (i = 0; i < board->width; i++) {
+    for (int j = 1; j < board->height; j++) {
+        for (int i = 0; i < board->width; i++) {

             *getcell (board, i, j - 1) = *getcell (board, i, j);
         }
     }
 
     /* random line */
             *getcell (board, i, j - 1) = *getcell (board, i, j);
         }
     }
 
     /* random line */

-    for (i = 0; i < board->width; i++) {
+    for (int i = 0; i < board->width; i++) {

         *getcell (board, i, board->height - 1) = '8';
     }
     while (nbholes) {
         *getcell (board, i, board->height - 1) = '8';
     }
     while (nbholes) {

-        i = rand () % board->width;
+        int i = rand () % board->width;

         if (*getcell (board, i, board->height - 1) == '8') {
             *getcell (board, i, board->height - 1) = ' ';
             nbholes--;
         if (*getcell (board, i, board->height - 1) == '8') {
             *getcell (board, i, board->height - 1) = ' ';
             nbholes--;