Blame

Date:
Message:
all: fix or silence various gcc warnings As usual, gcc finds some real problems but also reports a ton of noise. Fix the problems and quiet the noise.
Actions:
History | Blob | Raw File
  1 3ebbd193 2017-06-19 rsc #ifndef PI

  2 3ebbd193 2017-06-19 rsc #define PI 3.1415926535897932384626433832795028841971693993751

  3 3ebbd193 2017-06-19 rsc #endif

  4 3ebbd193 2017-06-19 rsc 

  5 3ebbd193 2017-06-19 rsc #define	MAXWID	8.5	/* default limits max picture to 8.5 x 11; */

  6 3ebbd193 2017-06-19 rsc #define	MAXHT	11	/* change to taste without peril */

  7 3ebbd193 2017-06-19 rsc 

  8 3ebbd193 2017-06-19 rsc #define	dprintf	if(dbg)printf

  9 3ebbd193 2017-06-19 rsc 

 10 3ebbd193 2017-06-19 rsc extern	void	yyerror(char *);

 11 3ebbd193 2017-06-19 rsc 

 12 fafa622a 2020-01-12 rsc extern	char	errbuf[1000];

 13 3ebbd193 2017-06-19 rsc 

 14 3ebbd193 2017-06-19 rsc #undef	sprintf	/* Snow Leopard */

 15 3ebbd193 2017-06-19 rsc 

 16 3ebbd193 2017-06-19 rsc #define	ERROR	sprintf(errbuf,

 17 3ebbd193 2017-06-19 rsc #define	FATAL	), yyerror(errbuf), exit(1)

 18 3ebbd193 2017-06-19 rsc #define	WARNING	), yyerror(errbuf)

 19 3ebbd193 2017-06-19 rsc 

 20 3ebbd193 2017-06-19 rsc #define	DEFAULT	0

 21 3ebbd193 2017-06-19 rsc 

 22 3ebbd193 2017-06-19 rsc #define	HEAD1	1

 23 3ebbd193 2017-06-19 rsc #define	HEAD2	2

 24 3ebbd193 2017-06-19 rsc #define	HEAD12	(HEAD1+HEAD2)

 25 3ebbd193 2017-06-19 rsc #define	INVIS	4

 26 3ebbd193 2017-06-19 rsc #define	CW_ARC	8	/* clockwise arc */

 27 3ebbd193 2017-06-19 rsc #define	DOTBIT	16	/* line styles */

 28 3ebbd193 2017-06-19 rsc #define	DASHBIT	32

 29 3ebbd193 2017-06-19 rsc #define	FILLBIT	64	/* gray-fill on boxes, etc. */

 30 3ebbd193 2017-06-19 rsc #define NOEDGEBIT 128	/* no edge on filled object */

 31 3ebbd193 2017-06-19 rsc 

 32 3ebbd193 2017-06-19 rsc #define	CENTER	01	/* text attributes */

 33 3ebbd193 2017-06-19 rsc #define	LJUST	02

 34 3ebbd193 2017-06-19 rsc #define	RJUST	04

 35 3ebbd193 2017-06-19 rsc #define	ABOVE	010

 36 3ebbd193 2017-06-19 rsc #define	BELOW	020

 37 3ebbd193 2017-06-19 rsc #define	SPREAD	040

 38 3ebbd193 2017-06-19 rsc 

 39 3ebbd193 2017-06-19 rsc #define	SCALE	1.0	/* default scale: units/inch */

 40 3ebbd193 2017-06-19 rsc #define	WID	0.75	/* default width for boxes and ellipses */

 41 3ebbd193 2017-06-19 rsc #define	WID2	0.375

 42 3ebbd193 2017-06-19 rsc #define	HT	0.5	/* default height and line length */

 43 3ebbd193 2017-06-19 rsc #define	HT2	(HT/2)

 44 3ebbd193 2017-06-19 rsc #define	HT5	(HT/5)

 45 3ebbd193 2017-06-19 rsc #define	HT10	(HT/10)

 46 3ebbd193 2017-06-19 rsc 

 47 3ebbd193 2017-06-19 rsc /* these have to be like so, so that we can write */

 48 3ebbd193 2017-06-19 rsc /* things like R & V, etc. */

 49 3ebbd193 2017-06-19 rsc #define	H	0

 50 3ebbd193 2017-06-19 rsc #define	V	1

 51 3ebbd193 2017-06-19 rsc #define	R_DIR	0

 52 3ebbd193 2017-06-19 rsc #define	U_DIR	1

 53 3ebbd193 2017-06-19 rsc #define	L_DIR	2

 54 3ebbd193 2017-06-19 rsc #define	D_DIR	3

 55 3ebbd193 2017-06-19 rsc #define	ishor(n)	(((n) & V) == 0)

 56 3ebbd193 2017-06-19 rsc #define	isvert(n)	(((n) & V) != 0)

 57 3ebbd193 2017-06-19 rsc #define	isright(n)	((n) == R_DIR)

 58 3ebbd193 2017-06-19 rsc #define	isleft(n)	((n) == L_DIR)

 59 3ebbd193 2017-06-19 rsc #define	isdown(n)	((n) == D_DIR)

 60 3ebbd193 2017-06-19 rsc #define	isup(n)		((n) == U_DIR)

 61 3ebbd193 2017-06-19 rsc 

 62 3ebbd193 2017-06-19 rsc typedef	float	ofloat;	/* for o_val[] in obj;  could be double */

 63 3ebbd193 2017-06-19 rsc 

 64 3ebbd193 2017-06-19 rsc typedef struct obj {	/* stores various things in variable length */

 65 3ebbd193 2017-06-19 rsc 	int	o_type;

 66 3ebbd193 2017-06-19 rsc 	int	o_count;	/* number of things */

 67 3ebbd193 2017-06-19 rsc 	int	o_nobj;		/* index in objlist */

 68 3ebbd193 2017-06-19 rsc 	int	o_mode;		/* hor or vert */

 69 3ebbd193 2017-06-19 rsc 	float	o_x;		/* coord of "center" */

 70 3ebbd193 2017-06-19 rsc 	float	o_y;

 71 3ebbd193 2017-06-19 rsc 	int	o_nt1;		/* 1st index in text[] for this object */

 72 3ebbd193 2017-06-19 rsc 	int	o_nt2;		/* 2nd; difference is #text strings */

 73 3ebbd193 2017-06-19 rsc 	int	o_attr;		/* HEAD, CW, INVIS, etc., go here */

 74 3ebbd193 2017-06-19 rsc 	int	o_size;		/* linesize */

 75 3ebbd193 2017-06-19 rsc 	int	o_nhead;	/* arrowhead style */

 76 3ebbd193 2017-06-19 rsc 	struct symtab *o_symtab; /* symtab for [...] */

 77 3ebbd193 2017-06-19 rsc 	float	o_ddval;	/* value of dot/dash expression */

 78 3ebbd193 2017-06-19 rsc 	float	o_fillval;	/* gray scale value */

 79 3ebbd193 2017-06-19 rsc 	ofloat	o_val[1];	/* actually this will be > 1 in general */

 80 3ebbd193 2017-06-19 rsc 				/* type is not always FLOAT!!!! */

 81 3ebbd193 2017-06-19 rsc } obj;

 82 3ebbd193 2017-06-19 rsc 

 83 3ebbd193 2017-06-19 rsc typedef union {		/* the yacc stack type */

 84 3ebbd193 2017-06-19 rsc 	int	i;

 85 3ebbd193 2017-06-19 rsc 	char	*p;

 86 3ebbd193 2017-06-19 rsc 	obj	*o;

 87 3ebbd193 2017-06-19 rsc 	double	f;

 88 3ebbd193 2017-06-19 rsc 	struct symtab *st;

 89 3ebbd193 2017-06-19 rsc } YYSTYPE;

 90 3ebbd193 2017-06-19 rsc 

 91 3ebbd193 2017-06-19 rsc extern	YYSTYPE	yylval, yyval;

 92 3ebbd193 2017-06-19 rsc 

 93 3ebbd193 2017-06-19 rsc struct symtab {

 94 3ebbd193 2017-06-19 rsc 	char	*s_name;

 95 3ebbd193 2017-06-19 rsc 	int	s_type;

 96 3ebbd193 2017-06-19 rsc 	YYSTYPE	s_val;

 97 3ebbd193 2017-06-19 rsc 	struct symtab *s_next;

 98 3ebbd193 2017-06-19 rsc };

 99 3ebbd193 2017-06-19 rsc 

