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 483738a484c0d5cec2180c2fd4e59b74e2844633..0824273e64edc4877c6e7baa5b7e62c3537a8af7 100644 (file)
--- 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 f251f129067d86c298c0b21a9397f9c8fc8774f1..2da5ce47890074df9bcd61d44d872d3a0d82084e 100644 (file)
--- 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;