From: Adam C. Emerson <aemerson@redhat.com>
Date: Wed, 28 Sep 2022 23:57:16 +0000 (-0400)
Subject: mon: Fix snprintf truncation warning by switching to fmtlib
X-Git-Tag: v18.1.0~1071^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1f1398bc515b389fd423435fc3d8bfeb927d8af4;p=ceph.git

mon: Fix snprintf truncation warning by switching to fmtlib

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/mds/cephfs_features.cc b/src/mds/cephfs_features.cc
index dda64edfcd2a..61c442699a5d 100644
--- a/src/mds/cephfs_features.cc
+++ b/src/mds/cephfs_features.cc
@@ -5,6 +5,10 @@
 #include "cephfs_features.h"
 #include "mdstypes.h"
 
+#undef FMT_HEADER_ONLY
+#define FMT_HEADER_ONLY 1
+#include <fmt/format.h>
+
 static const std::array feature_names
 {
   "reserved",
@@ -69,9 +73,7 @@ void cephfs_dump_features(ceph::Formatter *f, const feature_bitset_t& features)
   for (size_t i = 0; i < feature_names.size(); ++i) {
     if (!features.test(i))
       continue;
-    char s[18];
-    snprintf(s, sizeof(s), "feature_%zu", i);
-    f->dump_string(s, cephfs_feature_name(i));
+    f->dump_string(fmt::format("feature_{}", i),
+		   cephfs_feature_name(i));
   }
 }
-