[checkmk-commits] Export pnp_cleanup.

Module: check_mk Branch: master Commit: 602a54dc1173f1cacdeae733f5bec6b45bca16dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=602a54dc1173f1… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Wed Nov 11 11:57:11 2015 +0100 Export pnp_cleanup. --- livestatus/src/pnp4nagios.cc | 19 +++++++++++-------- livestatus/src/pnp4nagios.h | 2 ++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc index 5c1ed8a..c70d97f 100644 --- a/livestatus/src/pnp4nagios.cc +++ b/livestatus/src/pnp4nagios.cc @@ -36,6 +36,7 @@ extern char* g_pnp_path; namespace { +// TODO: Move this to some kind of C++ string utility file. string replace_all(const string& str, const string& chars, char replacement) { string result(str); size_t i = 0; @@ -44,19 +45,21 @@ string replace_all(const string& str, const string& chars, char replacement) { } return result; } +} // namespace -string cleanup(const string& name) { return replace_all(name, " /\\:", '_'); } - -} // namespace +string pnp_cleanup(const string& name) +{ + return replace_all(name, " /\\:", '_'); +} int pnpgraph_present(const string& host, const string& service) { string pnp_path(g_pnp_path); if (pnp_path.empty()) return -1; - string path(pnp_path.append(cleanup(host)) + string path(pnp_path.append(pnp_cleanup(host)) .append("/") - .append(cleanup(service)) + .append(pnp_cleanup(service)) .append(".xml")); return access(path.c_str(), R_OK) == 0 ? 1 : 0; } @@ -67,11 +70,11 @@ string rrd_path(const string& host, const string& service, string pnp_path(g_pnp_path); if (pnp_path.empty()) return ""; string path(pnp_path.append("/") - .append(cleanup(host)) + .append(pnp_cleanup(host)) .append("/") - .append(cleanup(service)) + .append(pnp_cleanup(service)) .append("_") - .append(cleanup(varname)) + .append(pnp_cleanup(varname)) .append(".rrd")); struct stat st; return stat(path.c_str(), &st) == 0 ? path : ""; diff --git a/livestatus/src/pnp4nagios.h b/livestatus/src/pnp4nagios.h index 3e80144..8fcb61c 100644 --- a/livestatus/src/pnp4nagios.h +++ b/livestatus/src/pnp4nagios.h @@ -29,6 +29,8 @@ #include <string> +std::string pnp_cleanup(const std::string& name); + int pnpgraph_present(const std::string& host, const std::string& service = "_HOST_");