100 3ebbd193 2017-06-19 rsc typedef struct {	/* attribute of an object */

101 3ebbd193 2017-06-19 rsc 	int	a_type;

102 3ebbd193 2017-06-19 rsc 	int	a_sub;

103 3ebbd193 2017-06-19 rsc 	YYSTYPE	a_val;

104 3ebbd193 2017-06-19 rsc } Attr;

105 3ebbd193 2017-06-19 rsc 

106 3ebbd193 2017-06-19 rsc typedef struct {

107 3ebbd193 2017-06-19 rsc 	int	t_type;		/* CENTER, LJUST, etc. */

108 3ebbd193 2017-06-19 rsc 	char	t_op;		/* optional sign for size changes */

109 3ebbd193 2017-06-19 rsc 	char	t_size;		/* size, abs or rel */

110 3ebbd193 2017-06-19 rsc 	char	*t_val;

111 3ebbd193 2017-06-19 rsc } Text;

112 3ebbd193 2017-06-19 rsc 

113 3ebbd193 2017-06-19 rsc #define	String	01

114 3ebbd193 2017-06-19 rsc #define	Macro	02

115 3ebbd193 2017-06-19 rsc #define	File	04

116 3ebbd193 2017-06-19 rsc #define	Char	010

117 3ebbd193 2017-06-19 rsc #define	Thru	020

