From: Marcus Watts <mwatts@redhat.com>
Date: Thu, 22 Oct 2020 05:31:05 +0000 (-0400)
Subject: rgw/kms/kmip - string handling cleanup.
X-Git-Tag: v17.1.0~2721^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d46a623bbd0dcbb6ebf85a641f23192a5514844;p=ceph.git

rgw/kms/kmip - string handling cleanup.

Use string::data and string_view to clean up some string handling,
as suggested by reviewers.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
---

diff --git a/src/rgw/rgw_kmip_client_impl.cc b/src/rgw/rgw_kmip_client_impl.cc
index 483738a484c..0824273e64e 100644
--- a/src/rgw/rgw_kmip_client_impl.cc
+++ b/src/rgw/rgw_kmip_client_impl.cc
@@ -138,7 +138,7 @@ public:
 static int
 kmip_write_an_error_helper(const char *s, size_t l, void *u) {
   CephContext *cct = (CephContext *)u;
-  std::string es(s, l);
+  std::string_view es(s, l);
   lderr(cct) << es << dendl;
   return l;
 }
diff --git a/src/rgw/rgw_kms.cc b/src/rgw/rgw_kms.cc
index f251f129067..2da5ce47890 100644
--- a/src/rgw/rgw_kms.cc
+++ b/src/rgw/rgw_kms.cc
@@ -291,7 +291,7 @@ KmipGetTheKey::get_uniqueid_for_keyname()
 {
 	RGWKMIPTransceiver secret_req(cct, RGWKMIPTransceiver::LOCATE);
 
-	secret_req.name = (char *) work.c_str();	// XXX ugh constness
+	secret_req.name = work.data();
 	ret = secret_req.process(null_yield);
 	if (ret < 0) {
 		failed = true;
@@ -317,7 +317,7 @@ KmipGetTheKey::get_key_for_uniqueid(std::string& actual_key)
 {
 	if (failed) return ret;
 	RGWKMIPTransceiver secret_req(cct, RGWKMIPTransceiver::GET);
-	secret_req.unique_id = (char *) work.c_str();	// XXX ugh constness.
+	secret_req.unique_id = work.data();
 	ret = secret_req.process(null_yield);
 	if (ret < 0) {
 		failed = true;