[checkmk-commits] clang-tidied.

Module: check_mk Branch: master Commit: 6c89b8c362b9ddfb0d033e850e7506805b30bd3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c89b8c362b9dd… Author: Sven Panne &lt;sp(a)mathias-kettner.de&gt; Date: Tue May 3 10:04:22 2016 +0200 clang-tidied. --- livestatus/src/BlobColumn.cc | 4 +++- livestatus/src/DynamicLogwatchFileColumn.cc | 10 ++++++---- livestatus/src/LogwatchListColumn.cc | 13 ++++++++----- livestatus/src/Query.cc | 11 +++++++---- livestatus/src/Store.cc | 10 +++++++--- livestatus/src/mk_logwatch.cc | 12 ++++++++---- 6 files changed, 39 insertions(+), 21 deletions(-) diff --git a/livestatus/src/BlobColumn.cc b/livestatus/src/BlobColumn.cc index 74e8102..d064dcd 100644 --- a/livestatus/src/BlobColumn.cc +++ b/livestatus/src/BlobColumn.cc @@ -30,5 +30,7 @@ void BlobColumn::output(void *data, Query *query) { int size; char *buffer = getBlob(data, &size); query->outputBlob(buffer, size); - if (buffer != nullptr) free(buffer); + if (buffer != nullptr) { + free(buffer); + } } diff --git a/livestatus/src/DynamicLogwatchFileColumn.cc b/livestatus/src/DynamicLogwatchFileColumn.cc index 3394fd5..197b50c 100644 --- a/livestatus/src/DynamicLogwatchFileColumn.cc +++ b/livestatus/src/DynamicLogwatchFileColumn.cc @@ -40,15 +40,17 @@ string unescape_filename(string filename) { bool quote_active = false; for (auto c : filename) { if (quote_active) { - if (c == 's') + if (c == 's') { filename_native += ' '; - else + } else { filename_native += c; + } quote_active = false; - } else if (c == '\\') + } else if (c == '\\') { quote_active = true; - else + } else { filename_native += c; + } } return filename_native; } diff --git a/livestatus/src/LogwatchListColumn.cc b/livestatus/src/LogwatchListColumn.cc index 077fe52..8779db8 100644 --- a/livestatus/src/LogwatchListColumn.cc +++ b/livestatus/src/LogwatchListColumn.cc @@ -54,24 +54,27 @@ void LogwatchListColumn::output(void *data, Query *query) { std::string path = mk_logwatch_path_of_host(host_name); if (path != "") { DIR *dir = opendir(path.c_str()); - if (dir) { + if (dir != nullptr) { struct dirent de; struct dirent *dep; bool first = true; while (true) { readdir_r(dir, &de, &dep); - if (!dep) { + if (dep == nullptr) { closedir(dir); break; } - if (!strcmp(dep->d_name, ".") || !strcmp(dep->d_name, "..")) + if ((strcmp(dep->d_name, ".") == 0) || + (strcmp(dep->d_name, "..") == 0)) { continue; + } - if (first) + if (first) { first = false; - else + } else { query->outputListSeparator(); + } query->outputString(dep->d_name); } } diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index 36bdf20..8010c29 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -1079,12 +1079,15 @@ void Query::outputUnicodeEscape(unsigned value) { void Query::outputBlob(const char *buffer, int size) { if (_output_format != OUTPUT_FORMAT_CSV) { - if (buffer) + if (buffer != nullptr) { outputString(buffer, size); - else + } else { outputNull(); + } } else { - if (buffer) _output->addBuffer(buffer, size); + if (buffer != nullptr) { + _output->addBuffer(buffer, size); + } } } @@ -1109,7 +1112,7 @@ void Query::outputString(const char *value, int len) { _output->addChar('"'); const char *r = value; int chars_left = len >= 0 ? len : strlen(r); - while (chars_left) { + while (chars_left != 0) { // Always escape control characters (1..31) if (*r < 32 && *r >= 0) { if (len < 0) { diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 4508e86..4bc0061 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -181,7 +181,9 @@ bool Store::answerRequest(InputBuffer *input, OutputBuffer *output) { } void Store::answerCommandRequest(const char *command) { - if (answerLogwatchCommandRequest(command)) return; + if (answerLogwatchCommandRequest(command)) { + return; + } lock_guard<mutex> lg(_command_mutex); #ifdef NAGIOS4 @@ -197,10 +199,12 @@ bool Store::answerLogwatchCommandRequest(const char *command) { // Handle special command "[1462191638] // MK_LOGWATCH_ACKNOWLEDGE;host123;\var\log\syslog" if (strlen(command) >= 37 && command[0] == '[' && command[11] == ']' && - !strncmp(command + 13, "MK_LOGWATCH_ACKNOWLEDGE;", 24)) { + (strncmp(command + 13, "MK_LOGWATCH_ACKNOWLEDGE;", 24) == 0)) { const char *host_name_begin = command + 37; const char *host_name_end = strchr(host_name_begin, ';'); - if (!host_name_end) return false; + if (host_name_end == nullptr) { + return false; + } std::string host_name(host_name_begin, host_name_end - host_name_begin); std::string file_name(host_name_end + 1); mk_logwatch_acknowledge(host_name, file_name); diff --git a/livestatus/src/mk_logwatch.cc b/livestatus/src/mk_logwatch.cc index 5e5bc70..afa96e6 100644 --- a/livestatus/src/mk_logwatch.cc +++ b/livestatus/src/mk_logwatch.cc @@ -32,8 +32,9 @@ std::string mk_logwatch_path_of_host(const char *host_name) { std::string path(MK_LOGWATCH_PATH); - if (path == "") return ""; - + if (path == "") { + return ""; + } path += pnp_cleanup(host_name); return path; } @@ -48,14 +49,17 @@ void mk_logwatch_acknowledge(const std::string &host_name, } std::string path(MK_LOGWATCH_PATH); - if (path == "") return; + if (path == "") { + return; + } path += pnp_cleanup(host_name); path += "/"; path += file_name; int r = remove(path.c_str()); - if (r != 0) + if (r != 0) { logger(LOG_WARNING, "Cannot acknowledge mk_logfile file '%s' of host '%s': %s", file_name.c_str(), host_name.c_str(), strerror(errno)); + } }