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

(defellipsis, chkflds, xundump2, need_uid): Use new need_uid to

Browse source 
require index field in all parts of a split table.
This commit is contained in:
Markus Armbruster 2006-02-14 18:04:44 +00:00
parent fc676cb53a
commit c73613ea26
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,7 @@
static char *fname; static char *fname;
static int lineno; static int lineno;
static int human; static int human;
static int ellipsis; static int ellipsis, need_uid;
static int cur_type, cur_id; static int cur_type, cur_id;
static void *cur_obj; static void *cur_obj;
static int nflds; static int nflds;
@ -325,6 +325,7 @@ defellipsis(int fldno)
if (ca[0].ca_table != cur_type) if (ca[0].ca_table != cur_type)
return gripe("Table %s doesn't support ...", ef_nameof(cur_type)); return gripe("Table %s doesn't support ...", ef_nameof(cur_type));
ellipsis = fldno; ellipsis = fldno;
need_uid = 1;
return 0; return 0;
} }
@ -334,7 +335,7 @@ chkflds(void)
struct castr *ca = ef_cadef(cur_type); struct castr *ca = ef_cadef(cur_type);
int i, len, res = 0; int i, len, res = 0;
if (ellipsis) { if (need_uid) {
if (!caflds[0]) if (!caflds[0])
return gripe("Header field %s required with ...", ca[0].ca_name); return gripe("Header field %s required with ...", ca[0].ca_name);
return 0; return 0;
@ -759,6 +760,8 @@ xundump(FILE *fp, char *file, int expected_table)
static int static int
xundump2(FILE *fp, int type, struct castr *ca) xundump2(FILE *fp, int type, struct castr *ca)
{ {
need_uid = 0;
for (;;) { for (;;) {
if (xuheader1(fp, type, ca) < 0) if (xuheader1(fp, type, ca) < 0)
return -1; return -1;