Commit293fd7c

Michael Meskes

committed

Let compiler handle size calculation of bool types.

Back in the day this did not work, but modern compilers should handle it themselves.

1 parent22f519c commit293fd7cCopy full SHA for 293fd7c

File tree

-27

lines changed

-27

lines changed

Lines changed: 2 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -423,27 +423,13 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,`
`423`	`423`	`caseECPGt_bool:`
`424`	`424`	`if (pval[0]=='f'&&pval[1]=='\0')`
`425`	`425`	`{`
`426`		`-if (offset==sizeof(char))`
`427`		`-((char) (var+offset*act_tuple))= false;`
`428`		`-elseif (offset==sizeof(int))`
`429`		`-((int) (var+offset*act_tuple))= false;`
`430`		`-else`
`431`		`-ecpg_raise(lineno,ECPG_CONVERT_BOOL,`
`432`		`-ECPG_SQLSTATE_DATATYPE_MISMATCH,`
`433`		`-NULL);`
	`426`	`+((bool) (var+offset*act_tuple))= false;`
`434`	`427`	`pval++;`
`435`	`428`	`break;`
`436`	`429`	`}`
`437`	`430`	`elseif (pval[0]=='t'&&pval[1]=='\0')`
`438`	`431`	`{`
`439`		`-if (offset==sizeof(char))`
`440`		`-((char) (var+offset*act_tuple))= true;`
`441`		`-elseif (offset==sizeof(int))`
`442`		`-((int) (var+offset*act_tuple))= true;`
`443`		`-else`
`444`		`-ecpg_raise(lineno,ECPG_CONVERT_BOOL,`
`445`		`-ECPG_SQLSTATE_DATATYPE_MISMATCH,`
`446`		`-NULL);`
	`432`	`+((bool) (var+offset*act_tuple))= true;`
`447`	`433`	`pval++;`
`448`	`434`	`break;`
`449`	`435`	`}`

Lines changed: 2 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -752,18 +752,9 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari`
`752`	`752`	`{`
`753`	`753`	`strcpy(mallocedval,"{");`
`754`	`754`
`755`		`-if (var->offset==sizeof(char))`
`756`		`-for (element=0;element<asize;element++)`
`757`		`-sprintf(mallocedval+strlen(mallocedval),"%c,", (((char*)var->value)[element]) ?'t' :'f');`
	`755`	`+for (element=0;element<asize;element++)`
	`756`	`+sprintf(mallocedval+strlen(mallocedval),"%c,", (((bool*)var->value)[element]) ?'t' :'f');`
`758`	`757`
`759`		`-/*`
`760`		`- * this is necessary since sizeof(C++'s bool)==sizeof(int)`
`761`		`- */`
`762`		`-elseif (var->offset==sizeof(int))`
`763`		`-for (element=0;element<asize;element++)`
`764`		`-sprintf(mallocedval+strlen(mallocedval),"%c,", (((int*)var->value)[element]) ?'t' :'f');`
`765`		`-else`
`766`		`-ecpg_raise(lineno,ECPG_CONVERT_BOOL,ECPG_SQLSTATE_DATATYPE_MISMATCH,NULL);`
`767`	`758`
`768`	`759`	`strcpy(mallocedval+strlen(mallocedval)-1,"}");`
`769`	`760`	`}`

Comments

(0)