mirror of
https://github.com/postgres/postgres.git
synced 2025-05-03 22:24:49 +03:00
Back-patch 9.4-era compiler warning fixes into older branches.
This applies portions of commits b64b5ccb6 and b1aebbb6a to the older branches, in hopes of getting -Werror builds to succeed there. The applied changes simply remove useless tests, eg checking an unsigned variable to see if it is >= 0. Recent versions of clang warn about such tests by default.
This commit is contained in:
parent
6b77a0e125
commit
e9e2bde2d2
@ -358,7 +358,7 @@ SetWALFileNameForCleanup(void)
|
||||
if (keepfiles > 0)
|
||||
{
|
||||
sscanf(nextWALFileName, "%08X%08X%08X", &tli, &log, &seg);
|
||||
if (tli > 0 && log >= 0 && seg > 0)
|
||||
if (tli > 0 && seg > 0)
|
||||
{
|
||||
log_diff = keepfiles / MaxSegmentsPerLogFile;
|
||||
seg_diff = keepfiles % MaxSegmentsPerLogFile;
|
||||
|
@ -2897,7 +2897,7 @@ PQoidStatus(const PGresult *res)
|
||||
|
||||
size_t len;
|
||||
|
||||
if (!res || !res->cmdStatus || strncmp(res->cmdStatus, "INSERT ", 7) != 0)
|
||||
if (!res || strncmp(res->cmdStatus, "INSERT ", 7) != 0)
|
||||
return "";
|
||||
|
||||
len = strspn(res->cmdStatus + 7, "0123456789");
|
||||
@ -2921,7 +2921,6 @@ PQoidValue(const PGresult *res)
|
||||
unsigned long result;
|
||||
|
||||
if (!res ||
|
||||
!res->cmdStatus ||
|
||||
strncmp(res->cmdStatus, "INSERT ", 7) != 0 ||
|
||||
res->cmdStatus[7] < '0' ||
|
||||
res->cmdStatus[7] > '9')
|
||||
|
Loading…
x
Reference in New Issue
Block a user