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

(xuflds): Simplify test for space in values[].

Browse source
This commit is contained in:
Markus Armbruster 2005-12-02 17:05:25 +00:00
parent 8d0ec9db08
commit f6bec2c3f7
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,6 +32,8 @@
* Markus Armbruster, 2005 * Markus Armbruster, 2005
*/ */
/* FIXME normalize terminology: table/rows/columns or file/records/fields */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -111,8 +113,11 @@ xuflds(FILE *fp, struct value values[])
char sep; char sep;
char buf[1024]; char buf[1024];
for (i = 0; i < MAX_NUM_COLUMNS; i++) { for (i = 0; ; i++) {
values[i].v_type = VAL_NOTUSED; values[i].v_type = VAL_NOTUSED;
if (i >= MAX_NUM_COLUMNS)
return gripe("Too many columns");
ch = getc(fp); ch = getc(fp);
ungetc(ch, fp); ungetc(ch, fp);
@ -157,8 +162,6 @@ xuflds(FILE *fp, struct value values[])
"Expected space or newline as field separator found %c", "Expected space or newline as field separator found %c",
sep); sep);
} }
if (i >= MAX_NUM_COLUMNS)
return gripe("Too many columns");
if (i == 0) if (i == 0)
return gripe("No columns read"); return gripe("No columns read");
values[++i].v_type = VAL_NOTUSED; values[++i].v_type = VAL_NOTUSED;