diff options
author | Yi Kong <yikong@google.com> | 2023-12-06 19:16:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-06 19:16:43 +0000 |
commit | 7ecda84d6dca685774c22d87666800708b871bc7 (patch) | |
tree | a6189abd0dbd1530778b7d12a4b71c3ffe1636a5 | |
parent | 696cb7d973a3bcaf57614b7c09fea94f583ffd72 (diff) | |
parent | a8fc6bc04da73bae59f1a85d2e2970867c9b5b9b (diff) | |
download | incremental_delivery-7ecda84d6dca685774c22d87666800708b871bc7.tar.gz |
Fix -Wfortify-source compiler warning am: 16111f1abb am: 787985b5f5 am: a8fc6bc04d
Original change: https://android-review.googlesource.com/c/platform/system/incremental_delivery/+/2860694
Change-Id: I5d0aaae85ce384387256010e5408c19ce35d3be5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | incfs/incfsdump/dump.cpp | 15 |
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 { |