rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Suppress -Wshift-negative-value warnings. 

Clean up four places that result in compiler warnings when using recent
gcc with this warning class enabled (as seen on buildfarm members
calliphoridae, skink, and others).  In all these places, this is purely
cosmetic, because the shift distance could not be large enough to risk
a change of sign, so there's no chance of implementation-dependent
behavior.  Still, it's easy enough to avoid the warning by casting the
shifted value to unsigned, so let's do that.

Patch HEAD only, this isn't worth a back-patch.
This commit is contained in:
Tom Lane 2018-06-17 16:15:11 -04:00
parent 514d4a1338
commit 9b53d96684
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/utils/adt/inet_cidr_ntop.c
View File

@ -202,7 +202,7 @@ inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
b = bits % 8;
if (b != 0)
{
m = ~0 << (8 - b);
m = ((u_int) ~0) << (8 - b);
inbuf[p - 1] &= m;
}

2
src/backend/utils/adt/network.c
View File

@ -1486,7 +1486,7 @@ inetmi(PG_FUNCTION_ARGS)
* have to do proper sign extension.
*/
if (carry == 0 && byte < sizeof(int64))
res |= ((int64) -1) << (byte * 8);
res |= ((uint64) (int64) -1) << (byte * 8);
}
PG_RETURN_INT64(res);

8
src/backend/utils/adt/varbit.c
View File

@ -1539,11 +1539,11 @@ bitfromint4(PG_FUNCTION_ARGS)
/* store first fractional byte */
if (destbitsleft > srcbitsleft)
{
int val = (int) (a >> (destbitsleft - 8));
unsigned int val = (unsigned int) (a >> (destbitsleft - 8));
/* Force sign-fill in case the compiler implements >> as zero-fill */
if (a < 0)
val |= (-1) << (srcbitsleft + 8 - destbitsleft);
val |= ((unsigned int) -1) << (srcbitsleft + 8 - destbitsleft);
*r++ = (bits8) (val & BITMASK);
destbitsleft -= 8;
}
@ -1619,11 +1619,11 @@ bitfromint8(PG_FUNCTION_ARGS)
/* store first fractional byte */
if (destbitsleft > srcbitsleft)
{
int val = (int) (a >> (destbitsleft - 8));
unsigned int val = (unsigned int) (a >> (destbitsleft - 8));
/* Force sign-fill in case the compiler implements >> as zero-fill */
if (a < 0)
val |= (-1) << (srcbitsleft + 8 - destbitsleft);
val |= ((unsigned int) -1) << (srcbitsleft + 8 - destbitsleft);
*r++ = (bits8) (val & BITMASK);
destbitsleft -= 8;
}