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

s_char purge directed by compiler warnings.

Browse source
This commit is contained in:
Markus Armbruster 2006-04-29 06:41:45 +00:00
parent 87b5d5d6e3
commit a988b907fc
130 changed files with 527 additions and 527 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/update/distribute.c
View file

@ -57,7 +57,7 @@
#endif
int
dodistribute(struct sctstr *sp, int imex, s_char *path, double dist_i_cost,
dodistribute(struct sctstr *sp, int imex, char *path, double dist_i_cost,
double dist_e_cost)
/* import or export? */
{

18
src/lib/update/finish.c
View file

@ -48,7 +48,7 @@
/* Used for building up distribution info */
struct distinfo {
s_char *path; /* path to take */
char *path; /* path to take */
double imcost; /* import cost */
double excost; /* export cost */
};
@ -66,11 +66,11 @@ static struct distinfo *g_distptrs;
/* #define SAVE_FINISH_PATHS */
#ifndef SAVE_FINISH_PATHS
static s_char *finish_path = "h"; /* Placeholder indicating path exists */
static char *finish_path = "h"; /* Placeholder indicating path exists */
#endif /* SAVE_FINISH_PATHS */
static void assemble_dist_paths(struct distinfo *distptrs);
static s_char *ReversePath(s_char *path);
static char *ReversePath(char *path);
void
finish_sects(int etu)
@ -176,13 +176,13 @@ finish_sects(int etu)
static void
assemble_dist_paths(struct distinfo *distptrs)
{
s_char *path, *p;
char *path, *p;
double d;
struct sctstr *sp;
struct sctstr *dist;
struct distinfo *infptr;
int n;
s_char buf[512];
char buf[512];
for (n = 0; NULL != (sp = getsectid(n)); n++) {
if ((sp->sct_dist_x == sp->sct_x) && (sp->sct_dist_y == sp->sct_y))
@ -229,11 +229,11 @@ assemble_dist_paths(struct distinfo *distptrs)
}
}
static s_char *
ReversePath(s_char *path)
static char *
ReversePath(char *path)
{
s_char *patharray = "aucdefjhigklmyopqrstbvwxnz";
static s_char new_path[512];
char *patharray = "aucdefjhigklmyopqrstbvwxnz";
static char new_path[512];
int ind;
if (path == NULL)

4
src/lib/update/sail.c
View file

@ -98,7 +98,7 @@ sail_find_fleet(struct fltheadstr **head, struct shpstr *sp)
int len = 0;
int follow = -1;
int stop;
s_char *cp;
char *cp;
if (sp->shp_own == 0)
return 0;
@ -211,7 +211,7 @@ sail_nav_fleet(struct fltheadstr *fltp)
struct shpstr *sp, ship;
struct sctstr *sectp;
int error = 0;
s_char *s, *p;
char *s, *p;
natid own;
struct emp_qelem ship_list;
int dir;