118 3ebbd193 2017-06-19 rsc #define	Free	040

119 3ebbd193 2017-06-19 rsc 

120 3ebbd193 2017-06-19 rsc typedef struct {	/* input source */

121 3ebbd193 2017-06-19 rsc 	int	type;	/* Macro, String, File */

122 3ebbd193 2017-06-19 rsc 	char	*sp;	/* if String or Macro */

123 3ebbd193 2017-06-19 rsc } Src;

124 3ebbd193 2017-06-19 rsc 

125 3ebbd193 2017-06-19 rsc extern	Src	src[], *srcp;	/* input source stack */

126 3ebbd193 2017-06-19 rsc 

127 3ebbd193 2017-06-19 rsc typedef struct {

128 3ebbd193 2017-06-19 rsc 	FILE	*fin;

129 3ebbd193 2017-06-19 rsc 	char	*fname;

130 3ebbd193 2017-06-19 rsc 	int	lineno;

131 3ebbd193 2017-06-19 rsc } Infile;

132 3ebbd193 2017-06-19 rsc 

133 3ebbd193 2017-06-19 rsc extern	Infile	infile[], *curfile;

134 3ebbd193 2017-06-19 rsc 

135 3ebbd193 2017-06-19 rsc #define	MAXARGS	20

136 3ebbd193 2017-06-19 rsc typedef struct {	/* argument stack */

137 3ebbd193 2017-06-19 rsc 	char	*argstk[MAXARGS];	/* pointers to args */

138 3ebbd193 2017-06-19 rsc 	char	*argval;	/* points to space containing args */

139 3ebbd193 2017-06-19 rsc } Arg;

140 3ebbd193 2017-06-19 rsc 

141 3ebbd193 2017-06-19 rsc extern	int	dbg;

142 3ebbd193 2017-06-19 rsc extern	obj	**objlist;

143 3ebbd193 2017-06-19 rsc extern	int	nobj, nobjlist;

144 3ebbd193 2017-06-19 rsc extern	Attr	*attr;

145 3ebbd193 2017-06-19 rsc extern	int	nattr, nattrlist;

146 3ebbd193 2017-06-19 rsc extern	Text	*text;

147 3ebbd193 2017-06-19 rsc extern	int	ntextlist;

148 3ebbd193 2017-06-19 rsc extern	int	ntext;

149 3ebbd193 2017-06-19 rsc extern	int	ntext1;

150 3ebbd193 2017-06-19 rsc extern	double	curx, cury;

151 3ebbd193 2017-06-19 rsc extern	int	hvmode;

152 3ebbd193 2017-06-19 rsc extern	int	codegen;

153 3ebbd193 2017-06-19 rsc extern	char	*PEstring;

154 3ebbd193 2017-06-19 rsc 

155 3ebbd193 2017-06-19 rsc char	*tostring(char *);

156 3ebbd193 2017-06-19 rsc char	*grow(char *, char *, int, int);

157 3ebbd193 2017-06-19 rsc double	getfval(char *), getcomp(obj *, int), getblkvar(obj *, char *);

158 3ebbd193 2017-06-19 rsc YYSTYPE	getvar(char *);

159 3ebbd193 2017-06-19 rsc struct	symtab *lookup(char *), *makevar(char *, int, YYSTYPE);

160 3ebbd193 2017-06-19 rsc char	*ifstat(double, char *, char *), *delimstr(char *), *sprintgen(char *);

161 3ebbd193 2017-06-19 rsc void	forloop(char *var, double from, double to, int op, double by, char *_str);

162 3ebbd193 2017-06-19 rsc int	setdir(int), curdir(void);

163 3ebbd193 2017-06-19 rsc void	resetvar(void);

164 3ebbd193 2017-06-19 rsc void	checkscale(char *);

165 3ebbd193 2017-06-19 rsc void	pushsrc(int, char *);

166 3ebbd193 2017-06-19 rsc void	copy(void);

167 3ebbd193 2017-06-19 rsc void	copyuntil(char *);

