Fix warning about wrong format specifier for off_t type

hlinnaka · hlinnaka · commit f231a4e8c7f2 · 2025-12-09T14:05:13.000+02:00
Per OS X buildfarm members.
diff --git a/src/bin/pg_upgrade/slru_io.c b/src/bin/pg_upgrade/slru_io.c
@@ -123,7 +123,7 @@ SlruReadSwitchPageSlow(SlruSegState *state, uint64 pageno)
 		rc = pg_pread(state->fd,
 					  &state->buf.data + bytes_read,
 					  BLCKSZ - bytes_read,
-					  offset + bytes_read);
+					  offset);
 		if (rc < 0)
 		{
 			if (errno == EINTR)
@@ -133,12 +133,13 @@ SlruReadSwitchPageSlow(SlruSegState *state, uint64 pageno)
 		if (rc == 0)
 		{
 			/* unexpected EOF */
-			pg_log(PG_WARNING, "unexpected EOF reading file \"%s\" at offset %zd, reading as zeros", state->fn,
-				   offset + bytes_read);
+			pg_log(PG_WARNING, "unexpected EOF reading file \"%s\" at offset %u, reading as zeros",
+				   state->fn, (unsigned int) offset);
 			memset(&state->buf.data + bytes_read, 0, BLCKSZ - bytes_read);
 			break;
 		}
 		bytes_read += rc;
+		offset += rc;
 	}
 	state->pageno = pageno;
 

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ SlruReadSwitchPageSlow(SlruSegState *state, uint64 pageno)`
`123`	`123`	`rc = pg_pread(state->fd,`
`124`	`124`	`&state->buf.data + bytes_read,`
`125`	`125`	`BLCKSZ - bytes_read,`
`126`		`- offset + bytes_read);`
	`126`	`+ offset);`
`127`	`127`	`if (rc < 0)`
`128`	`128`	`{`
`129`	`129`	`if (errno == EINTR)`
`@@ -133,12 +133,13 @@ SlruReadSwitchPageSlow(SlruSegState *state, uint64 pageno)`
`133`	`133`	`if (rc == 0)`
`134`	`134`	`{`
`135`	`135`	`/* unexpected EOF */`
`136`		`- pg_log(PG_WARNING, "unexpected EOF reading file \"%s\" at offset %zd, reading as zeros", state->fn,`
`137`		`- offset + bytes_read);`
	`136`	`+ pg_log(PG_WARNING, "unexpected EOF reading file \"%s\" at offset %u, reading as zeros",`
	`137`	`+ state->fn, (unsigned int) offset);`
`138`	`138`	`memset(&state->buf.data + bytes_read, 0, BLCKSZ - bytes_read);`
`139`	`139`	`break;`
`140`	`140`	`}`
`141`	`141`	`bytes_read += rc;`
	`142`	`+ offset += rc;`
`142`	`143`	`}`
`143`	`144`	`state->pageno = pageno;`
`144`	`145`