From: John Spray <john.spray@inktank.com>
Date: Thu, 8 May 2014 10:04:46 +0000 (+0100)
Subject: mon: Fix % escaping (\% should be %%)
X-Git-Tag: v0.80.6~103^2~2^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d578479420f4b0c153dffe96605bf413070ad45;p=ceph.git

mon: Fix % escaping (\% should be %%)

Clang's -Wpedantic points this out.

Signed-off-by: John Spray <john.spray@inktank.com>
(cherry picked from commit f0231ef364d531eb60351598c4a0f5fa6efad23c)

Conflicts:
	src/mon/DataHealthService.cc
---

diff --git a/src/mon/DataHealthService.cc b/src/mon/DataHealthService.cc
index 78732ac351ec..28986760d1a2 100644
--- a/src/mon/DataHealthService.cc
+++ b/src/mon/DataHealthService.cc
@@ -228,7 +228,7 @@ void DataHealthService::service_tick()
     if (ours.latest_avail_percent != last_warned_percent)
       mon->clog.warn()
 	<< "reached concerning levels of available space on local monitor storage"
-	<< " (" << ours.latest_avail_percent << "\% free)\n";
+	<< " (" << ours.latest_avail_percent << "%% free)\n";
     last_warned_percent = ours.latest_avail_percent;
   } else {
     last_warned_percent = 0;
diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index ae8f6e70d622..6b20b8275ed7 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -1253,7 +1253,7 @@ void PGMonitor::dump_pool_stats(stringstream &ss, Formatter *f, bool verbose)
     if (verbose)
       tbl.define_column("CATEGORY", TextTable::LEFT, TextTable::LEFT);
     tbl.define_column("USED", TextTable::LEFT, TextTable::LEFT);
-    tbl.define_column("\%USED", TextTable::LEFT, TextTable::LEFT);
+    tbl.define_column("%%USED", TextTable::LEFT, TextTable::LEFT);
     tbl.define_column("OBJECTS", TextTable::LEFT, TextTable::LEFT);
     if (verbose) {
       tbl.define_column("DIRTY", TextTable::LEFT, TextTable::LEFT);
@@ -1338,7 +1338,7 @@ void PGMonitor::dump_fs_stats(stringstream &ss, Formatter *f, bool verbose)
     tbl.define_column("SIZE", TextTable::LEFT, TextTable::LEFT);
     tbl.define_column("AVAIL", TextTable::LEFT, TextTable::LEFT);
     tbl.define_column("RAW USED", TextTable::LEFT, TextTable::LEFT);
-    tbl.define_column("\%RAW USED", TextTable::LEFT, TextTable::LEFT);
+    tbl.define_column("%%RAW USED", TextTable::LEFT, TextTable::LEFT);
     if (verbose) {
       tbl.define_column("OBJECTS", TextTable::LEFT, TextTable::LEFT);
     }