cgram: fix assertion when substituting at the end of the longest line

[bsdgames-darwin.git] / mille / mille.h

diff --git a/mille/mille.h b/mille/mille.h
index 8103a99f0ad25ec5ffd2b80dce866b1b37a4bed5..88e82b12c6dbd4acd0bbbec998a9233e218c3a74 100644 (file)
--- a/mille/mille.h
+++ b/mille/mille.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: mille.h,v 1.16 2009/05/25 23:44:04 dholland Exp $      */
+/*     $NetBSD: mille.h,v 1.20 2019/12/27 09:17:59 msaitoh Exp $       */
 
 /*
  * Copyright (c) 1982, 1993
@@ -56,7 +56,7 @@
 
 #define HAND_SZ                7       /* number of cards in a hand    */
 #define DECK_SZ                101     /* number of cards in decks     */
-#define NUM_SAFE       4       /* number of saftey cards       */
+#define NUM_SAFE       4       /* number of safety cards       */
 #define NUM_MILES      5       /* number of milestones types   */
 #define NUM_CARDS      20      /* number of types of cards     */
 #define BOARD_Y                17      /* size of board screen         */
@@ -212,7 +212,8 @@ extern bool Debug, Finished, Next, On_exit, Order, Saved;
 
 #define INITSTR_SIZE 100
 extern char    Initstr[INITSTR_SIZE];
-extern const char      *C_fmt, *const *C_name, *Fromfile;
+extern const char      *const *C_name, *Fromfile;
+#define C_fmt "%-18.18s"
 
 extern int     Card_no, End, Handstart, Movetype, Numgos,
                Numneed[], Numseen[NUM_CARDS], Play, Window;
@@ -235,24 +236,20 @@ void      account(CARD);
 void   calcmove(void);
 int    canplay(const PLAY *, const PLAY *, CARD);
 int    check_ext(bool);
-void   check_go(void);
 void   check_more(void);
-void   die(int) __attribute__((__noreturn__));
+void   die(int) __dead;
 void   domove(void);
-bool   error(const char *, ...);
+bool   error(const char *, ...) __printflike(1,2);
 void   extrapolate(PLAY *);
 void   finalscore(PLAY *);
 CARD   getcard(void);
-void   getmove(void);
 int    getyn(int);
-int    haspicked(const PLAY *);
 void   init(void);
 int    is_repair(CARD);
 int    main(int, char **);
 void   newboard(void);
 void   newscore(void);
 int    onecard(const PLAY *);
-int    playcard(PLAY *);
 void   prboard(void);
 void   prompt(int);
 void   prscore(bool);
@@ -262,8 +259,6 @@ int roll(int, int);
 void   rub(int);
 int    safety(CARD);
 bool   save(void);
-void   show_card(int, int, CARD, CARD *);
-void   show_score(int, int, int, int *);
 void   shuffle(void);
 void   sort(CARD *);
 void   undoex(int);