mirror of
https://github.com/openbsd/src.git
synced 2025-01-10 06:47:55 -08:00
normalize formatting
This commit is contained in:
deraadt
parent
b0430820fd
commit
7accc80bcd
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: comp.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $ */
|
||||
/* $OpenBSD: comp.c,v 1.8 2015/01/19 00:47:01 deraadt Exp $ */
|
||||
/* $NetBSD: comp.c,v 1.4 1995/03/24 05:01:11 cgd Exp $ */
|
||||
|
||||
/*
|
||||
@ -30,7 +30,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
# include "mille.h"
|
||||
#include "mille.h"
|
||||
|
||||
/*
|
||||
* @(#)comp.c 1.1 (Berkeley) 4/1/82
|
||||
@ -45,7 +45,7 @@ calcmove()
|
||||
int *value;
|
||||
PLAY *pp, *op;
|
||||
bool foundend, cango, canstop, foundlow;
|
||||
unsgn int i, count200, badcount, nummin, nummax, diff;
|
||||
unsigned int i, count200, badcount, nummin, nummax, diff;
|
||||
int curmin, curmax;
|
||||
CARD safe, oppos;
|
||||
int valbuf[HAND_SZ], count[NUM_CARDS];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: extern.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
|
||||
/* $OpenBSD: extern.c,v 1.7 2015/01/19 00:47:01 deraadt Exp $ */
|
||||
/* $NetBSD: extern.c,v 1.4 1995/03/24 05:01:36 cgd Exp $ */
|
||||
|
||||
/*
|
||||
@ -30,7 +30,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
# include "mille.h"
|
||||
#include "mille.h"
|
||||
|
||||
/*
|
||||
* @(#)extern.c 1.1 (Berkeley) 4/1/82
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: init.c,v 1.7 2014/11/03 22:18:15 tedu Exp $ */
|
||||
/* $OpenBSD: init.c,v 1.8 2015/01/19 00:47:01 deraadt Exp $ */
|
||||
/* $NetBSD: init.c,v 1.5 1995/03/24 05:01:40 cgd Exp $ */
|
||||
|
||||
/*
|
||||
@ -30,7 +30,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
# include "mille.h"
|
||||
#include "mille.h"
|
||||
|
||||
/*
|
||||
* @(#)init.c 1.1 (Berkeley) 4/1/82
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: mille.c,v 1.19 2013/08/29 20:22:15 naddy Exp $ */
|
||||
/* $OpenBSD: mille.c,v 1.20 2015/01/19 00:47:01 deraadt Exp $ */
|
||||
/* $NetBSD: mille.c,v 1.4 1995/03/24 05:01:48 cgd Exp $ */
|
||||
|
||||
/*
|
||||
@ -30,8 +30,8 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
# include "mille.h"
|
||||
# include <signal.h>
|
||||
#include "mille.h"
|
||||
#include <signal.h>
|
||||
|
||||
/*
|
||||
* @(#)mille.c 1.3 (Berkeley) 5/10/83
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: mille.h,v 1.10 2013/08/29 20:22:16 naddy Exp $ */
|
||||
/* $OpenBSD: mille.h,v 1.11 2015/01/19 00:47:01 deraadt Exp $ */
|
||||
/* $NetBSD: mille.h,v 1.5 1995/03/24 05:01:51 cgd Exp $ */
|
||||
|
||||
/*
|
||||
@ -32,18 +32,18 @@
|
||||
* @(#)mille.h 8.1 (Berkeley) 5/31/93
|
||||
*/
|
||||
|
||||
# include <sys/types.h>
|
||||
# include <sys/uio.h>
|
||||
# include <sys/stat.h>
|
||||
# include <ctype.h>
|
||||
# include <err.h>
|
||||
# include <errno.h>
|
||||
# include <curses.h>
|
||||
# include <fcntl.h>
|
||||
# include <stdlib.h>
|
||||
# include <string.h>
|
||||
# include <termios.h>
|
||||
# include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/uio.h>
|
||||
#include <sys/stat.h>
|
||||
#include <ctype.h>
|
||||
#include <err.h>
|
||||
#include <errno.h>
|
||||
#include <curses.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <termios.h>
|
||||
#include <unistd.h>
|
||||
|
||||
/*
|
||||
* @(#)mille.h 1.1 (Berkeley) 4/1/82
|
||||
@ -53,106 +53,105 @@
|
||||
* Miscellaneous constants
|
||||
*/
|
||||
|
||||
# define unsgn unsigned
|
||||
# define CARD short
|
||||
#define CARD short
|
||||
|
||||
# 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 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 */
|
||||
# define BOARD_X 40
|
||||
# define MILES_Y 7 /* size of mileage screen */
|
||||
# define MILES_X 80
|
||||
# define SCORE_Y 17 /* size of score screen */
|
||||
# define SCORE_X 40
|
||||
# define MOVE_Y 10 /* Where to print move prompt */
|
||||
# define MOVE_X 20
|
||||
# define ERR_Y 15 /* Where to print errors */
|
||||
# define ERR_X 5
|
||||
# define EXT_Y 4 /* Where to put Extension */
|
||||
# define EXT_X 9
|
||||
#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 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 */
|
||||
#define BOARD_X 40
|
||||
#define MILES_Y 7 /* size of mileage screen */
|
||||
#define MILES_X 80
|
||||
#define SCORE_Y 17 /* size of score screen */
|
||||
#define SCORE_X 40
|
||||
#define MOVE_Y 10 /* Where to print move prompt */
|
||||
#define MOVE_X 20
|
||||
#define ERR_Y 15 /* Where to print errors */
|
||||
#define ERR_X 5
|
||||
#define EXT_Y 4 /* Where to put Extension */
|
||||
#define EXT_X 9
|
||||
|
||||
# define PLAYER 0
|
||||
# define COMP 1
|
||||
#define PLAYER 0
|
||||
#define COMP 1
|
||||
|
||||
# define W_SMALL 0 /* Small (initial) window */
|
||||
# define W_FULL 1 /* Full (final) window */
|
||||
#define W_SMALL 0 /* Small (initial) window */
|
||||
#define W_FULL 1 /* Full (final) window */
|
||||
|
||||
/*
|
||||
* Move types
|
||||
*/
|
||||
|
||||
# define M_DISCARD 0
|
||||
# define M_DRAW 1
|
||||
# define M_PLAY 2
|
||||
# define M_ORDER 3
|
||||
#define M_DISCARD 0
|
||||
#define M_DRAW 1
|
||||
#define M_PLAY 2
|
||||
#define M_ORDER 3
|
||||
|
||||
/*
|
||||
* Scores
|
||||
*/
|
||||
|
||||
# define SC_SAFETY 100
|
||||
# define SC_ALL_SAFE 300
|
||||
# define SC_COUP 300
|
||||
# define SC_TRIP 400
|
||||
# define SC_SAFE 300
|
||||
# define SC_DELAY 300
|
||||
# define SC_EXTENSION 200
|
||||
# define SC_SHUT_OUT 500
|
||||
#define SC_SAFETY 100
|
||||
#define SC_ALL_SAFE 300
|
||||
#define SC_COUP 300
|
||||
#define SC_TRIP 400
|
||||
#define SC_SAFE 300
|
||||
#define SC_DELAY 300
|
||||
#define SC_EXTENSION 200
|
||||
#define SC_SHUT_OUT 500
|
||||
|
||||
/*
|
||||
* safety descriptions
|
||||
*/
|
||||
|
||||
# define S_UNKNOWN 0 /* location of safety unknown */
|
||||
# define S_IN_HAND 1 /* safety in player's hand */
|
||||
# define S_PLAYED 2 /* safety has been played */
|
||||
# define S_GAS_SAFE 0 /* Gas safety card index */
|
||||
# define S_SPARE_SAFE 1 /* Tire safety card index */
|
||||
# define S_DRIVE_SAFE 2 /* Driveing safety card index */
|
||||
# define S_RIGHT_WAY 3 /* Right-of-Way card index */
|
||||
# define S_CONV 15 /* conversion from C_ to S_ */
|
||||
#define S_UNKNOWN 0 /* location of safety unknown */
|
||||
#define S_IN_HAND 1 /* safety in player's hand */
|
||||
#define S_PLAYED 2 /* safety has been played */
|
||||
#define S_GAS_SAFE 0 /* Gas safety card index */
|
||||
#define S_SPARE_SAFE 1 /* Tire safety card index */
|
||||
#define S_DRIVE_SAFE 2 /* Driveing safety card index */
|
||||
#define S_RIGHT_WAY 3 /* Right-of-Way card index */
|
||||
#define S_CONV 15 /* conversion from C_ to S_ */
|
||||
|
||||
/*
|
||||
* card numbers
|
||||
*/
|
||||
|
||||
# define C_INIT -1
|
||||
# define C_25 0
|
||||
# define C_50 1
|
||||
# define C_75 2
|
||||
# define C_100 3
|
||||
# define C_200 4
|
||||
# define C_EMPTY 5
|
||||
# define C_FLAT 6
|
||||
# define C_CRASH 7
|
||||
# define C_STOP 8
|
||||
# define C_LIMIT 9
|
||||
# define C_GAS 10
|
||||
# define C_SPARE 11
|
||||
# define C_REPAIRS 12
|
||||
# define C_GO 13
|
||||
# define C_END_LIMIT 14
|
||||
# define C_GAS_SAFE 15
|
||||
# define C_SPARE_SAFE 16
|
||||
# define C_DRIVE_SAFE 17
|
||||
# define C_RIGHT_WAY 18
|
||||
#define C_INIT -1
|
||||
#define C_25 0
|
||||
#define C_50 1
|
||||
#define C_75 2
|
||||
#define C_100 3
|
||||
#define C_200 4
|
||||
#define C_EMPTY 5
|
||||
#define C_FLAT 6
|
||||
#define C_CRASH 7
|
||||
#define C_STOP 8
|
||||
#define C_LIMIT 9
|
||||
#define C_GAS 10
|
||||
#define C_SPARE 11
|
||||
#define C_REPAIRS 12
|
||||
#define C_GO 13
|
||||
#define C_END_LIMIT 14
|
||||
#define C_GAS_SAFE 15
|
||||
#define C_SPARE_SAFE 16
|
||||
#define C_DRIVE_SAFE 17
|
||||
#define C_RIGHT_WAY 18
|
||||
|
||||
/*
|
||||
* prompt types
|
||||
*/
|
||||
|
||||
# define MOVEPROMPT 0
|
||||
# define REALLYPROMPT 1
|
||||
# define ANOTHERHANDPROMPT 2
|
||||
# define ANOTHERGAMEPROMPT 3
|
||||
# define SAVEGAMEPROMPT 4
|
||||
# define SAMEFILEPROMPT 5
|
||||
# define FILEPROMPT 6
|
||||
# define EXTENSIONPROMPT 7
|
||||
# define OVERWRITEFILEPROMPT 8
|
||||
#define MOVEPROMPT 0
|
||||
#define REALLYPROMPT 1
|
||||
#define ANOTHERHANDPROMPT 2
|
||||
#define ANOTHERGAMEPROMPT 3
|
||||
#define SAVEGAMEPROMPT 4
|
||||
#define SAMEFILEPROMPT 5
|
||||
#define FILEPROMPT 6
|
||||
#define EXTENSIONPROMPT 7
|
||||
#define OVERWRITEFILEPROMPT 8
|
||||
|
||||
typedef struct {
|
||||
bool coups[NUM_SAFE];
|
||||
@ -187,11 +186,11 @@ typedef struct {
|
||||
* macros
|
||||
*/
|
||||
|
||||
# define other(x) (1 - x)
|
||||
# define nextplay() (Play = other(Play))
|
||||
# define nextwin(x) (1 - x)
|
||||
# define opposite(x) (Opposite[x])
|
||||
# define is_safety(x) (x >= C_GAS_SAFE)
|
||||
#define other(x) (1 - x)
|
||||
#define nextplay() (Play = other(Play))
|
||||
#define nextwin(x) (1 - x)
|
||||
#define opposite(x) (Opposite[x])
|
||||
#define is_safety(x) (x >= C_GAS_SAFE)
|
||||
|
||||
/*
|
||||
* externals
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: print.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $ */
|
||||
/* $OpenBSD: print.c,v 1.7 2015/01/19 00:47:01 deraadt Exp $ */
|
||||
/* $NetBSD: print.c,v 1.4 1995/03/24 05:02:02 cgd Exp $ */
|
||||
|
||||
/*
|
||||
@ -30,7 +30,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
# include "mille.h"
|
||||
#include "mille.h"
|
||||
|
||||
/*
|
||||
* @(#)print.c 1.1 (Berkeley) 4/1/82
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: roll.c,v 1.6 2013/08/29 20:22:16 naddy Exp $ */
|
||||
/* $OpenBSD: roll.c,v 1.7 2015/01/19 00:47:01 deraadt Exp $ */
|
||||
/* $NetBSD: roll.c,v 1.4 1995/03/24 05:02:07 cgd Exp $ */
|
||||
|
||||
/*
|
||||
@ -30,7 +30,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
# include "mille.h"
|
||||
#include "mille.h"
|
||||
|
||||
/*
|
||||
* This routine rolls ndie nside-sided dice.
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: types.c,v 1.7 2009/10/27 23:59:26 deraadt Exp $ */
|
||||
/* $OpenBSD: types.c,v 1.8 2015/01/19 00:47:01 deraadt Exp $ */
|
||||
/* $NetBSD: types.c,v 1.4 1995/03/24 05:02:22 cgd Exp $ */
|
||||
|
||||
/*
|
||||
@ -30,7 +30,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
# include "mille.h"
|
||||
#include "mille.h"
|
||||
|
||||
/*
|
||||
* @(#)types.c 1.1 (Berkeley) 4/1/82
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: varpush.c,v 1.7 2009/10/27 23:59:26 deraadt Exp $ */
|
||||
/* $OpenBSD: varpush.c,v 1.8 2015/01/19 00:47:01 deraadt Exp $ */
|
||||
/* $NetBSD: varpush.c,v 1.4 1995/03/24 05:02:35 cgd Exp $ */
|
||||
|
||||
/*
|
||||
@ -30,8 +30,8 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
# include <paths.h>
|
||||
# include "mille.h"
|
||||
#include <paths.h>
|
||||
#include "mille.h"
|
||||
|
||||
/*
|
||||
* @(#)varpush.c 1.1 (Berkeley) 4/1/82
|
||||
|
||||
Loading…
Reference in New Issue
Block a user