Snap for 11186783 from b81a3c0fbe4d7fd00d92cc36adebb5090e85ee0f to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I38c45378f83985eb4503c8ca8f2cbac4edf03797

1 files changed, 8 insertions, 7 deletions

diff --git a/incfs/incfsdump/dump.cpp b/incfs/incfsdump/dump.cpp
index 35d84ac..523992f 100644
--- a/incfs/incfsdump/dump.cpp
+++ b/incfs/incfsdump/dump.cpp
@@ -37,15 +37,17 @@
 #include <sys/xattr.h>
 #include <unistd.h>
 
-#include "linux/incrementalfs.h"
-
 #include <chrono>
 #include <fstream>
+#include <iomanip>
 #include <iostream>
 #include <iterator>
 #include <optional>
+#include <sstream>
 #include <string_view>
 
+#include "linux/incrementalfs.h"
+
 using namespace std::literals;
 
 namespace {
@@ -442,13 +444,12 @@ private:
     }
 
     static std::string toString(incfs_uuid_t uuid) {
-        std::string res;
+        std::stringstream res;
+        res << std::hex;
         for (unsigned char b : uuid.bytes) {
-            char buf[3] = {};
-            snprintf(buf, std::size(buf) - 1, "%02x", (unsigned int)b);
-            res += buf;
+            res << std::setfill('0') << std::setw(2) << (unsigned int)b;
         }
-        return res;
+        return res.str();
     }
 
     OstreamWrapper out() const {