Mark more functions and vars static.

diff --git a/gnushogi/commondsp.c b/gnushogi/commondsp.c
index 603143c..62e4655 100644 (file)
--- a/gnushogi/commondsp.c
+++ b/gnushogi/commondsp.c
@@ -50,8 +50,8 @@
 #include "gnushogi.h"
 
 char mvstr[4][6];
-char *InPtr;
 int mycnt1, mycnt2;
+static char *InPtr;
 struct display *dsp = &raw_display;
 
 

diff --git a/gnushogi/cursesdsp.c b/gnushogi/cursesdsp.c
index 5d33790..bf37999 100644 (file)
--- a/gnushogi/cursesdsp.c
+++ b/gnushogi/cursesdsp.c
@@ -75,9 +75,9 @@
 static void UpdateCatched(void);
 static void DrawPiece(short sq);
 static void ShowScore(short score);
-void Curses_UpdateDisplay(short f, short t, short redraw, short isspec);
-void Curses_Die(int sig);
-void Curses_ShowSidetoMove(void);
+static void Curses_UpdateDisplay(short f, short t, short redraw, short isspec);
+static void Curses_Die(int sig);
+static void Curses_ShowSidetoMove(void);
 
 /****************************************
  * Trivial output functions.
@@ -91,7 +91,7 @@ ClearEoln(void)
 }
 
 
-void
+static void
 Curses_ClearScreen(void)
 {
     clear();
@@ -106,7 +106,7 @@ gotoXY(short x, short y)
 }
 
 
-void
+static void
 Curses_ShowCurrentMove(short pnt, short f, short t)
 {
     algbr(f, t, false);
@@ -115,7 +115,7 @@ Curses_ShowCurrentMove(short pnt, short f, short t)
 }
 
 
-void
+static void
 Curses_ShowDepth(char ch)
 {
     gotoXY(TAB, 4);
@@ -124,7 +124,7 @@ Curses_ShowDepth(char ch)
 }
 
 
-void
+static void
 Curses_ShowGameType(void)
 {
     if (flag.post)
@@ -135,7 +135,7 @@ Curses_ShowGameType(void)
 }
 
 
-void
+static void
 ShowHeader(void)
 {
     gotoXY(TAB, 2);
@@ -143,13 +143,13 @@ ShowHeader(void)
 }
 
 
-void
+static void
 Curses_ShowLine(unsigned short *bstline)
 {
 }
 
 
-void
+static void
 Curses_ShowMessage(char *s)
 {
     gotoXY(TAB, 6);
@@ -158,7 +158,7 @@ Curses_ShowMessage(char *s)
 }
 
 
-void
+static void
 Curses_AlwaysShowMessage(const char *format, ...)
 {
     static char buffer[60];
@@ -170,7 +170,7 @@ Curses_AlwaysShowMessage(const char *format, ...)
 }
 
 
-void
+static void
 Curses_Printf(const char *format, ...)
 {
     static char buffer[60];
@@ -182,14 +182,14 @@ Curses_Printf(const char *format, ...)
 }
 
 
-void
+static void
 Curses_doRequestInputString(const char* fmt, char* buffer)
 {
     FLUSH_SCANW(fmt, buffer);
 }
 
 
-int
+static int
 Curses_GetString(char* sx)
 {
     fflush(stdout);
@@ -197,7 +197,7 @@ Curses_GetString(char* sx)
 }
 
 
-void
+static void
 Curses_ShowNodeCnt(long NodeCnt)
 {
     gotoXY(TAB, 22);
@@ -208,7 +208,7 @@ Curses_ShowNodeCnt(long NodeCnt)
 }
 
 
-void
+static void
 Curses_ShowPatternCount(short side, short n)
 {
     if (flag.post)
@@ -233,7 +233,7 @@ ShowPlayers(void)
 }
 
 
-void
+static void
 Curses_ShowPrompt(void)
 {
     Curses_ShowSidetoMove();
@@ -243,7 +243,7 @@ Curses_ShowPrompt(void)
 }
 
 
-void
+static void
 Curses_ShowResponseTime(void)
 {
     if (flag.post)
@@ -257,7 +257,7 @@ Curses_ShowResponseTime(void)
 }
 
 
-void
+static void
 Curses_ShowResults(short score, unsigned short *bstline, char ch)
 {
     unsigned char d, ply;
@@ -301,7 +301,7 @@ ShowScore(short score)
 }
 
 
-void
+static void
 Curses_ShowSidetoMove(void)
 {
     gotoXY(TAB, 14);
@@ -310,7 +310,7 @@ Curses_ShowSidetoMove(void)
 }
 
 
-void
+static void
 Curses_ShowStage(void)
 {
     gotoXY(TAB, 19);
@@ -323,7 +323,7 @@ Curses_ShowStage(void)
  * End of trivial output routines.
  ****************************************/
 
