Fix incorrect format placeholders

petere · petere · commit 6612185883c6 · 2024-03-13T06:40:32.000+01:00
diff --git a/src/bin/pg_combinebackup/pg_combinebackup.c b/src/bin/pg_combinebackup/pg_combinebackup.c
@@ -1277,8 +1277,8 @@ slurp_file(int fd, char *filename, StringInfo buf, int maxlen)
 		if (rb < 0)
 			pg_fatal("could not read file \"%s\": %m", filename);
 		else
-			pg_fatal("could not read file \"%s\": read only %d of %d bytes",
-					 filename, (int) rb, (int) st.st_size);
+			pg_fatal("could not read file \"%s\": read only %zd of %lld bytes",
+					 filename, rb, (long long int) st.st_size);
 	}
 
 	/* Adjust buffer length for new data and restore trailing-\0 invariant */
diff --git a/src/bin/pg_combinebackup/reconstruct.c b/src/bin/pg_combinebackup/reconstruct.c
@@ -511,7 +511,7 @@ read_bytes(rfile *rf, void *buffer, unsigned length)
 		if (rb < 0)
 			pg_fatal("could not read file \"%s\": %m", rf->filename);
 		else
-			pg_fatal("could not read file \"%s\": read only %d of %d bytes",
+			pg_fatal("could not read file \"%s\": read only %d of %u bytes",
 					 rf->filename, rb, length);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,7 @@ read_bytes(rfile rf, void buffer, unsigned length)`
`511`	`511`	`if (rb < 0)`
`512`	`512`	`pg_fatal("could not read file \"%s\": %m", rf->filename);`
`513`	`513`	`else`
`514`		`- pg_fatal("could not read file \"%s\": read only %d of %d bytes",`
	`514`	`+ pg_fatal("could not read file \"%s\": read only %d of %u bytes",`
`515`	`515`	`rf->filename, rb, length);`
`516`	`516`	`}`
`517`	`517`	`}`