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

(xundump): Skip lines beginning with '#'.

Browse source 
These lines are considered comments.

(xuskipcommentlines): New.
This commit is contained in:
Ron Koenderink 2005-11-29 21:50:31 +00:00
parent 2517931b12
commit 03121d44aa
1 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -388,6 +388,26 @@ xuloadrow(int type, int row, struct value values[])
return 0; return 0;
} }
void
xuskipcommentlines(FILE *fp)
{
int ch;
for (;;) {
ch = getc(fp);
if (ch == EOF)
return;
if (ch == '#') {
do {
ch = getc(fp);
} while (ch != '\n' && ch != EOF);
} else {
ungetc(ch, fp);
return;
}
}
}
int int
xundump(FILE *fp, char *file, int expected_table) xundump(FILE *fp, char *file, int expected_table)
{ {
@ -404,6 +424,7 @@ xundump(FILE *fp, char *file, int expected_table)
} else } else
lineno++; lineno++;
xuskipcommentlines(fp);
if (fscanf(fp, "XDUMP %63[^0123456789]%*d%c", name, &sep) != 2) if (fscanf(fp, "XDUMP %63[^0123456789]%*d%c", name, &sep) != 2)
return gripe("Expected XDUMP header"); return gripe("Expected XDUMP header");
if (sep != '\n') if (sep != '\n')
@ -427,6 +448,7 @@ xundump(FILE *fp, char *file, int expected_table)
fixed_rows = has_const(ef_cadef(type)); fixed_rows = has_const(ef_cadef(type));
for (row = 0; ; row++) { for (row = 0; ; row++) {
xuskipcommentlines(fp);
lineno++; lineno++;
ch = getc(fp); ch = getc(fp);
ungetc(ch, fp); ungetc(ch, fp);
@ -465,5 +487,6 @@ xundump(FILE *fp, char *file, int expected_table)
if (!fixed_rows) if (!fixed_rows)
xuinitrow(type, row); xuinitrow(type, row);
xuskipcommentlines(fp);
return 0; return 0;
} }