-void
+static void
 Curses_Initialize(void)
 {
     signal(SIGINT, Curses_Die);
@@ -333,7 +333,7 @@ Curses_Initialize(void)
 }
 
 
-void
+static void
 Curses_ExitShogi(void)
 { 
     if (!nolist)
@@ -349,7 +349,7 @@ Curses_ExitShogi(void)
 }
 
 
-void
+static void
 Curses_Die(int sig)
 {
     char s[80];
@@ -368,7 +368,7 @@ Curses_Die(int sig)
 }
 
 
-void
+static void
 Curses_TerminateSearch(int sig)
 {
     signal(SIGINT, SIG_IGN);
@@ -384,7 +384,7 @@ Curses_TerminateSearch(int sig)
 }
 
 
-void
+static void
 Curses_help(void)
 {
     Curses_ClearScreen();
@@ -452,7 +452,7 @@ static const short y0[2] = { 20, 4 };
  * P* will put a pawn to the captured pieces.
  */
 
-void
+static void
 Curses_EditBoard(void)
 {
     short a, c, sq, i;
@@ -601,7 +601,7 @@ UpdateCatched()
 }
 
 
-void
+static void
 Curses_SearchStartStuff(short side)
 {
     short i;
@@ -617,7 +617,7 @@ Curses_SearchStartStuff(short side)
 }
 
 
-void
+static void
 Curses_OutputMove(void)
 {
 
@@ -682,7 +682,7 @@ Curses_OutputMove(void)
 }
 
 
-void
+static void
 Curses_UpdateClocks(void)
 {
     short m, s;
@@ -761,7 +761,7 @@ DrawPiece(short sq)
 /*
  * Curses_ShowPostnValue(): must have called ExaminePosition() first
  */
-void
+static void
 Curses_ShowPostnValue(short sq)
 {
     gotoXY(4 + 5 * VIR_C(sq), 5 + 2 * (7 - VIR_R(sq)));        /* CHECKME */
@@ -784,7 +784,7 @@ Curses_ShowPostnValue(short sq)
 }
 
 
-void
+static void
 Curses_ShowPostnValues(void)
 {
     short sq, score;
@@ -804,7 +804,7 @@ Curses_ShowPostnValues(void)
 }
 
 
-void
+static void
 Curses_UpdateDisplay(short f, short t, short redraw, short isspec)
 {
     short i, sq, z;
@@ -922,7 +922,7 @@ Curses_UpdateDisplay(short f, short t, short redraw, short isspec)
 }
 
 
-void
+static void
 Curses_ChangeAlphaWindow(void)
 {
     Curses_ShowMessage("WAwindow = ");
@@ -932,7 +932,7 @@ Curses_ChangeAlphaWindow(void)
 }
 
 
-void
+static void
 Curses_ChangeBetaWindow(void)
 {
     Curses_ShowMessage("WBwindow = ");
@@ -942,7 +942,7 @@ Curses_ChangeBetaWindow(void)
 }
 
 
-void
+static void
 Curses_GiveHint(void)
 {
     char s[40];
@@ -961,7 +961,7 @@ Curses_GiveHint(void)
 }
 
 
-void
+static void
 Curses_ChangeSearchDepth(char* sx)
 {
     Curses_ShowMessage("depth = ");
@@ -970,7 +970,7 @@ Curses_ChangeSearchDepth(char* sx)
 }
 
 
-void
+static void
 Curses_ChangeHashDepth(void)
 {
     Curses_ShowMessage("hashdepth = ");
@@ -980,7 +980,7 @@ Curses_ChangeHashDepth(void)
 }
 
 
-void
+static void
 Curses_SetContempt(void)
 {
     Curses_ShowMessage("contempt = ");
@@ -988,7 +988,7 @@ Curses_SetContempt(void)
 }
 
 
-void
+static void
 Curses_ChangeXwindow(void)
 {
     Curses_ShowMessage("xwndw= ");
@@ -996,7 +996,7 @@ Curses_ChangeXwindow(void)
 }
 
 
-void
+static void
 Curses_SelectLevel(char *sx)
 {
     int item;
@@ -1106,7 +1106,7 @@ Curses_SelectLevel(char *sx)
 }
 
 
-void
+static void
 Curses_DoDebug(void)
 {
     short c, p, sq, tp, tc, tsq, score;
@@ -1153,7 +1153,7 @@ Curses_DoDebug(void)
 }
 
 
-void
+static void
 Curses_DoTable(short table[NO_SQUARES])
 {
     short  sq;
@@ -1167,7 +1167,7 @@ Curses_DoTable(short table[NO_SQUARES])
 } 
 
 
-void
+static void
 Curses_PollForInput(void)
 {
     int  i;
@@ -1193,7 +1193,7 @@ Curses_PollForInput(void)
 }
 
 
-void
+static void
 Curses_SetupBoard(void)
 {
     Curses_ShowMessage("'setup' command is not supported in Cursesmode");

diff --git a/gnushogi/rawdsp.c b/gnushogi/rawdsp.c
index ba700db..0a4e473 100644 (file)
--- a/gnushogi/rawdsp.c
+++ b/gnushogi/rawdsp.c
@@ -48,13 +48,13 @@
  * forward declarations
  ****************************************/
 
-void Raw_UpdateDisplay(short f, short t, short redraw, short isspec);
+static void Raw_UpdateDisplay(short f, short t, short redraw, short isspec);
 
 /****************************************
  * Trivial output functions.
  ****************************************/
 
-void
+static void
 Raw_ClearScreen(void)
 {
     if (!XSHOGI)
@@ -62,7 +62,7 @@ Raw_ClearScreen(void)
 }
 
 
-void
+static void
 Raw_ShowPrompt(void)
 {
     if (!XSHOGI)
@@ -70,13 +70,13 @@ Raw_ShowPrompt(void)
 }
 
 
-void
+static void
 Raw_ShowCurrentMove(short pnt, short f, short t)
 {
 }
 
 
-void
+static void
 Raw_ShowDepth(char ch)
 {
     if (!XSHOGI)
@@ -84,7 +84,7 @@ Raw_ShowDepth(char ch)
 }
 
 
-void
+static void
 Raw_ShowGameType(void)
 {
     if (flag.post)
@@ -92,7 +92,7 @@ Raw_ShowGameType(void)
 }
 
 
-void
+static void
 Raw_ShowLine(unsigned short *bstline)
 {
     int i;
@@ -110,7 +110,7 @@ Raw_ShowLine(unsigned short *bstline)
 }
 
 
-void
+static void
 Raw_ShowMessage(char *s)
 {
     if (!XSHOGI)
@@ -118,7 +118,7 @@ Raw_ShowMessage(char *s)
 }
 
 
-void
+static void
 Raw_AlwaysShowMessage(const char *format, ...)
 {
     va_list ap;
@@ -129,7 +129,7 @@ Raw_AlwaysShowMessage(const char *format, ...)
 }
 
 
-void
+static void
 Raw_Printf(const char *format, ...)
 {
     va_list ap;
@@ -139,14 +139,14 @@ Raw_Printf(const char *format, ...)
 }
 
 
-void
+static void
 Raw_doRequestInputString(const char* fmt, char* buffer)
 {
     scanf(fmt, buffer);
 }
 
 
-int
+static int
 Raw_GetString(char* sx)
 {
     int eof = 0;
@@ -165,7 +165,7 @@ Raw_GetString(char* sx)
 }
 
 
-void
+static void
 Raw_ShowNodeCnt(long NodeCnt)
 {
     printf("Nodes = %ld Nodes/sec = %ld\n",
@@ -173,7 +173,7 @@ Raw_ShowNodeCnt(long NodeCnt)
 }
 
 
-void
+static void
 Raw_ShowPatternCount(short side, short n)
 {
     if (flag.post)
@@ -181,13 +181,13 @@ Raw_ShowPatternCount(short side, short n)
 }
 
 
-void
+static void
 Raw_ShowResponseTime(void)
 {
 }
 
 
-void
+static void
 Raw_ShowResults(short score, unsigned short *bstline, char ch)
 {
     if (flag.post  && !XSHOGI)
@@ -200,13 +200,13 @@ Raw_ShowResults(short score, unsigned short *bstline, char ch)
 }
 
 
-void
+static void
 Raw_ShowSidetoMove(void)
 {
 }
 
 
-void
+static void
 Raw_ShowStage(void)
 {
     printf("stage = %d\n", stage);
@@ -218,7 +218,7 @@ Raw_ShowStage(void)
  * End of trivial output routines.
  ****************************************/
 
-void
+static void
 Raw_Initialize(void)
 {
     mycnt1 = mycnt2 = 0;
@@ -250,7 +250,7 @@ Raw_Initialize(void)
 }
 
 
-void
+static void
 Raw_ExitShogi(void)
 {
     /* CHECKME: what purpose does this next statement serve? */
@@ -263,7 +263,7 @@ Raw_ExitShogi(void)
 }
 
 
-void
+static void
 Raw_TerminateSearch(int sig)
 {
 #ifdef INTERRUPT_TEST
@@ -277,7 +277,7 @@ Raw_TerminateSearch(int sig)
 }
 
 
-void
+static void
 Raw_help(void)
 {
     Raw_ClearScreen();
@@ -342,7 +342,7 @@ Raw_help(void)
  * Set up a board position. Pieces are entered by typing the piece followed
  * by the location. For example, Nf3 will place a knight on square f3.
  */
-void
+static void
 Raw_EditBoard(void)
 {
     short a, r, c, sq, i, found;
@@ -443,7 +443,7 @@ Raw_EditBoard(void)
  * Nine lines of nine characters are used to setup the board. 9a-1a is the
  * first line. White pieces are  represented  by  uppercase characters.
  */
-void
+static void
 Raw_SetupBoard(void)
 {
     short r, c, sq, i;
@@ -493,7 +493,7 @@ Raw_SetupBoard(void)
 }
 
 
-void
+static void
 Raw_SearchStartStuff(short side)
 {
     if (flag.post)
@@ -505,7 +505,7 @@ Raw_SearchStartStuff(short side)
 }
 
 
-void
+static void
 Raw_OutputMove(void)
 {
     if (flag.illegal)
@@ -583,13 +583,13 @@ Raw_OutputMove(void)
 }
 
 
-void
+static void
 Raw_UpdateClocks(void)
 {
 }
 
 
-void
+static void
 Raw_UpdateDisplay(short f, short t, short redraw, short isspec)
 {
 
@@ -648,7 +648,7 @@ Raw_UpdateDisplay(short f, short t, short redraw, short isspec)
 }
 
 
-void
+static void
 Raw_ChangeAlphaWindow(void)
 {
     printf("WAwindow: ");
@@ -658,7 +658,7 @@ Raw_ChangeAlphaWindow(void)
 }
 
 
-void
+static void
 Raw_ChangeBetaWindow(void)
 {
     printf("WBwindow: ");
@@ -668,7 +668,7 @@ Raw_ChangeBetaWindow(void)
 }
 
 
-void
+static void
 Raw_GiveHint(void)
 {
     if (hint)
@@ -681,7 +681,7 @@ Raw_GiveHint(void)
 }
 
 
-void
+static void
 Raw_SelectLevel(char *sx)
 {
     /* FIXME: NO_SQUARES is nonsense here */
@@ -754,7 +754,7 @@ Raw_SelectLevel(char *sx)
 }
 
 
-void
+static void
 Raw_ChangeSearchDepth(char *sx)
 {
     char buf[80+1];
@@ -769,7 +769,7 @@ Raw_ChangeSearchDepth(char *sx)
 }
 
 
-void
+static void
 Raw_ChangeHashDepth(void)
 {
     printf("hashdepth = ");
@@ -779,7 +779,7 @@ Raw_ChangeHashDepth(void)
 }
 
 
-void
+static void
 Raw_SetContempt(void)
 {
     printf("contempt = ");
@@ -787,7 +787,7 @@ Raw_SetContempt(void)
 }
 
 
-void
+static void
 Raw_ChangeXwindow(void)
 {
     printf("xwndw = ");
@@ -799,7 +799,7 @@ Raw_ChangeXwindow(void)
  * Raw_ShowPostnValue(short sq)
  * must have called ExaminePosition() first
  */
-void
+static void
 Raw_ShowPostnValue(short sq)
 {
     (void) ScorePosition(color[sq]);
@@ -819,7 +819,7 @@ Raw_ShowPostnValue(short sq)
 }
 
 
-void
+static void
 Raw_DoDebug(void)
 {
     short c, p, sq, tp, tc, tsq, score, j, k;
@@ -897,7 +897,7 @@ Raw_DoDebug(void)
 }
 
 
-void
+static void
 Raw_DoTable(short table[NO_SQUARES])
 {
     short  sq, j, k;
@@ -916,7 +916,7 @@ Raw_DoTable(short table[NO_SQUARES])
 }
 
 
-void
+static void
 Raw_ShowPostnValues(void)
 {
     short sq, score, j, k;
@@ -941,7 +941,7 @@ Raw_ShowPostnValues(void)
 }
 
 
-void
+static void
 Raw_PollForInput(void)
 {
 #ifdef WIN32