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

(xundump): Move the header parsing into a separate function xuheader().

Browse source 
Move the trailer parsing into a separate function xutrailer().

(xuheader, xutrailer): New functions.
This commit is contained in:
Ron Koenderink 2006-01-01 03:37:36 +00:00
parent 9fcb96e010
commit 15e40c55cd
1 changed files with 57 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -474,21 +474,13 @@ xuloadrow(int type, int row, struct value values[])
return 0; return 0;
} }
int static int
xundump(FILE *fp, char *file, int expected_table) xuheader(FILE *fp, int expected_table, struct value values[])
{ {
char name[64]; char name[64];
struct empfile *ep; struct empfile *ep;
int row, res, rows, ch; int res, ch;
struct value values[MAX_NUM_COLUMNS + 1];
int type; int type;
int fixed_rows, need_sentinel;
if (strcmp(fname, file) != 0) {
fname = file;
lineno = 1;
} else
lineno++;
while ((ch = skipfs(fp)) == '\n') while ((ch = skipfs(fp)) == '\n')
lineno++; lineno++;
@ -514,7 +506,55 @@ xundump(FILE *fp, char *file, int expected_table)
if (expected_table != EF_BAD && expected_table != type) if (expected_table != EF_BAD && expected_table != type)
return gripe("Expected table `%s', not `%s'", return gripe("Expected table `%s', not `%s'",
ef_nameof(expected_table), name); ef_nameof(expected_table), name);
return type;
}
static int
xutrailer(FILE *fp, int type, int row)
{
int rows, ch;
ch = skipfs(fp);
if (!isdigit(ch)) {
if (ch != '\n')
return gripe("Malformed table footer");
} else {
ungetc(ch, fp);
if (fscanf(fp, "%d", &rows) != 1)
return gripe("Malformed table footer");
if (row != rows)
return gripe("Read %d rows, which doesn't match footer "
"%d rows", row, rows);
}
if (skipfs(fp) != '\n')
return gripe("Junk after table footer");
while ((ch = skipfs(fp)) == '\n') ;
ungetc(ch, fp);
return 0;
}
int
xundump(FILE *fp, char *file, int expected_table)
{
int row, res, ch;
struct empfile *ep;
int need_sentinel;
struct value values[MAX_NUM_COLUMNS + 1];
int type;
int fixed_rows;
if (strcmp(fname, file) != 0) {
fname = file;
lineno = 1;
} else
lineno++;
if ((type = xuheader(fp, expected_table, values)) == -1)
return -1;
ep = &empfile[type];
fixed_rows = has_const(ef_cadef(type)); fixed_rows = has_const(ef_cadef(type));
need_sentinel = !fixed_rows; /* FIXME only approximation */ need_sentinel = !fixed_rows; /* FIXME only approximation */
@ -532,7 +572,7 @@ xundump(FILE *fp, char *file, int expected_table)
res = xuflds(fp, values); res = xuflds(fp, values);
if (res > 0 && row >= ep->csize - 1) { if (res > 0 && row >= ep->csize - 1) {
/* TODO grow cache unless EFF_STATIC */ /* TODO grow cache unless EFF_STATIC */
gripe("Too many rows for table %s", name); gripe("Too many rows for table %s", ef_nameof(type));
res = -1; res = -1;
} }
if (res > 0) { if (res > 0) {
@ -545,25 +585,16 @@ xundump(FILE *fp, char *file, int expected_table)
if (res < 0) if (res < 0)
return -1; return -1;
} }
ch = getc(fp);
ungetc(ch, fp);
if (!isdigit(ch) || fscanf(fp, "%d", &rows) != 1)
return gripe("Malformed table footer");
if (skipfs(fp) != '\n')
return gripe("Junk after table footer");
if (row != rows)
return gripe("Read %d rows, which doesn't match footer",
row);
if (fixed_rows && row != ep->csize -1) if (fixed_rows && row != ep->csize -1)
return gripe("Table %s requires %d rows, got %d", return gripe("Table %s requires %d rows, got %d",
name, ep->csize - 1, row); ef_nameof(type), ep->csize - 1, row);
if (need_sentinel) if (need_sentinel)
xuinitrow(type, row); xuinitrow(type, row);
while ((ch = skipfs(fp)) == '\n') ; if (xutrailer(fp, type, row) == -1)
ungetc(ch, fp); return -1;
ep->fids = ep->cids = row; ep->fids = ep->cids = row;
return type; return type;
} }