Tweak PQresStatus() to avoid a clang compiler warning.

robertmhaas · robertmhaas · commit b43bf617fdb3 · 2011-08-05T12:06:29.000-04:00
The previous test for status &lt; 0 test is in fact testing nothing if the
compiler considers an enum to be an unsigned data type.  clang doesn't
like tautologies, so do this instead.

Report by Peter Geoghegan, fix as suggested by Tom Lane.
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
@@ -2386,7 +2386,7 @@ PQresultStatus(const PGresult *res)
 char *
 PQresStatus(ExecStatusType status)
 {
-	if (status < 0 || status >= sizeof pgresStatus / sizeof pgresStatus[0])
+	if ((unsigned int) status >= sizeof pgresStatus / sizeof pgresStatus[0])
 		return libpq_gettext("invalid ExecStatusType code");
 	return pgresStatus[status];
 }

Original file line number	Diff line number	Diff line change
`@@ -2386,7 +2386,7 @@ PQresultStatus(const PGresult *res)`
`2386`	`2386`	`char *`
`2387`	`2387`	`PQresStatus(ExecStatusType status)`
`2388`	`2388`	`{`
`2389`		`- if (status < 0 \|\| status >= sizeof pgresStatus / sizeof pgresStatus[0])`
	`2389`	`+ if ((unsigned int) status >= sizeof pgresStatus / sizeof pgresStatus[0])`
`2390`	`2390`	`return libpq_gettext("invalid ExecStatusType code");`
`2391`	`2391`	`return pgresStatus[status];`
`2392`	`2392`	`}`