Don't use INT64_FORMAT inside message strings

petere · petere · commit 328606565147 · 2021-04-21T08:07:37.000+02:00
Use %lld and cast to long long int instead.
diff --git a/src/bin/pg_rewind/libpq_source.c b/src/bin/pg_rewind/libpq_source.c
@@ -526,17 +526,17 @@ process_queued_fetch_requests(libpq_source *src)
 		}
 		else
 		{
-			pg_log_debug("received chunk for file \"%s\", offset " INT64_FORMAT ", size %d",
-						 filename, chunkoff, chunksize);
+			pg_log_debug("received chunk for file \"%s\", offset %lld, size %d",
+						 filename, (long long int) chunkoff, chunksize);
 
 			if (strcmp(filename, rq->path) != 0)
 			{
 				pg_fatal("received data for file \"%s\", when requested for \"%s\"",
 						 filename, rq->path);
 			}
 			if (chunkoff != rq->offset)
-				pg_fatal("received data at offset " INT64_FORMAT " of file \"%s\", when requested for offset " INT64_FORMAT,
-						 chunkoff, rq->path, (int64) rq->offset);
+				pg_fatal("received data at offset %lld of file \"%s\", when requested for offset %lld",
+						 (long long int) chunkoff, rq->path, (long long int) rq->offset);
 
 			/*
 			 * We should not receive more data than we requested, or

Original file line number	Diff line number	Diff line change
`@@ -526,17 +526,17 @@ process_queued_fetch_requests(libpq_source *src)`
`526`	`526`	`}`
`527`	`527`	`else`
`528`	`528`	`{`
`529`		`- pg_log_debug("received chunk for file \"%s\", offset " INT64_FORMAT ", size %d",`
`530`		`- filename, chunkoff, chunksize);`
	`529`	`+ pg_log_debug("received chunk for file \"%s\", offset %lld, size %d",`
	`530`	`+ filename, (long long int) chunkoff, chunksize);`
`531`	`531`
`532`	`532`	`if (strcmp(filename, rq->path) != 0)`
`533`	`533`	`{`
`534`	`534`	`pg_fatal("received data for file \"%s\", when requested for \"%s\"",`
`535`	`535`	`filename, rq->path);`
`536`	`536`	`}`
`537`	`537`	`if (chunkoff != rq->offset)`
`538`		`- pg_fatal("received data at offset " INT64_FORMAT " of file \"%s\", when requested for offset " INT64_FORMAT,`
`539`		`- chunkoff, rq->path, (int64) rq->offset);`
	`538`	`+ pg_fatal("received data at offset %lld of file \"%s\", when requested for offset %lld",`
	`539`	`+ (long long int) chunkoff, rq->path, (long long int) rq->offset);`
`540`	`540`
`541`	`541`	`/*`
`542`	`542`	`* We should not receive more data than we requested, or`