Commit80dc7e2

committed

Clean up some minor gcc warnings. I'm not touching the

major one, though, which is the truly ugly stores into libpq privatestorage. Can't you find a better way to do this?

1 parent9392299 commit80dc7e2Copy full SHA for 80dc7e2

File tree

-2

lines changed

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ static PGresult *res = NULL;`
`30`	`30`
`31`	`31`	`staticinton_error_state=ON_ERROR_STOP;`
`32`	`32`
`33`		`-staticin_result_block= FALSE;`
`34`		`-staticwas_get_unset_result= FALSE;`
	`33`	`+staticintin_result_block= FALSE;`
	`34`	`+staticintwas_get_unset_result= FALSE;`
`35`	`35`
`36`	`36`	`/* LOCAL VARIABLES */`
`37`	`37`	`staticinttuple;`
`@@ -214,6 +214,7 @@ get_result()`
`214`	`214`	`was_get_unset_result= TRUE;`
`215`	`215`
`216`	`216`	`/* we have to store the fetch location somewhere */`
	`217`	`+/* XXX THIS IS A NO-NO */`
`217`	`218`	`cmdstatus[0]=NUL;`
`218`	`219`	`memcpy(&cmdstatus[1],&tuple,sizeof(tuple));`
`219`	`220`
`@@ -235,13 +236,16 @@ set_result(PGresult *newres)`
`235`	`236`	`halt("set_result called with null result pointer\n");`
`236`	`237`
`237`	`238`	`if (res!=NULL&&was_get_unset_result== FALSE)`
	`239`	`+{`
`238`	`240`	`if (in_result_block== FALSE)`
`239`	`241`	`PQclear(res);`
`240`	`242`	`else`
`241`	`243`	`{`
	`244`	`+/* XXX THIS IS A NO-NO */`
`242`	`245`	`cmdstatus[0]=NUL;`
`243`	`246`	`memcpy(&cmdstatus[1],&tuple,sizeof(tuple));`
`244`	`247`	`}`
	`248`	`+}`
`245`	`249`
`246`	`250`	`in_result_block= TRUE;`
`247`	`251`	`was_get_unset_result= FALSE;`
`@@ -270,6 +274,8 @@ unset_result(PGresult *oldres)`
`270`	`274`	`halt("Unset of result without being set.\n");`
`271`	`275`
`272`	`276`	`was_get_unset_result= TRUE;`
	`277`	`+`
	`278`	`+/* XXX THIS IS A NO-NO */`
`273`	`279`	`cmdstatus[0]=NUL;`
`274`	`280`	`memcpy(&cmdstatus[1],&tuple,sizeof(tuple));`
`275`	`281`	`in_result_block= FALSE;`

Comments

(0)