Commite331c60

committed

Suppress remaining -Waddress warnings from recent gcc versions.

Still an exercise in satisfying pedants.

1 parentaa90e14 commite331c60Copy full SHA for e331c60

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1673,7 +1673,7 @@ evaluate_backtick(void)`
`1673`	`1673`	`error = true;`
`1674`	`1674`	`}`
`1675`	`1675`
`1676`		`-if (PQExpBufferBroken(&cmd_output))`
	`1676`	`+if (PQExpBufferDataBroken(cmd_output))`
`1677`	`1677`	`{`
`1678`	`1678`	`psql_error("%s: out of memory\n", cmd);`
`1679`	`1679`	`error = true;`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -829,7 +829,7 @@ PQconndefaults(void)`
`829`	`829`	`PQconninfoOption*connOptions;`
`830`	`830`
`831`	`831`	`initPQExpBuffer(&errorBuf);`
`832`		`-if (PQExpBufferBroken(&errorBuf))`
	`832`	`+if (PQExpBufferDataBroken(errorBuf))`
`833`	`833`	`returnNULL;/* out of memory already :-( */`
`834`	`834`	`connOptions=conninfo_parse("",&errorBuf, true);`
`835`	`835`	`termPQExpBuffer(&errorBuf);`
`@@ -3967,7 +3967,7 @@ PQconninfoParse(const char conninfo, char *errmsg)`
`3967`	`3967`	`if (errmsg)`
`3968`	`3968`	`errmsg=NULL;/ default */`
`3969`	`3969`	`initPQExpBuffer(&errorBuf);`
`3970`		`-if (PQExpBufferBroken(&errorBuf))`
	`3970`	`+if (PQExpBufferDataBroken(errorBuf))`
`3971`	`3971`	`returnNULL;/* out of memory already :-( */`
`3972`	`3972`	`connOptions=conninfo_parse(conninfo,&errorBuf, false);`
`3973`	`3973`	`if (connOptions==NULL&&errmsg)`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,14 @@ typedef PQExpBufferData *PQExpBuffer;`
`59`	`59`	`#definePQExpBufferBroken(str)\`
`60`	`60`	`((str) == NULL \|\| (str)->maxlen == 0)`
`61`	`61`
	`62`	`+/*------------------------`
	`63`	`+ * Same, but for use when using a static or local PQExpBufferData struct.`
	`64`	`+ * For that, a null-pointer test is useless and may draw compiler warnings.`
	`65`	`+ *------------------------`
	`66`	`+ */`
	`67`	`+#definePQExpBufferDataBroken(buf)\`
	`68`	`+((buf).maxlen == 0)`
	`69`	`+`
`62`	`70`	`/*------------------------`
`63`	`71`	`* Initial size of the data buffer in a PQExpBuffer.`
`64`	`72`	`* NB: this must be large enough to hold error messages that might`

Comments

(0)