Commitd6fbb10

Michael Meskes

committed

Fix ecpg to allow pointer to structs.

1 parent03a321d commitd6fbb10Copy full SHA for d6fbb10

File tree

+20

-7

lines changed

+20

-7

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1166,5 +1166,9 @@ Thu Dec 6 14:02:56 CET 2001`
`1166`	`1166`
`1167`	`1167`	`- Removed debug message from preproc.y.`
`1168`	`1168`	`- Fixed some bugs in exec sql var and exec sql type command.`
	`1169`	`+`
	`1170`	`+Sat Dec 8 21:35:45 CET 2001`
	`1171`	`+`
	`1172`	`+- Fix ecpg to allow pointer to structs.`
`1169`	`1173`	`- Set ecpg version to 2.9.0.`
`1170`	`1174`	`- Set library version to 3.3.0.`

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ ECPGdump_a_struct(FILE o, const char name, const char *ind_name, long arrsiz,`
`361`	`361`	`structECPGstruct_member*p,`
`362`	`362`	`*ind_p=NULL;`
`363`	`363`	`charobuf[BUFSIZ];`
`364`		`-charpbuf[BUFSIZ],`
	`364`	`+charpbuf[BUFSIZ*2],`
`365`	`365`	`ind_pbuf[BUFSIZ];`
`366`	`366`	`constchar*offset;`
`367`	`367`
`@@ -373,7 +373,11 @@ ECPGdump_a_struct(FILE o, const char name, const char *ind_name, long arrsiz,`
`373`	`373`	`else`
`374`	`374`	`offset=offsetarg;`
`375`	`375`
`376`		`-sprintf(pbuf,"%s%s.",prefix ?prefix :"",name);`
	`376`	`+if (arrsiz!=0)`
	`377`	`+sprintf(pbuf,"%s%s.",prefix ?prefix :"",name);`
	`378`	`+else`
	`379`	`+sprintf(pbuf,"%s%s->",prefix ?prefix :"",name);`
	`380`	`+`
`377`	`381`	`prefix=pbuf;`
`378`	`382`
`379`	`383`	`if (ind_typ==&ecpg_no_indicator)`
`@@ -382,7 +386,11 @@ ECPGdump_a_struct(FILE o, const char name, const char *ind_name, long arrsiz,`
`382`	`386`	`}`
`383`	`387`	`elseif (ind_typ!=NULL)`
`384`	`388`	`{`
`385`		`-sprintf(ind_pbuf,"%s%s.",ind_prefix ?ind_prefix :"",ind_name);`
	`389`	`+if (arrsiz!=0)`
	`390`	`+sprintf(ind_pbuf,"%s%s.",ind_prefix ?ind_prefix :"",ind_name);`
	`391`	`+else`
	`392`	`+sprintf(ind_pbuf,"%s%s->",ind_prefix ?ind_prefix :"",ind_name);`
	`393`	`+`
`386`	`394`	`ind_prefix=ind_pbuf;`
`387`	`395`	`ind_p=ind_typ->u.members;`
`388`	`396`	`}`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@ main ()`
`19`	`19`	`exec sql begin declare section;`
`20`	`20`	`struct personal_struct{str name;`
`21`	`21`	`birthinfo birth;`
`22`		`-} personal;`
	`22`	`+} personal, *p;`
`23`	`23`	`struct personal_indicator {int ind_name;`
`24`	`24`	`birthinfo ind_birth;`
`25`		`- } ind_personal;`
	`25`	`+ } ind_personal, *i;`
`26`	`26`	`float ind_married;`
`27`	`27`	`ind children;`
`28`	`28`	`ind ind_children;`
`@@ -63,9 +63,11 @@ exec sql end declare section;`
`63`	`63`
`64`	`64`	`exec sql whenever not found do break;`
`65`	`65`
	`66`	`+p=&personal;`
	`67`	`+i=&ind_personal;`
`66`	`68`	`while (1) {`
`67`	`69`	`strcpy(msg, "fetch");`
`68`		`-exec sql fetch cur into :personal:ind_personal, :married:ind_married, :children.integer:ind_children.smallint;`
	`70`	`+exec sql fetch cur into :p:i, :married:ind_married, :children.integer:ind_children.smallint;`
`69`	`71`	`printf("%8.8s", personal.name.arr);`
`70`	`72`	`if (ind_personal.ind_birth.born >= 0)`
`71`	`73`	`printf(", born %ld", personal.birth.born);`
`@@ -125,6 +127,5 @@ exec sql end declare section;`
`125`	`127`	`if (dbgs != NULL)`
`126`	`128`	`fclose(dbgs);`
`127`	`129`
`128`		`-`
`129`	`130`	`return (0);`
`130`	`131`	`}`

Comments

(0)