Got rid of unneeded rgw::crypt_sanitize:: .

Signed-off-by: Adam Kupczyk <akupczyk@mirantis.com>

diff --git a/src/rgw/rgw_crypt_sanitize.cc b/src/rgw/rgw_crypt_sanitize.cc
index 114ac08430ea4efb9f1ac038a528d2fe6166948f..ab345bcbd1bc7c6dc8b6ff2cfad844e64702929d 100644 (file)
--- a/src/rgw/rgw_crypt_sanitize.cc
+++ b/src/rgw/rgw_crypt_sanitize.cc
@@ -16,21 +16,21 @@ const char* x_amz_server_side_encryption_customer_key = "x-amz-server-side-encry
 const char* dollar_x_amz_server_side_encryption_customer_key = "$x-amz-server-side-encryption-customer-key";
 const char* suppression_message = "=suppressed due to key presence=";
 
-std::ostream& operator<<(std::ostream& out, const rgw::crypt_sanitize::env& e) {
+std::ostream& operator<<(std::ostream& out, const env& e) {
   if (g_ceph_context->_conf->rgw_crypt_suppress_logs) {
     if (boost::algorithm::iequals(
         e.name,
-        rgw::crypt_sanitize::HTTP_X_AMZ_SERVER_SIDE_ENCRYPTION_CUSTOMER_KEY))
+        HTTP_X_AMZ_SERVER_SIDE_ENCRYPTION_CUSTOMER_KEY))
     {
-      out << rgw::crypt_sanitize::suppression_message;
+      out << suppression_message;
       return out;
     }
     if (boost::algorithm::iequals(e.name, "QUERY_STRING") &&
         boost::algorithm::ifind_first(
             e.value,
-            rgw::crypt_sanitize::x_amz_server_side_encryption_customer_key))
+            x_amz_server_side_encryption_customer_key))
     {
-      out << rgw::crypt_sanitize::suppression_message;
+      out << suppression_message;
       return out;
     }
   }
@@ -38,43 +38,43 @@ std::ostream& operator<<(std::ostream& out, const rgw::crypt_sanitize::env& e) {
   return out;
 }
 
-std::ostream& operator<<(std::ostream& out, const rgw::crypt_sanitize::x_meta_map& x) {
+std::ostream& operator<<(std::ostream& out, const x_meta_map& x) {
   if (g_ceph_context->_conf->rgw_crypt_suppress_logs &&
-      boost::algorithm::iequals(x.name, rgw::crypt_sanitize::x_amz_server_side_encryption_customer_key))
+      boost::algorithm::iequals(x.name, x_amz_server_side_encryption_customer_key))
   {
-    out << rgw::crypt_sanitize::suppression_message;
+    out << suppression_message;
     return out;
   }
   out << x.value;
   return out;
 }
 
-std::ostream& operator<<(std::ostream& out, const rgw::crypt_sanitize::s3_policy& x) {
+std::ostream& operator<<(std::ostream& out, const s3_policy& x) {
   if (g_ceph_context->_conf->rgw_crypt_suppress_logs &&
-      boost::algorithm::iequals(x.name, rgw::crypt_sanitize::dollar_x_amz_server_side_encryption_customer_key))
+      boost::algorithm::iequals(x.name, dollar_x_amz_server_side_encryption_customer_key))
   {
-    out << rgw::crypt_sanitize::suppression_message;
+    out << suppression_message;
     return out;
   }
   out << x.value;
   return out;
 }
 
-std::ostream& operator<<(std::ostream& out, const rgw::crypt_sanitize::auth& x) {
+std::ostream& operator<<(std::ostream& out, const auth& x) {
   if (g_ceph_context->_conf->rgw_crypt_suppress_logs &&
-      x.s->info.env->get(rgw::crypt_sanitize::HTTP_X_AMZ_SERVER_SIDE_ENCRYPTION_CUSTOMER_KEY, nullptr) != nullptr)
+      x.s->info.env->get(HTTP_X_AMZ_SERVER_SIDE_ENCRYPTION_CUSTOMER_KEY, nullptr) != nullptr)
   {
-    out << rgw::crypt_sanitize::suppression_message;
+    out << suppression_message;
     return out;
   }
   out << x.value;
   return out;
 }
 
-std::ostream& operator<<(std::ostream& out, const rgw::crypt_sanitize::log_content& x) {
+std::ostream& operator<<(std::ostream& out, const log_content& x) {
   if (g_ceph_context->_conf->rgw_crypt_suppress_logs &&
-      boost::algorithm::ifind_first(x.buf, rgw::crypt_sanitize::x_amz_server_side_encryption_customer_key)) {
-    out << rgw::crypt_sanitize::suppression_message;
+      boost::algorithm::ifind_first(x.buf, x_amz_server_side_encryption_customer_key)) {
+    out << suppression_message;
     return out;
   }
   out << x.buf;

diff --git a/src/rgw/rgw_crypt_sanitize.h b/src/rgw/rgw_crypt_sanitize.h
index a4cf51f32106b59e698324dffdd8bf23866af35b..644e12669baf960245002cb0c2263cdf54e1700f 100644 (file)
--- a/src/rgw/rgw_crypt_sanitize.h
+++ b/src/rgw/rgw_crypt_sanitize.h
@@ -59,11 +59,11 @@ struct log_content {
   : buf(buf) {}
 };
 
-std::ostream& operator<<(std::ostream& out, const rgw::crypt_sanitize::env& e);
-std::ostream& operator<<(std::ostream& out, const rgw::crypt_sanitize::x_meta_map& x);
-std::ostream& operator<<(std::ostream& out, const rgw::crypt_sanitize::s3_policy& x);
-std::ostream& operator<<(std::ostream& out, const rgw::crypt_sanitize::auth& x);
-std::ostream& operator<<(std::ostream& out, const rgw::crypt_sanitize::log_content& x);
+std::ostream& operator<<(std::ostream& out, const env& e);
+std::ostream& operator<<(std::ostream& out, const x_meta_map& x);
+std::ostream& operator<<(std::ostream& out, const s3_policy& x);
+std::ostream& operator<<(std::ostream& out, const auth& x);
+std::ostream& operator<<(std::ostream& out, const log_content& x);
 }
 }
 #endif /* RGW_RGW_CRYPT_SANITIZE_H_ */