auth: clean up cap parse error messages

Consistent formatted.  Drop newline.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mds/MDSAuthCaps.cc b/src/mds/MDSAuthCaps.cc
index ffa06f60e973d88f9504faab12c1752bbb42b40c..949ac62c0c43da3959b37da8437e2fb687222e4a 100644 (file)
--- a/src/mds/MDSAuthCaps.cc
+++ b/src/mds/MDSAuthCaps.cc
@@ -335,8 +335,9 @@ bool MDSAuthCaps::parse(CephContext *c, std::string_view str, ostream *err)
     grants.clear();
 
     if (err)
-      *err << "MDSAuthCaps parse failed, stopped at '" << std::string(iter, end)
-           << "' of '" << str << "'\n";
+      *err << "mds capability parse failed, stopped at '"
+          << std::string(iter, end)
+           << "' of '" << str << "'";
     return false; 
   }
 }

diff --git a/src/mon/MonCap.cc b/src/mon/MonCap.cc
index ad1e61a8332574b921dd5a27cb62e66d70325d29..1724a10ae5290f4081292e80b802018665483566 100644 (file)
--- a/src/mon/MonCap.cc
+++ b/src/mon/MonCap.cc
@@ -613,10 +613,11 @@ bool MonCap::parse(const string& str, ostream *err)
 
   if (err) {
     if (iter != end)
-      *err << "moncap parse failed, stopped at '" << std::string(iter, end)
-          << "' of '" << str << "'\n";
+      *err << "mon capability parse failed, stopped at '"
+          << std::string(iter, end)
+          << "' of '" << str << "'";
     else
-      *err << "moncap parse failed, stopped at end of '" << str << "'\n";
+      *err << "mon capability parse failed, stopped at end of '" << str << "'";
   }
 
   return false; 

diff --git a/src/osd/OSDCap.cc b/src/osd/OSDCap.cc
index bbbe4c54e3b5854c223e5abc1979b31c37ba97ce..0dc074ebcaacea3e0395249e66a8acaf9995b32d 100644 (file)
--- a/src/osd/OSDCap.cc
+++ b/src/osd/OSDCap.cc
@@ -535,8 +535,8 @@ bool OSDCap::parse(const string& str, ostream *err)
   grants.clear();
 
   if (err)
-    *err << "osdcap parse failed, stopped at '" << std::string(iter, end)
-        << "' of '" << str << "'\n";
+    *err << "osd capability parse failed, stopped at '" << std::string(iter, end)
+        << "' of '" << str << "'";
 
   return false; 
 }