From: Casey Bodley <cbodley@redhat.com>
Date: Sun, 19 Feb 2023 05:43:54 +0000 (-0500)
Subject: rgw/torrent: bencoder uses string_view
X-Git-Tag: v19.0.0~1568^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=53d25974bda9ff7bc578db44055b3e0de64f4d5c;p=ceph.git

rgw/torrent: bencoder uses string_view

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_torrent.h b/src/rgw/rgw_torrent.h
index bf2e2217c25..d79b6d0b22e 100644
--- a/src/rgw/rgw_torrent.h
+++ b/src/rgw/rgw_torrent.h
@@ -8,12 +8,12 @@
 #include <map>
 #include <set>
 
+#include <fmt/format.h>
+
 #include "common/ceph_time.h"
 
 #include "rgw_common.h"
 
-using ceph::crypto::SHA1;
-
 struct req_state;
 
 #define RGW_OBJ_TORRENT    "rgw.torrent"
@@ -34,9 +34,6 @@ struct req_state;
 class TorrentBencode
 {
 public:
-  TorrentBencode() {}
-  ~TorrentBencode() {}
-
   //control characters
   void bencode_dict(bufferlist& bl) { bl.append('d'); }
   void bencode_list(bufferlist& bl) { bl.append('l'); }
@@ -53,33 +50,30 @@ public:
   }
 
   //single values
-  void bencode(const std::string& str, bufferlist& bl)
+  void bencode(std::string_view str, bufferlist& bl)
   {
     bencode_key(str, bl);
   }
 
   //dictionary elements
-  void bencode(const std::string& key, int value, bufferlist& bl)
+  void bencode(std::string_view key, int value, bufferlist& bl)
   {
     bencode_key(key, bl);
     bencode(value, bl);
   }
 
   //dictionary elements
-  void bencode(const std::string& key, const std::string& value, bufferlist& bl)
+  void bencode(std::string_view key, std::string_view value, bufferlist& bl)
   {
     bencode_key(key, bl);
     bencode(value, bl);
   }
 
   //key len
-  void bencode_key(const std::string& key, bufferlist& bl)
+  void bencode_key(std::string_view key, bufferlist& bl)
   {
-    int len = key.length();
-    char info[100] = { 0 };
-    sprintf(info, "%d:", len);
-    bl.append(info, strlen(info));
-    bl.append(key.c_str(), len);
+    bl.append(fmt::format("{}:", key.size()));
+    bl.append(key);
   }
 };
 
@@ -107,7 +101,7 @@ private:
 
   req_state *s{nullptr};
   rgw::sal::Driver* driver{nullptr};
-  SHA1 h;
+  ceph::crypto::SHA1 h;
 
   TorrentBencode dencode;
 public:
@@ -134,6 +128,6 @@ private:
   void set_announce();
   void set_exist(bool exist);
   void set_info_pieces(char *buff);
-  void sha1(SHA1 *h, bufferlist &bl, off_t bl_len);
+  void sha1(ceph::crypto::SHA1 *h, bufferlist &bl, off_t bl_len);
   int save_torrent_file(optional_yield y);
 };