168 3ebbd193 2017-06-19 rsc void	copyfile(char *);

169 3ebbd193 2017-06-19 rsc void	copydef(struct symtab *);

170 3ebbd193 2017-06-19 rsc void	definition(char *);

171 3ebbd193 2017-06-19 rsc struct symtab *copythru(char *);

172 3ebbd193 2017-06-19 rsc int	input(void);

173 3ebbd193 2017-06-19 rsc int	unput(int);

174 3ebbd193 2017-06-19 rsc void	extreme(double, double);

175 3ebbd193 2017-06-19 rsc 

176 3ebbd193 2017-06-19 rsc extern	double	deltx, delty;

177 3ebbd193 2017-06-19 rsc extern	int	lineno;

178 3ebbd193 2017-06-19 rsc extern	int	synerr;

179 3ebbd193 2017-06-19 rsc 

180 3ebbd193 2017-06-19 rsc extern	double	xmin, ymin, xmax, ymax;

181 3ebbd193 2017-06-19 rsc 

182 3ebbd193 2017-06-19 rsc obj	*leftthing(int), *boxgen(void), *circgen(int), *arcgen(int);

183 3ebbd193 2017-06-19 rsc obj	*linegen(int), *splinegen(void), *movegen(void);

184 3ebbd193 2017-06-19 rsc obj	*textgen(void), *plotgen(void);

185 3ebbd193 2017-06-19 rsc obj	*troffgen(char *), *rightthing(obj *, int), *blockgen(obj *, obj *);

186 3ebbd193 2017-06-19 rsc obj	*makenode(int, int), *makepos(double, double);

187 3ebbd193 2017-06-19 rsc obj	*fixpos(obj *, double, double);

188 3ebbd193 2017-06-19 rsc obj	*addpos(obj *, obj *), *subpos(obj *, obj *);

189 3ebbd193 2017-06-19 rsc obj	*makebetween(double, obj *, obj *);

190 3ebbd193 2017-06-19 rsc obj	*getpos(obj *, int), *gethere(void), *getfirst(int, int);

191 3ebbd193 2017-06-19 rsc obj	*getlast(int, int), *getblock(obj *, char *);

192 3ebbd193 2017-06-19 rsc void	savetext(int, char *);

193 3ebbd193 2017-06-19 rsc void	makeiattr(int, int);

194 3ebbd193 2017-06-19 rsc void	makevattr(char *);

195 3ebbd193 2017-06-19 rsc void	makefattr(int type, int sub, double f);

196 3ebbd193 2017-06-19 rsc void	maketattr(int, char *);

197 3ebbd193 2017-06-19 rsc void	makeoattr(int, obj *);

198 3ebbd193 2017-06-19 rsc void	makeattr(int type, int sub, YYSTYPE val);

199 3ebbd193 2017-06-19 rsc void	printexpr(double);

200 3ebbd193 2017-06-19 rsc void	printpos(obj *);

201 3ebbd193 2017-06-19 rsc void	exprsave(double);

202 3ebbd193 2017-06-19 rsc void	addtattr(int);

203 3ebbd193 2017-06-19 rsc void	printlf(int, char *);

204 3ebbd193 2017-06-19 rsc 

205 3ebbd193 2017-06-19 rsc struct pushstack {

206 3ebbd193 2017-06-19 rsc 	double	p_x;

207 3ebbd193 2017-06-19 rsc 	double	p_y;

208 3ebbd193 2017-06-19 rsc 	int	p_hvmode;

209 3ebbd193 2017-06-19 rsc 	double	p_xmin;

210 3ebbd193 2017-06-19 rsc 	double	p_ymin;

211 3ebbd193 2017-06-19 rsc 	double	p_xmax;

212 3ebbd193 2017-06-19 rsc 	double	p_ymax;

213 3ebbd193 2017-06-19 rsc 	struct symtab *p_symtab;

214 3ebbd193 2017-06-19 rsc };

215 3ebbd193 2017-06-19 rsc extern	struct pushstack stack[];

216 3ebbd193 2017-06-19 rsc extern	int	nstack;

217 3ebbd193 2017-06-19 rsc extern	int	cw;

218 3ebbd193 2017-06-19 rsc 

219 3ebbd193 2017-06-19 rsc extern	double	errcheck(double, char *);

220 3ebbd193 2017-06-19 rsc #define	Log10(x) errcheck(log10(x), "log")

221 3ebbd193 2017-06-19 rsc #define	Exp(x)	errcheck(exp(x), "exp")

222 3ebbd193 2017-06-19 rsc #define	Sqrt(x)	errcheck(sqrt(x), "sqrt")