Prevented random memory corruption and other cleanup

[ttt] / src / test-board.c

diff --git a/src/test-board.c b/src/test-board.c
index 104395ef39748fc5f335e8fe3d093a6146e19523..e07e28dd89703821572de93eba4ea730a77fd1f2 100644 (file)
--- a/src/test-board.c
+++ b/src/test-board.c
@@ -7,6 +7,7 @@ main (void)
 {
     ttt_board_t board;
     int m, i, newline;
+    ttt_cell_t winner, move_result;
     
     ttt_board_init (&board);
     
@@ -15,19 +16,30 @@ main (void)
        ttt_board_write (&board, stdout);
        printf ("\n");    
        
-       printf ("Make a move ");
+       printf ("Make a move: ");
        m = getchar();
+       if (m == EOF)
+       {
+           printf ("\nGoodbye.\n");
+           exit (1);
+       }
        newline = getchar();
-       m = m - '0';
-       if (ttt_board_make_move (&board, m) == TTT_ERROR_NOT_VALID_MOVE)
+       m -= '0';
+       move_result = ttt_board_make_move (&board, m);
+       if (move_result == TTT_ERROR_NOT_GRID)
+           printf ("Sorry, %c is an invalid move.\n"
+                   "Please enter a number between 0 & 8.", m + '0');
+       
+       if (move_result == TTT_ERROR_NOT_VALID_MOVE)
            continue;
-       ttt_board_is_won (&board);
-       if (ttt_board_is_won (&board) == TTT_CELL_X)
+       
+       winner = ttt_board_is_won (&board);
+       if (winner == TTT_CELL_X)
        {
            printf ("X's Win! ");
            break;
        }
-       else if (ttt_board_is_won (&board) == TTT_CELL_O)
+       else if (winner == TTT_CELL_O)
        {
            printf ("O's Win! ");
            break;