s/util/curses.

Makefile

@@ -10,7 +10,7 @@ LIB_OBJECTS = ${LIB_DIR}/common.o   \
               ${LIB_DIR}/card.o     \
               ${LIB_DIR}/stack.o    \
               ${LIB_DIR}/deck.o     \
-              ${LIB_DIR}/util.o     \
+              ${LIB_DIR}/curses.o   \
               ${LIB_DIR}/cursor.o   \
               ${LIB_DIR}/keyboard.o \
               ${LIB_DIR}/display.o  \
@@ -23,7 +23,7 @@ TEST_OBJECTS = ${TEST_DIR}/frame_test.o       \
                ${TEST_DIR}/card_test.o        \
                ${TEST_DIR}/stack_test.o       \
                ${TEST_DIR}/deck_test.o        \
-               ${TEST_DIR}/util_test.o        \
+               ${TEST_DIR}/curses_test.o      \
                ${TEST_DIR}/cursor_test.o      \
                ${TEST_DIR}/keyboard_test.o    \
                ${TEST_DIR}/display_test.o     \

lib/curses.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <ncurses.h>
 #include <locale.h>
-#include "util.h"
+#include "curses.h"
 
 void initialize_curses() {
   setlocale(LC_ALL, "en_US.utf-8");  /* supporting unicode characters          */

lib/curses.h

@@ -1,5 +1,5 @@
-#ifndef UTIL_H
+#ifndef TTY_SOLITAIRE_CURSES_H
-#define UTIL_H
+#define TTY_SOLITAIRE_CURSES_H
 
 void initialize_curses();
 void end_curses();

lib/game.c

@@ -5,7 +5,7 @@
 #include <errno.h>
 #include <time.h>
 #include "display.h"
-#include "util.h"
+#include "curses.h"
 #include "common.h"
 #include "game.h"
 

lib/keyboard.c

@@ -2,6 +2,7 @@
 #include "card.h"
 #include "game.h"
 #include "display.h"
+#include "curses.h"
 #include "keyboard.h"
 
 static bool cursor_on_stock(struct cursor *cursor) {

lib/stack.c

@@ -5,6 +5,7 @@
 #include <string.h>
 #include <errno.h>
 #include "stack.h"
+#include "common.h"
 
 void allocate_stack(struct stack **stack) {
   if (!(*stack = malloc(sizeof(**stack)))) {

lib/ttysolitaire.c

@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <ncurses.h>
-#include "util.h"
+#include "curses.h"
 #include "game.h"
 #include "keyboard.h"
 

test/curses_test.c

@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <stdbool.h>
-#include "../lib/util.h"
+#include "../lib/curses.h"
 
-void test_util() {
+void test_curses() {
   assert(true);
 }

test/ttysolitaire_test.c

@@ -13,7 +13,7 @@ int main(int argc, const char *argv[]) {
   test_game();
   test_keyboard();
   test_stack();
-  test_util();
+  test_curses();
   test_test_helper();
 
   return(0);

test/ttysolitaire_test.h

@@ -9,7 +9,7 @@ void test_frame();
 void test_game();
 void test_keyboard();
 void test_stack();
-void test_util();
+void test_curses();
 void test_test_helper();
 
 #endif