Remove use of [U]INT64_FORMAT in some translatable strings

%lld with (long long), or %llu with (unsigned long long) are more
adapted.  This is similar to 3286065.

Author: Kyotaro Horiguchi
Discussion: https://postgr.es/m/20210421.200000.1462448394029407895.horikyota.ntt@gmail.com

diff --git a/contrib/pg_prewarm/pg_prewarm.c b/contrib/pg_prewarm/pg_prewarm.c
index a8554529361e64d108ed37c0f61c25c542e7560e..48d0132a0d0e14bf2ad598af51dcd53249a4a52e 100644 (file)
--- a/contrib/pg_prewarm/pg_prewarm.c
+++ b/contrib/pg_prewarm/pg_prewarm.c
@@ -126,8 +126,8 @@ pg_prewarm(PG_FUNCTION_ARGS)
        if (first_block < 0 || first_block >= nblocks)
            ereport(ERROR,
                    (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                    errmsg("starting block number must be between 0 and " INT64_FORMAT,
-                           nblocks - 1)));
+                    errmsg("starting block number must be between 0 and %lld",
+                           (long long) (nblocks - 1))));
    }
    if (PG_ARGISNULL(4))
        last_block = nblocks - 1;
@@ -137,8 +137,8 @@ pg_prewarm(PG_FUNCTION_ARGS)
        if (last_block < 0 || last_block >= nblocks)
            ereport(ERROR,
                    (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                    errmsg("ending block number must be between 0 and " INT64_FORMAT,
-                           nblocks - 1)));
+                    errmsg("ending block number must be between 0 and %lld",
+                           (long long) (nblocks - 1))));
    }
 
    /* Now we're ready to do the real work. */

diff --git a/src/backend/access/transam/xlogprefetch.c b/src/backend/access/transam/xlogprefetch.c
index 9a6f17ca3609f181667d6b5d355e9b99d65903c6..ae4585232be3316e5985d4019c12403c27d1aeb1 100644 (file)
--- a/src/backend/access/transam/xlogprefetch.c
+++ b/src/backend/access/transam/xlogprefetch.c
@@ -358,20 +358,19 @@ XLogPrefetcherFree(XLogPrefetcher *prefetcher)
    /* Log final statistics. */
    ereport(LOG,
            (errmsg("recovery finished prefetching at %X/%X; "
-                   "prefetch = " UINT64_FORMAT ", "
-                   "skip_hit = " UINT64_FORMAT ", "
-                   "skip_new = " UINT64_FORMAT ", "
-                   "skip_fpw = " UINT64_FORMAT ", "
-                   "skip_seq = " UINT64_FORMAT ", "
+                   "prefetch = %llu, "
+                   "skip_hit = %llu, "
+                   "skip_new = %llu, "
+                   "skip_fpw = %llu, "
+                   "skip_seq = %llu, "
                    "avg_distance = %f, "
                    "avg_queue_depth = %f",
-                   (uint32) (prefetcher->reader->EndRecPtr << 32),
-                   (uint32) (prefetcher->reader->EndRecPtr),
-                   pg_atomic_read_u64(&SharedStats->prefetch),
-                   pg_atomic_read_u64(&SharedStats->skip_hit),
-                   pg_atomic_read_u64(&SharedStats->skip_new),
-                   pg_atomic_read_u64(&SharedStats->skip_fpw),
-                   pg_atomic_read_u64(&SharedStats->skip_seq),
+                   LSN_FORMAT_ARGS(prefetcher->reader->EndRecPtr),
+                   (unsigned long long) pg_atomic_read_u64(&SharedStats->prefetch),
+                   (unsigned long long) pg_atomic_read_u64(&SharedStats->skip_hit),
+                   (unsigned long long) pg_atomic_read_u64(&SharedStats->skip_new),
+                   (unsigned long long) pg_atomic_read_u64(&SharedStats->skip_fpw),
+                   (unsigned long long) pg_atomic_read_u64(&SharedStats->skip_seq),
                    SharedStats->avg_distance,
                    SharedStats->avg_queue_depth)));
    hash_destroy(prefetcher->filter_table);

diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index da1d9ec535178362b0f24d986aa03c7e655bd96f..08276659977d51456ffad2f80870366b87dda1c8 100644 (file)
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -5359,8 +5359,8 @@ parseScriptWeight(const char *option, char **script)
        }
        if (wtmp > INT_MAX || wtmp < 0)
        {
-           pg_log_fatal("weight specification out of range (0 .. %u): " INT64_FORMAT,
-                        INT_MAX, (int64) wtmp);
+           pg_log_fatal("weight specification out of range (0 .. %u): %lld",
+                        INT_MAX, (long long) wtmp);
            exit(1);
        }
        weight = wtmp;
@@ -5680,7 +5680,7 @@ set_random_seed(const char *seed)
    }
 
    if (seed != NULL)
-       pg_log_info("setting random seed to " UINT64_FORMAT, iseed);
+       pg_log_info("setting random seed to %llu", (unsigned long long) iseed);
    random_seed = iseed;
 
    /* Fill base_random_sequence with low-order bits of seed */