Fix warnings from cpluspluscheck

petere · petere · commit e7cfb26fbc11 · 2017-12-04T19:55:52.000-05:00
Fix warnings about "comparison between signed and unsigned integer
expressions" in inline functions in header files by adding some casts.
diff --git a/src/include/libpq/pqformat.h b/src/include/libpq/pqformat.h
@@ -51,7 +51,7 @@ pq_writeint8(StringInfoData *pg_restrict buf, int8 i)
 {
 	int8		ni = i;
 
-	Assert(buf->len + sizeof(int8) <= buf->maxlen);
+	Assert(buf->len + (int) sizeof(int8) <= buf->maxlen);
 	memcpy((char *pg_restrict) (buf->data + buf->len), &ni, sizeof(int8));
 	buf->len += sizeof(int8);
 }
@@ -65,7 +65,7 @@ pq_writeint16(StringInfoData *pg_restrict buf, int16 i)
 {
 	int16		ni = pg_hton16(i);
 
-	Assert(buf->len + sizeof(int16) <= buf->maxlen);
+	Assert(buf->len + (int) sizeof(int16) <= buf->maxlen);
 	memcpy((char *pg_restrict) (buf->data + buf->len), &ni, sizeof(int16));
 	buf->len += sizeof(int16);
 }
@@ -79,7 +79,7 @@ pq_writeint32(StringInfoData *pg_restrict buf, int32 i)
 {
 	int32		ni = pg_hton32(i);
 
-	Assert(buf->len + sizeof(int32) <= buf->maxlen);
+	Assert(buf->len + (int) sizeof(int32) <= buf->maxlen);
 	memcpy((char *pg_restrict) (buf->data + buf->len), &ni, sizeof(int32));
 	buf->len += sizeof(int32);
 }
@@ -93,7 +93,7 @@ pq_writeint64(StringInfoData *pg_restrict buf, int64 i)
 {
 	int64		ni = pg_hton64(i);
 
-	Assert(buf->len + sizeof(int64) <= buf->maxlen);
+	Assert(buf->len + (int) sizeof(int64) <= buf->maxlen);
 	memcpy((char *pg_restrict) (buf->data + buf->len), &ni, sizeof(int64));
 	buf->len += sizeof(int64);
 }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ pq_writeint8(StringInfoData *pg_restrict buf, int8 i)`
`51`	`51`	`{`
`52`	`52`	`int8 ni = i;`
`53`	`53`
`54`		`- Assert(buf->len + sizeof(int8) <= buf->maxlen);`
	`54`	`+ Assert(buf->len + (int) sizeof(int8) <= buf->maxlen);`
`55`	`55`	`memcpy((char *pg_restrict) (buf->data + buf->len), &ni, sizeof(int8));`
`56`	`56`	`buf->len += sizeof(int8);`
`57`	`57`	`}`
`@@ -65,7 +65,7 @@ pq_writeint16(StringInfoData *pg_restrict buf, int16 i)`
`65`	`65`	`{`
`66`	`66`	`int16 ni = pg_hton16(i);`
`67`	`67`
`68`		`- Assert(buf->len + sizeof(int16) <= buf->maxlen);`
	`68`	`+ Assert(buf->len + (int) sizeof(int16) <= buf->maxlen);`
`69`	`69`	`memcpy((char *pg_restrict) (buf->data + buf->len), &ni, sizeof(int16));`
`70`	`70`	`buf->len += sizeof(int16);`
`71`	`71`	`}`
`@@ -79,7 +79,7 @@ pq_writeint32(StringInfoData *pg_restrict buf, int32 i)`
`79`	`79`	`{`
`80`	`80`	`int32 ni = pg_hton32(i);`
`81`	`81`
`82`		`- Assert(buf->len + sizeof(int32) <= buf->maxlen);`
	`82`	`+ Assert(buf->len + (int) sizeof(int32) <= buf->maxlen);`
`83`	`83`	`memcpy((char *pg_restrict) (buf->data + buf->len), &ni, sizeof(int32));`
`84`	`84`	`buf->len += sizeof(int32);`
`85`	`85`	`}`
`@@ -93,7 +93,7 @@ pq_writeint64(StringInfoData *pg_restrict buf, int64 i)`
`93`	`93`	`{`
`94`	`94`	`int64 ni = pg_hton64(i);`
`95`	`95`
`96`		`- Assert(buf->len + sizeof(int64) <= buf->maxlen);`
	`96`	`+ Assert(buf->len + (int) sizeof(int64) <= buf->maxlen);`
`97`	`97`	`memcpy((char *pg_restrict) (buf->data + buf->len), &ni, sizeof(int64));`
`98`	`98`	`buf->len += sizeof(int64);`
`99`	`99`	`}`