Clean up int64-related format strings

Remove some gratuitous uses of INT64_FORMAT.  Make use of
PRIu64/PRId64 were appropriate, remove unnecessary casts.

Reviewed-by: Bertrand Drouvot <bertranddrouvot.pg@gmail.com>
Discussion: https://www.postgresql.org/message-id/flat/07fa29f9-42d7-4aac-8834-197918cbbab6%40eisentraut.org

diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c
index 1880c91844e90c8ef19dda775fefccfbfae46331..3caa3af8b4c419a1b49bef07563770844d152cb6 100644 (file)
--- a/contrib/isn/isn.c
+++ b/contrib/isn/isn.c
@@ -423,19 +423,10 @@ eanwrongtype:
 
 eantoobig:
    if (!errorOK)
-   {
-       char        eanbuf[64];
-
-       /*
-        * Format the number separately to keep the machine-dependent format
-        * code out of the translatable message text
-        */
-       snprintf(eanbuf, sizeof(eanbuf), EAN13_FORMAT, ean);
        ereport(ERROR,
                (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-                errmsg("value \"%s\" is out of range for %s type",
-                       eanbuf, isn_names[type])));
-   }
+                errmsg("value \"%" PRIu64 "\" is out of range for %s type",
+                       ean, isn_names[type])));
    return false;
 }
 
@@ -660,19 +651,10 @@ okay:
 
 eantoobig:
    if (!errorOK)
-   {
-       char        eanbuf[64];
-
-       /*
-        * Format the number separately to keep the machine-dependent format
-        * code out of the translatable message text
-        */
-       snprintf(eanbuf, sizeof(eanbuf), EAN13_FORMAT, ean);
        ereport(ERROR,
                (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-                errmsg("value \"%s\" is out of range for %s type",
-                       eanbuf, isn_names[type])));
-   }
+                errmsg("value \"%" PRIu64 "\" is out of range for %s type",
+                       ean, isn_names[type])));
    return false;
 }
 

diff --git a/contrib/isn/isn.h b/contrib/isn/isn.h
index 399896ad417c02b60bf7ecee0c1ea1f64314d864..4551d7828fb925005122e593a3ddd22701b7d60a 100644 (file)
--- a/contrib/isn/isn.h
+++ b/contrib/isn/isn.h
@@ -24,8 +24,6 @@
  */
 typedef uint64 ean13;
 
-#define EAN13_FORMAT UINT64_FORMAT
-
 #define PG_GETARG_EAN13(n) PG_GETARG_INT64(n)
 #define PG_RETURN_EAN13(x) PG_RETURN_INT64(x)
 

diff --git a/contrib/pageinspect/btreefuncs.c b/contrib/pageinspect/btreefuncs.c
index 7ff6dc089342cfd018c5b9593596ec9badf80799..62c905c6e7c2c2ec73642cf97de9014099093a8c 100644 (file)
--- a/contrib/pageinspect/btreefuncs.c
+++ b/contrib/pageinspect/btreefuncs.c
@@ -901,10 +901,10 @@ bt_metap(PG_FUNCTION_ARGS)
    j = 0;
    values[j++] = psprintf("%d", metad->btm_magic);
    values[j++] = psprintf("%d", metad->btm_version);
-   values[j++] = psprintf(INT64_FORMAT, (int64) metad->btm_root);
-   values[j++] = psprintf(INT64_FORMAT, (int64) metad->btm_level);
-   values[j++] = psprintf(INT64_FORMAT, (int64) metad->btm_fastroot);
-   values[j++] = psprintf(INT64_FORMAT, (int64) metad->btm_fastlevel);
+   values[j++] = psprintf("%u", metad->btm_root);
+   values[j++] = psprintf("%u", metad->btm_level);
+   values[j++] = psprintf("%u", metad->btm_fastroot);
+   values[j++] = psprintf("%u", metad->btm_fastlevel);
 
    /*
     * Get values of extended metadata if available, use default values
@@ -914,8 +914,7 @@ bt_metap(PG_FUNCTION_ARGS)
     */
    if (metad->btm_version >= BTREE_NOVAC_VERSION)
    {
-       values[j++] = psprintf(INT64_FORMAT,
-                              (int64) metad->btm_last_cleanup_num_delpages);
+       values[j++] = psprintf("%u", metad->btm_last_cleanup_num_delpages);
        values[j++] = psprintf("%f", metad->btm_last_cleanup_num_heap_tuples);
        values[j++] = metad->btm_allequalimage ? "t" : "f";
    }

diff --git a/src/backend/backup/basebackup.c b/src/backend/backup/basebackup.c
index 2be4e0698168ff42954d102b7f08757c0518a254..1fbc9af72baafd61eb49c989575d2e3682d8f759 100644 (file)
--- a/src/backend/backup/basebackup.c
+++ b/src/backend/backup/basebackup.c
@@ -808,8 +808,8 @@ parse_basebackup_options(List *options, basebackup_options *opt)
            if (maxrate < MAX_RATE_LOWER || maxrate > MAX_RATE_UPPER)
                ereport(ERROR,
                        (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-                        errmsg("%d is outside the valid range for parameter \"%s\" (%d .. %d)",
-                               (int) maxrate, "MAX_RATE", MAX_RATE_LOWER, MAX_RATE_UPPER)));
+                        errmsg("%" PRId64 " is outside the valid range for parameter \"%s\" (%d .. %d)",
+                               maxrate, "MAX_RATE", MAX_RATE_LOWER, MAX_RATE_UPPER)));
 
            opt->maxrate = (uint32) maxrate;
            o_maxrate = true;

diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index 7837e01d83db489b9ea8907668e0724c965e21fd..06c464f6ac5d858051815dda0daf44a094d68052 100644 (file)
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -514,9 +514,9 @@ main(int argc, char **argv)
     */
    if (showprogress)
    {
-       pg_log_info("need to copy %lu MB (total source directory size is %lu MB)",
-                   (unsigned long) (filemap->fetch_size / (1024 * 1024)),
-                   (unsigned long) (filemap->total_size / (1024 * 1024)));
+       pg_log_info("need to copy %" PRIu64 " MB (total source directory size is %" PRIu64 " MB)",
+                   filemap->fetch_size / (1024 * 1024),
+                   filemap->total_size / (1024 * 1024));
 
        fetch_size = filemap->fetch_size;
        fetch_done = 0;