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

(xuheader1, xufldhdr, xutrailer, xufooter, xundump2, xutail)

Browse source 
(xundump1, xubody): Rename.
This commit is contained in:
Markus Armbruster 2007-08-05 17:25:01 +00:00
parent 8fead20ac4
commit 94324f7966
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/lib/common/xundump.c
View file

@ -81,8 +81,8 @@ static int xunsymbol(char *, struct castr *, int);
static int setsym(int, char *); static int setsym(int, char *);
static int mtsymset(int, long *); static int mtsymset(int, long *);
static int add2symset(int, long *, char *); static int add2symset(int, long *, char *);
static int xundump1(FILE *); static int xubody(FILE *);
static int xundump2(FILE *, int, struct castr *); static int xutail(FILE *, int, struct castr *);
static int static int
gripe(char *fmt, ...) gripe(char *fmt, ...)
@ -677,7 +677,7 @@ xuheader(FILE *fp, int expected_table)
} }
static int static int
xuheader1(FILE *fp, struct castr ca[]) xufldhdr(FILE *fp, struct castr ca[])
{ {
struct castr **fca; struct castr **fca;
int *fidx; int *fidx;
@ -714,7 +714,7 @@ xuheader1(FILE *fp, struct castr ca[])
} }
static int static int
xutrailer(FILE *fp, int row) xufooter(FILE *fp, int row)
{ {
int rows, res; int rows, res;
@ -764,7 +764,7 @@ xundump(FILE *fp, char *file, int *plno, int expected_table)
caseen = calloc(nca, sizeof(*caseen)); caseen = calloc(nca, sizeof(*caseen));
cur_type = type; cur_type = type;
if (xundump2(fp, type, ca) < 0) if (xutail(fp, type, ca) < 0)
type = EF_BAD; type = EF_BAD;
free(caseen); free(caseen);
@ -782,17 +782,17 @@ xundump(FILE *fp, char *file, int *plno, int expected_table)
} }
static int static int
xundump2(FILE *fp, int type, struct castr *ca) xutail(FILE *fp, int type, struct castr *ca)
{ {
int recs, i; int recs, i;
is_partial = 0; is_partial = 0;
for (;;) { for (;;) {
if (xuheader1(fp, ca) < 0) if (xufldhdr(fp, ca) < 0)
return -1; return -1;
if ((recs = xundump1(fp)) < 0) if ((recs = xubody(fp)) < 0)
return -1; return -1;
if (xutrailer(fp, recs) < 0) if (xufooter(fp, recs) < 0)
return -1; return -1;
if (!ellipsis) if (!ellipsis)
return 0; return 0;
@ -804,7 +804,7 @@ xundump2(FILE *fp, int type, struct castr *ca)
} }
static int static int
xundump1(FILE *fp) xubody(FILE *fp)
{ {
struct empfile *ep = &empfile[cur_type]; struct empfile *ep = &empfile[cur_type];
int need_sentinel = !EF_IS_GAME_STATE(cur_type); int need_sentinel = !EF_IS_GAME_STATE(cur_type);