Fix xid format for 32-bit systems

Maksim Milyutin · Maksim Milyutin · commit f9b622e0074f · 2017-02-20T19:23:41.000+03:00
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
@@ -250,14 +250,14 @@ AuxiliaryProcessMain(int argc, char *argv[])
 				bootstrap_data_checksum_version = PG_DATA_CHECKSUM_VERSION;
 				break;
 			case 'm':
-				if (sscanf(optarg, "%lx", &start_mx_id) != 1)
+				if (sscanf(optarg, HEX_XID_FMT, &start_mx_id) != 1)
 				{
 					fprintf(stderr, "%s: invalid hex value of multixact-id\n", progname);
 					exit(1);
 				}
 				break;
 			case 'o':
-				if (sscanf(optarg, "%ld", &start_mx_offset) != 1)
+				if (sscanf(optarg, XID_FMT, &start_mx_offset) != 1)
 				{
 					fprintf(stderr, "%s: invalid decimal value of multixact-offset\n", progname);
 					exit(1);
@@ -267,7 +267,7 @@ AuxiliaryProcessMain(int argc, char *argv[])
 				strlcpy(OutputFileName, optarg, MAXPGPATH);
 				break;
 			case 'X':
-				if (sscanf(optarg, "%lx", &start_xid) != 1)
+				if (sscanf(optarg, HEX_XID_FMT, &start_xid) != 1)
 				{
 					fprintf(stderr, "%s: invalid hex value of xid\n", progname);
 					exit(1);
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -1538,7 +1538,7 @@ bootstrap_template1(void)
 	unsetenv("PGCLIENTENCODING");
 
 	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" --boot -x1 %s %s %lx %s %lx %s %ld %s %s",
+			 "\"%s\" --boot -x1 %s %s " HEX_XID_FMT " %s " HEX_XID_FMT " %s " XID_FMT " %s %s",
 			 backend_exec,
 			 data_checksums ? "-k" : "",
 			 "-X", start_xid,
@@ -3469,7 +3469,7 @@ main(int argc, char *argv[])
 				printf(_("Running in debug mode.\n"));
 				break;
 			case 'm':
-				if (sscanf(optarg, "%lx", &start_mx_id) != 1)
+				if (sscanf(optarg, HEX_XID_FMT, &start_mx_id) != 1)
 				{
 					fprintf(stderr, "%s: invalid hex value of multixact-id\n", progname);
 					exit(1);
@@ -3483,7 +3483,7 @@ main(int argc, char *argv[])
 				do_sync = false;
 				break;
 			case 'o':
-				if (sscanf(optarg, "%ld", &start_mx_offset) != 1)
+				if (sscanf(optarg, XID_FMT, &start_mx_offset) != 1)
 				{
 					fprintf(stderr, "%s: invalid decimal value of multixact-offset\n", progname);
 					exit(1);
@@ -3535,7 +3535,7 @@ main(int argc, char *argv[])
 				xlog_dir = pg_strdup(optarg);
 				break;
 			case 'x':
-				if (sscanf(optarg, "%lx", &start_xid) != 1)
+				if (sscanf(optarg, HEX_XID_FMT, &start_xid) != 1)
 				{
 					fprintf(stderr, "%s: invalid hex value of xid\n", progname);
 					exit(1);
diff --git a/src/include/c.h b/src/include/c.h
@@ -407,6 +407,7 @@ typedef uint64 SubTransactionId;
 #define TopSubTransactionId			((SubTransactionId) 1)
 
 #define XID_FMT UINT64_FORMAT
+#define HEX_XID_FMT "%" INT64_MODIFIER "x"
 
 /* MultiXactId must be equivalent to TransactionId, to fit in t_xmax */
 typedef TransactionId MultiXactId;
