From: Shawn Landden <shawnlandden@gmail.com>
Date: Fri, 2 Sep 2016 13:09:03 +0000 (+0100)
Subject: Use zu as appropriate
X-Git-Tag: archive/raspbian/0_R99-14469.B-2+rpi1~1^2^2^2^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=896e9424003dff49b4d0e13d0b3497e2222ac8fb;p=vboot-utils.git

Use zu as appropriate

Last-update: 2013-01-28

Use %zu as approiate for size_t sizes in format strings
see printf(3)
Last-update: 2013-01-28
Gbp-Pq: Name 0001-use-zu-as-appropriate-for-size_t.patch
---

diff --git a/utility/bmpblk_utility.cc b/utility/bmpblk_utility.cc
index 5069e4a..088dd84 100644
--- a/utility/bmpblk_utility.cc
+++ b/utility/bmpblk_utility.cc
@@ -101,11 +101,11 @@ namespace vboot_reference {
     // The number of localizations should match the number of locale_index
 
     if (debug_) {
-      printf("%ld image_names\n", config_.image_names.size());
+      printf("%zu image_names\n", config_.image_names.size());
       for (unsigned int i = 0; i < config_.image_names.size(); ++i) {
         printf(" %d: \"%s\"\n", i, config_.image_names[i].c_str());
       }
-      printf("%ld images_map\n", config_.images_map.size());
+      printf("%zu images_map\n", config_.images_map.size());
       for (StrImageConfigMap::iterator it = config_.images_map.begin();
            it != config_.images_map.end();
            ++it) {
@@ -116,7 +116,7 @@ namespace vboot_reference {
                it->second.data.tag,
                it->second.data.format);
       }
-      printf("%ld screens_map\n", config_.screens_map.size());
+      printf("%zu screens_map\n", config_.screens_map.size());
       for (StrScreenConfigMap::iterator it = config_.screens_map.begin();
            it != config_.screens_map.end();
            ++it) {
@@ -593,7 +593,7 @@ namespace vboot_reference {
       current_filled += sizeof(it->second.data);
       current_offset += sizeof(it->second.data);
       if (debug_)
-        printf("I1: current offset is 0x%08x (len %ld)\n",
+        printf("I1: current offset is 0x%08x (len %zu)\n",
                current_offset, it->second.compressed_content.length());
       std::copy(it->second.compressed_content.begin(),
                 it->second.compressed_content.end(),
@@ -605,7 +605,7 @@ namespace vboot_reference {
       current_offset = config_.header.locale_string_offset;
       current_filled = bmpblock_.begin() + current_offset;
       if (debug_)
-        printf("locale_names: offset 0x%08x (len %ld)\n",
+        printf("locale_names: offset 0x%08x (len %zu)\n",
                current_offset, config_.locale_names.size());
       std::copy(config_.locale_names.begin(),
                 config_.locale_names.end(),