Commit44297a0

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 parentba9eb29 commit44297a0Copy full SHA for 44297a0

File tree

-27

lines changed

-27

lines changed

Lines changed: 2 additions & 16 deletions

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

Lines changed: 2 additions & 11 deletions

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

Comments

(0)