printf: Fix format type warnings

Fixes build warnings like these when building 32 bit programs:

  warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument has type ‘uint64_t’

Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 82230154ba77d9a314f50d3a41fe184837197d40..7a570f9e612da52ff7d098ee2e7ec8ac6eb3bb23 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -1,4 +1,5 @@
 #include <assert.h>
 #include <assert.h>

+#include <inttypes.h>

 #include <stdlib.h>
 #include <stdbool.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <unistd.h>


@@ -653,7 +654,7 @@ void device_handler_status_download(struct device_handler *handler,
                        unit++;
                }
                update = talloc_asprintf(handler,
                        unit++;
                }
                update = talloc_asprintf(handler,

-                               _("%u %s downloading: %.0f%% - %lu%cB"),
+                               _("%u %s downloading: %.0f%% - %" PRIu64 "%cB"),

                                handler->n_progress,
                                ngettext("item", "items", handler->n_progress),
                                (current / total) * 100, current_converted,
                                handler->n_progress,
                                ngettext("item", "items", handler->n_progress),
                                (current / total) * 100, current_converted,

diff --git a/discover/devmapper.c b/discover/devmapper.c
index 2b28e0f55bd45357ee5e6139edd285e2db2456c2..d8445e62e999a7c7e9681fa7f3ce51ccf93b405e 100644 (file)
--- a/discover/devmapper.c
+++ b/discover/devmapper.c
@@ -2,6 +2,7 @@
 #include <types/types.h>
 #include <log/log.h>
 #include <errno.h>
 #include <types/types.h>
 #include <log/log.h>
 #include <errno.h>

+#include <inttypes.h>

 #include <string.h>
 
 #include <sys/types.h>
 #include <string.h>
 
 #include <sys/types.h>


@@ -231,7 +232,7 @@ static int run_create_task(const char *dm_name, const struct target *target)
        struct dm_task *task;
        uint32_t cookie;
 
        struct dm_task *task;
        uint32_t cookie;
 

-       pb_debug("%s: %lu %lu '%s' '%s'\n", __func__,
+       pb_debug("%s: %" PRIu64 " %" PRIu64 " '%s' '%s'\n", __func__,

                 target->start_sector, target->end_sector,
                 target->ttype, target->params);
 
                 target->start_sector, target->end_sector,
                 target->ttype, target->params);
 

diff --git a/utils/hooks/30-dtb-updates.c b/utils/hooks/30-dtb-updates.c
index e161d8794c1ad96d696ea99802274fb12107958a..f7de97695b8a20e06dadbffb98386239082d372a 100644 (file)
--- a/utils/hooks/30-dtb-updates.c
+++ b/utils/hooks/30-dtb-updates.c
@@ -257,7 +257,7 @@ static int do_translate(void *fdt, int node,
        current_pci_flags = na > 2 ? of_read_number(addr, 1) : 0;
        child_pci_flags = cna > 2 ? of_read_number(ranges, 1) : 0;
        if (current_pci_flags != 0 && current_pci_flags != child_pci_flags) {
        current_pci_flags = na > 2 ? of_read_number(addr, 1) : 0;
        child_pci_flags = cna > 2 ? of_read_number(ranges, 1) : 0;
        if (current_pci_flags != 0 && current_pci_flags != child_pci_flags) {

-               fprintf(stderr, "Unexpected change in flags: %lx, %lx\n",
+               fprintf(stderr, "Unexpected change in flags: %" PRIu64 ", %" PRIu64 "\n",

                        current_pci_flags, child_pci_flags);
                return -1;
        }
                        current_pci_flags, child_pci_flags);
                return -1;
        }


@@ -324,7 +324,7 @@ static int do_translate(void *fdt, int node,
 
        fprintf(stderr, "New address:\n\t");
        for (i = 0; i < *addr_cells; i++)
 
        fprintf(stderr, "New address:\n\t");
        for (i = 0; i < *addr_cells; i++)

-               fprintf(stderr, " %lx ", of_read_number(&addr[i], 1));
+               fprintf(stderr, " %" PRIu64 " ", of_read_number(&addr[i], 1));

        fprintf(stderr, "\n");
 
        return 0;
        fprintf(stderr, "\n");
 
        return 0;


@@ -382,7 +382,7 @@ static int create_translated_addresses(struct offb_ctx *ctx,
 
        fprintf(stderr, "Final address:\n\t");
        for (i = 0; i < addr_cells; i++)
 
        fprintf(stderr, "Final address:\n\t");
        for (i = 0; i < addr_cells; i++)

-               fprintf(stderr, " %lx ", of_read_number(&addr[i], 1));
+               fprintf(stderr, " %" PRIu64 " ", of_read_number(&addr[i], 1));

        fprintf(stderr, "\n");
 
        if (addr_cells + size_cells > reg_cells) {
        fprintf(stderr, "\n");
 
        if (addr_cells + size_cells > reg_cells) {