commit 71643ae310099d24b7d9344f5a96c2d5615111ed
author Kostya Kortchinsky <kostyak@google.com> Mon Aug 16 15:23:48 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Aug 17 08:40:52 2021 -0700
tree f79b00bd78462a069d302efbba0bca0b74e4c619
parent ad1c8d89f67dd5c4110d3a288b49305e5ab6a229

[scudo] Fix format string specifiers

Enable `-Wformat` again, and fix the offending instances.

Differential Revision: https://reviews.llvm.org/D108168

GitOrigin-RevId: 5009be2f09ae25654753ee533dbfbc238aaf591c

primary64.h

diff --git a/primary64.h b/primary64.h
index 13420bf..6c17855 100644
--- a/primary64.h
+++ b/primary64.h
@@ -164,9 +164,9 @@
       PoppedBlocks += Region->Stats.PoppedBlocks;
       PushedBlocks += Region->Stats.PushedBlocks;
     }
-    Str->append("Stats: SizeClassAllocator64: %zuM mapped (%zuM rss) in %zu "
+    Str->append("Stats: SizeClassAllocator64: %zuM mapped (%uM rss) in %zu "
                 "allocations; remains %zu\n",
-                TotalMapped >> 20, 0, PoppedBlocks,
+                TotalMapped >> 20, 0U, PoppedBlocks,
                 PoppedBlocks - PushedBlocks);
 
     for (uptr I = 0; I < NumClasses; I++)

secondary.h

diff --git a/secondary.h b/secondary.h
index aa50fa9..abb58a2 100644
--- a/secondary.h
+++ b/secondary.h
@@ -602,12 +602,11 @@
 
 template <typename Config>
 void MapAllocator<Config>::getStats(ScopedString *Str) const {
-  Str->append(
-      "Stats: MapAllocator: allocated %zu times (%zuK), freed %zu times "
-      "(%zuK), remains %zu (%zuK) max %zuM\n",
-      NumberOfAllocs, AllocatedBytes >> 10, NumberOfFrees, FreedBytes >> 10,
-      NumberOfAllocs - NumberOfFrees, (AllocatedBytes - FreedBytes) >> 10,
-      LargestSize >> 20);
+  Str->append("Stats: MapAllocator: allocated %u times (%zuK), freed %u times "
+              "(%zuK), remains %u (%zuK) max %zuM\n",
+              NumberOfAllocs, AllocatedBytes >> 10, NumberOfFrees,
+              FreedBytes >> 10, NumberOfAllocs - NumberOfFrees,
+              (AllocatedBytes - FreedBytes) >> 10, LargestSize >> 20);
 }
 
 } // namespace scudo

size_class_map.h

diff --git a/size_class_map.h b/size_class_map.h
index ba0f784..28b16d9 100644
--- a/size_class_map.h
+++ b/size_class_map.h
@@ -335,8 +335,8 @@
     const uptr L = S ? getMostSignificantSetBitIndex(S) : 0;
     const uptr Cached = SCMap::getMaxCachedHint(S) * S;
     Buffer.append(
-        "C%02zu => S: %zu diff: +%zu %02zu%% L %zu Cached: %zu %zu; id %zu\n",
-        I, S, D, P, L, SCMap::getMaxCachedHint(S), Cached,
+        "C%02zu => S: %zu diff: +%zu %02zu%% L %zu Cached: %u %zu; id %zu\n", I,
+        S, D, P, L, SCMap::getMaxCachedHint(S), Cached,
         SCMap::getClassIdBySize(S));
     TotalCached += Cached;
     PrevS = S;

wrappers_c.inc

diff --git a/wrappers_c.inc b/wrappers_c.inc
index 43efb02..6c6bcb6 100644
--- a/wrappers_c.inc
+++ b/wrappers_c.inc
@@ -226,7 +226,7 @@
   fputs("<malloc version=\"scudo-1\">\n", stream);
   for (scudo::uptr i = 0; i != max_size; ++i)
     if (sizes[i])
-      fprintf(stream, "<alloc size=\"%lu\" count=\"%lu\"/>\n", i, sizes[i]);
+      fprintf(stream, "<alloc size=\"%zu\" count=\"%zu\"/>\n", i, sizes[i]);
   fputs("</malloc>\n", stream);
   SCUDO_PREFIX(free)(sizes);
   return 0;