empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(att_mode, xyas, ownxy, prbuf): Get rid of s_char. Users changed.

Browse source 
(ATTRIBUTE): Don't disable use of gcc __attribute__ when s_char is
signed char.  All format strings are now char *.
This commit is contained in:
Markus Armbruster 2005-12-28 22:30:52 +00:00
parent 24a07cd249
commit 686eadad37
5 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/combat.h
View file

@ -97,6 +97,6 @@ extern int att_fight(int, struct combat *, struct emp_qelem *, double,
extern int att_free_lists(struct emp_qelem *, struct emp_qelem *); extern int att_free_lists(struct emp_qelem *, struct emp_qelem *);
extern s_char *att_mode[]; extern char *att_mode[A_LBOARD + 1];
#endif /* _COMBAT_H_ */ #endif /* _COMBAT_H_ */

5
include/misc.h
View file

@ -103,9 +103,6 @@ typedef u_char natid; /* NSC_NATID must match this */
typedef char s_char; /* change to signed char for aix */ typedef char s_char; /* change to signed char for aix */
#else #else
typedef signed char s_char; typedef signed char s_char;
/* gcc __attribute__((format ...)) chokes on s_char * format strings */
#undef ATTRIBUTE
#define ATTRIBUTE(attr)
#endif /* !aix && !sgi */ #endif /* !aix && !sgi */
typedef short coord; typedef short coord;
@ -141,7 +138,7 @@ extern char *getstarg(char *input, char *prompt, char buf[]);
extern char *getstring(char *prompt, char buf[]); extern char *getstring(char *prompt, char buf[]);
extern char *ugetstring(char *prompt, char buf[]); extern char *ugetstring(char *prompt, char buf[]);
extern s_char *prbuf(s_char *format, ...) extern char *prbuf(char *format, ...)
ATTRIBUTE((format (printf, 1, 2))); ATTRIBUTE((format (printf, 1, 2)));
#define AGREE_FREE 0 #define AGREE_FREE 0

4
include/xy.h
View file

@ -53,8 +53,8 @@ struct range {
int height; int height;
}; };
extern s_char *xyas(coord x, coord y, natid country); extern char *xyas(coord x, coord y, natid country);
extern s_char *ownxy(struct sctstr *sp); extern char *ownxy(struct sctstr *sp);
extern coord xrel(struct natstr *np, coord absx); extern coord xrel(struct natstr *np, coord absx);
extern coord yrel(struct natstr *np, coord absy); extern coord yrel(struct natstr *np, coord absy);
extern void xyrelrange(struct natstr *np, struct range *src, extern void xyrelrange(struct natstr *np, struct range *src,

10
src/lib/common/xy.c
View file

@ -49,7 +49,7 @@
* return pointer to a string containing the x,y * return pointer to a string containing the x,y
* coords as desired by a particular target country. * coords as desired by a particular target country.
*/ */
s_char * char *
xyas(coord x, coord y, natid country) xyas(coord x, coord y, natid country)
{ {
struct natstr *np; struct natstr *np;
@ -58,7 +58,7 @@ xyas(coord x, coord y, natid country)
return prbuf("%d,%d", xrel(np, x), yrel(np, y)); return prbuf("%d,%d", xrel(np, x), yrel(np, y));
} }
s_char * char *
ownxy(struct sctstr *sp) ownxy(struct sctstr *sp)
{ {
return xyas(sp->sct_x, sp->sct_y, sp->sct_own); return xyas(sp->sct_x, sp->sct_y, sp->sct_own);
@ -223,11 +223,11 @@ xyinrange(coord x, coord y, struct range *rp)
} }
s_char * char *
prbuf(s_char *format, ...) prbuf(char *format, ...)
{ {
static int nbuf = -1; static int nbuf = -1;
static s_char buf[20][1024]; static char buf[20][1024];
va_list ap; va_list ap;
if (++nbuf > 19) if (++nbuf > 19)

2
src/lib/subs/attsub.c
View file

@ -87,7 +87,7 @@ static int take_def(int combat_mode, struct emp_qelem *list,
static int get_land(int combat_mode, struct combat *def, int uid, static int get_land(int combat_mode, struct combat *def, int uid,
struct llist *llp, int victim_land); struct llist *llp, int victim_land);
s_char *att_mode[] = { char *att_mode[] = {
/* must match combat types in combat.h */ /* must match combat types in combat.h */
"defend", "attack", "assault", "paradrop", "board", "lboard" "defend", "attack", "assault", "paradrop", "board", "lboard"
}; };