Replace printf format %i by %d

petere · petere · commit 1d1361b6b772 · 2012-03-30T20:40:46.000+03:00
see also ce8d7bb
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
@@ -929,7 +929,7 @@ BaseBackup(void)
 	}
 	if (PQntuples(res) != 1 || PQnfields(res) != 3)
 	{
-		fprintf(stderr, _("%s: could not identify system, got %i rows and %i fields\n"),
+		fprintf(stderr, _("%s: could not identify system, got %d rows and %d fields\n"),
 				progname, PQntuples(res), PQnfields(res));
 		disconnect_and_exit(1);
 	}
@@ -1111,7 +1111,7 @@ BaseBackup(void)
 		}
 		if (r != bgchild)
 		{
-			fprintf(stderr, _("%s: child %i died, expected %i\n"),
+			fprintf(stderr, _("%s: child %d died, expected %d\n"),
 					progname, r, (int) bgchild);
 			disconnect_and_exit(1);
 		}
@@ -1123,7 +1123,7 @@ BaseBackup(void)
 		}
 		if (WEXITSTATUS(status) != 0)
 		{
-			fprintf(stderr, _("%s: child process exited with error %i\n"),
+			fprintf(stderr, _("%s: child process exited with error %d\n"),
 					progname, WEXITSTATUS(status));
 			disconnect_and_exit(1);
 		}
diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c
@@ -237,7 +237,7 @@ StreamLog(void)
 	}
 	if (PQntuples(res) != 1 || PQnfields(res) != 3)
 	{
-		fprintf(stderr, _("%s: could not identify system, got %i rows and %i fields\n"),
+		fprintf(stderr, _("%s: could not identify system, got %d rows and %d fields\n"),
 				progname, PQntuples(res), PQnfields(res));
 		disconnect_and_exit(1);
 	}
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
@@ -237,7 +237,7 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline, char *sysi
 		}
 		if (PQnfields(res) != 3 || PQntuples(res) != 1)
 		{
-			fprintf(stderr, _("%s: could not identify system, got %i rows and %i fields\n"),
+			fprintf(stderr, _("%s: could not identify system, got %d rows and %d fields\n"),
 					progname, PQntuples(res), PQnfields(res));
 			PQclear(res);
 			return false;
@@ -391,7 +391,7 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline, char *sysi
 			 */
 			if (r != STREAMING_KEEPALIVE_SIZE)
 			{
-				fprintf(stderr, _("%s: keepalive message is incorrect size: %i\n"),
+				fprintf(stderr, _("%s: keepalive message is incorrect size: %d\n"),
 						progname, r);
 				return false;
 			}
@@ -405,7 +405,7 @@ ReceiveXlogStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline, char *sysi
 		}
 		if (r < STREAMING_HEADER_SIZE + 1)
 		{
-			fprintf(stderr, _("%s: streaming header too small: %i\n"),
+			fprintf(stderr, _("%s: streaming header too small: %d\n"),
 					progname, r);
 			return false;
 		}

Original file line number	Diff line number	Diff line change
`@@ -929,7 +929,7 @@ BaseBackup(void)`
`929`	`929`	`}`
`930`	`930`	`if (PQntuples(res) != 1 \|\| PQnfields(res) != 3)`
`931`	`931`	`{`
`932`		`- fprintf(stderr, _("%s: could not identify system, got %i rows and %i fields\n"),`
	`932`	`+ fprintf(stderr, _("%s: could not identify system, got %d rows and %d fields\n"),`
`933`	`933`	`progname, PQntuples(res), PQnfields(res));`
`934`	`934`	`disconnect_and_exit(1);`
`935`	`935`	`}`
`@@ -1111,7 +1111,7 @@ BaseBackup(void)`
`1111`	`1111`	`}`
`1112`	`1112`	`if (r != bgchild)`
`1113`	`1113`	`{`
`1114`		`- fprintf(stderr, _("%s: child %i died, expected %i\n"),`
	`1114`	`+ fprintf(stderr, _("%s: child %d died, expected %d\n"),`
`1115`	`1115`	`progname, r, (int) bgchild);`
`1116`	`1116`	`disconnect_and_exit(1);`
`1117`	`1117`	`}`
`@@ -1123,7 +1123,7 @@ BaseBackup(void)`
`1123`	`1123`	`}`
`1124`	`1124`	`if (WEXITSTATUS(status) != 0)`
`1125`	`1125`	`{`
`1126`		`- fprintf(stderr, _("%s: child process exited with error %i\n"),`
	`1126`	`+ fprintf(stderr, _("%s: child process exited with error %d\n"),`
`1127`	`1127`	`progname, WEXITSTATUS(status));`
`1128`	`1128`	`disconnect_and_exit(1);`
`1129`	`1129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ StreamLog(void)`
`237`	`237`	`}`
`238`	`238`	`if (PQntuples(res) != 1 \|\| PQnfields(res) != 3)`
`239`	`239`	`{`
`240`		`- fprintf(stderr, _("%s: could not identify system, got %i rows and %i fields\n"),`
	`240`	`+ fprintf(stderr, _("%s: could not identify system, got %d rows and %d fields\n"),`
`241`	`241`	`progname, PQntuples(res), PQnfields(res));`
`242`	`242`	`disconnect_and_exit(1);`
`243`	`243`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ ReceiveXlogStream(PGconn conn, XLogRecPtr startpos, uint32 timeline, char sysi`
`237`	`237`	`}`
`238`	`238`	`if (PQnfields(res) != 3 \|\| PQntuples(res) != 1)`
`239`	`239`	`{`
`240`		`- fprintf(stderr, _("%s: could not identify system, got %i rows and %i fields\n"),`
	`240`	`+ fprintf(stderr, _("%s: could not identify system, got %d rows and %d fields\n"),`
`241`	`241`	`progname, PQntuples(res), PQnfields(res));`
`242`	`242`	`PQclear(res);`
`243`	`243`	`return false;`
`@@ -391,7 +391,7 @@ ReceiveXlogStream(PGconn conn, XLogRecPtr startpos, uint32 timeline, char sysi`
`391`	`391`	`*/`
`392`	`392`	`if (r != STREAMING_KEEPALIVE_SIZE)`
`393`	`393`	`{`
`394`		`- fprintf(stderr, _("%s: keepalive message is incorrect size: %i\n"),`
	`394`	`+ fprintf(stderr, _("%s: keepalive message is incorrect size: %d\n"),`
`395`	`395`	`progname, r);`
`396`	`396`	`return false;`
`397`	`397`	`}`
`@@ -405,7 +405,7 @@ ReceiveXlogStream(PGconn conn, XLogRecPtr startpos, uint32 timeline, char sysi`
`405`	`405`	`}`
`406`	`406`	`if (r < STREAMING_HEADER_SIZE + 1)`
`407`	`407`	`{`
`408`		`- fprintf(stderr, _("%s: streaming header too small: %i\n"),`
	`408`	`+ fprintf(stderr, _("%s: streaming header too small: %d\n"),`
`409`	`409`	`progname, r);`
`410`	`410`	`return false;`
`411`	`411`	`}`