From f0231ef364d531eb60351598c4a0f5fa6efad23c Mon Sep 17 00:00:00 2001 From: John Spray Date: Thu, 8 May 2014 11:04:46 +0100 Subject: [PATCH] mon: Fix % escaping (\% should be %%) Clang's -Wpedantic points this out. Signed-off-by: John Spray --- src/mon/DataHealthService.cc | 4 ++-- src/mon/PGMonitor.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mon/DataHealthService.cc b/src/mon/DataHealthService.cc index 8dda929f02344..bbe98e1485a6b 100644 --- a/src/mon/DataHealthService.cc +++ b/src/mon/DataHealthService.cc @@ -114,7 +114,7 @@ health_status_t DataHealthService::get_health( stringstream ss; ss << "mon." << mon_name << " addr " << it->first.addr << " has " << stats.latest_avail_percent - << "\% avail disk space -- " << health_detail; + << "%% avail disk space -- " << health_detail; detail->push_back(make_pair(health_status, ss.str())); } @@ -233,7 +233,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 ae8f6e70d6226..6b20b8275ed70 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); } -- 2.39.5