Remove some unnecessary casts in format arguments

petere · petere · commit ae03a7c7391d · 2021-08-08T22:08:07.000+02:00
We can use %zd or %zu directly, no need to cast to int.  Conversely,
some code was casting away from int when it could be using %d
directly.
diff --git a/src/backend/access/spgist/spgutils.c b/src/backend/access/spgist/spgutils.c
@@ -1240,8 +1240,8 @@ SpGistPageAddNewItem(SpGistState *state, Page page, Item item, Size size,
 					*startOffset = offnum + 1;
 			}
 			else
-				elog(PANIC, "failed to add item of size %u to SPGiST index page",
-					 (int) size);
+				elog(PANIC, "failed to add item of size %zu to SPGiST index page",
+					 size);
 
 			return offnum;
 		}
@@ -1252,8 +1252,8 @@ SpGistPageAddNewItem(SpGistState *state, Page page, Item item, Size size,
 						 InvalidOffsetNumber, false, false);
 
 	if (offnum == InvalidOffsetNumber && !errorOK)
-		elog(ERROR, "failed to add item of size %u to SPGiST index page",
-			 (int) size);
+		elog(ERROR, "failed to add item of size %zu to SPGiST index page",
+			 size);
 
 	return offnum;
 }
diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c
@@ -991,8 +991,8 @@ WALReadRaiseError(WALReadError *errinfo)
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DATA_CORRUPTED),
-				 errmsg("could not read from log segment %s, offset %u: read %d of %zu",
+				 errmsg("could not read from log segment %s, offset %u: read %d of %d",
 						fname, errinfo->wre_off, errinfo->wre_read,
-						(Size) errinfo->wre_req)));
+						errinfo->wre_req)));
 	}
 }
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
@@ -959,8 +959,8 @@ pg_xml_init_library(void)
 		if (sizeof(char) != sizeof(xmlChar))
 			ereport(ERROR,
 					(errmsg("could not initialize XML library"),
-					 errdetail("libxml2 has incompatible char type: sizeof(char)=%u, sizeof(xmlChar)=%u.",
-							   (int) sizeof(char), (int) sizeof(xmlChar))));
+					 errdetail("libxml2 has incompatible char type: sizeof(char)=%zu, sizeof(xmlChar)=%zu.",
+							   sizeof(char), sizeof(xmlChar))));
 
 #ifdef USE_LIBXMLCONTEXT
 		/* Set up libxml's memory allocation our way */
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
@@ -150,10 +150,10 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)
 			/* if write didn't set errno, assume problem is no disk space */
 			if (errno == 0)
 				errno = ENOSPC;
-			pg_log_error(ngettext("write-ahead log file \"%s\" has %d byte, should be 0 or %d",
-								  "write-ahead log file \"%s\" has %d bytes, should be 0 or %d",
+			pg_log_error(ngettext("write-ahead log file \"%s\" has %zd byte, should be 0 or %d",
+								  "write-ahead log file \"%s\" has %zd bytes, should be 0 or %d",
 								  size),
-						 fn, (int) size, WalSegSz);
+						 fn, size, WalSegSz);
 			pg_free(fn);
 			return false;
 		}
diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
@@ -211,8 +211,8 @@ search_directory(const char *directory, const char *fname)
 				fatal_error("could not read file \"%s\": %m",
 							fname);
 			else
-				fatal_error("could not read file \"%s\": read %d of %zu",
-							fname, r, (Size) XLOG_BLCKSZ);
+				fatal_error("could not read file \"%s\": read %d of %d",
+							fname, r, XLOG_BLCKSZ);
 		}
 		close(fd);
 		return true;
@@ -369,9 +369,9 @@ WALDumpReadPage(XLogReaderState *state, XLogRecPtr targetPagePtr, int reqLen,
 						fname, errinfo.wre_off);
 		}
 		else
-			fatal_error("could not read from file %s, offset %u: read %d of %zu",
+			fatal_error("could not read from file %s, offset %u: read %d of %d",
 						fname, errinfo.wre_off, errinfo.wre_read,
-						(Size) errinfo.wre_req);
+						errinfo.wre_req);
 	}
 
 	return count;

Original file line number	Diff line number	Diff line change
`@@ -1240,8 +1240,8 @@ SpGistPageAddNewItem(SpGistState *state, Page page, Item item, Size size,`
`1240`	`1240`	`*startOffset = offnum + 1;`
`1241`	`1241`	`}`
`1242`	`1242`	`else`
`1243`		`- elog(PANIC, "failed to add item of size %u to SPGiST index page",`
`1244`		`- (int) size);`
	`1243`	`+ elog(PANIC, "failed to add item of size %zu to SPGiST index page",`
	`1244`	`+ size);`
`1245`	`1245`
`1246`	`1246`	`return offnum;`
`1247`	`1247`	`}`
`@@ -1252,8 +1252,8 @@ SpGistPageAddNewItem(SpGistState *state, Page page, Item item, Size size,`
`1252`	`1252`	`InvalidOffsetNumber, false, false);`
`1253`	`1253`
`1254`	`1254`	`if (offnum == InvalidOffsetNumber && !errorOK)`
`1255`		`- elog(ERROR, "failed to add item of size %u to SPGiST index page",`
`1256`		`- (int) size);`
	`1255`	`+ elog(ERROR, "failed to add item of size %zu to SPGiST index page",`
	`1256`	`+ size);`
`1257`	`1257`
`1258`	`1258`	`return offnum;`
`1259`	`1259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -991,8 +991,8 @@ WALReadRaiseError(WALReadError *errinfo)`
`991`	`991`	`{`
`992`	`992`	`ereport(ERROR,`
`993`	`993`	`(errcode(ERRCODE_DATA_CORRUPTED),`
`994`		`- errmsg("could not read from log segment %s, offset %u: read %d of %zu",`
	`994`	`+ errmsg("could not read from log segment %s, offset %u: read %d of %d",`
`995`	`995`	`fname, errinfo->wre_off, errinfo->wre_read,`
`996`		`- (Size) errinfo->wre_req)));`
	`996`	`+ errinfo->wre_req)));`
`997`	`997`	`}`
`998`	`998`	`}`