[checkmk-commits] Check_MK Git: check_mk: Livestatus: break some long lines in code

Module: check_mk Branch: master Commit: 57727810469626290e0f4afa5170626e3da44413 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57727810469626… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Mon Dec 19 21:34:21 2011 +0100 Livestatus: break some long lines in code --- livestatus/src/Column.h | 3 ++- livestatus/src/OffsetDoubleColumn.h | 3 ++- livestatus/src/Query.cc | 33 ++++++++++++++++++++++----------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/livestatus/src/Column.h b/livestatus/src/Column.h index 822ef79..054cace 100644 --- a/livestatus/src/Column.h +++ b/livestatus/src/Column.h @@ -53,7 +53,8 @@ public: virtual ~Column() {} const char *name() const { return _name.c_str(); } const char *description() const { return _description.c_str(); } - virtual string valueAsString(void *data __attribute__ ((__unused__)), Query *) { return "invalid"; } + virtual string valueAsString(void *data __attribute__ ((__unused__)), Query *) = 0; + // { return "invalid"; } virtual int type() = 0; virtual void output(void *data, Query *) = 0; virtual Filter *createFilter(int opid __attribute__ ((__unused__)), char *value __attribute__ ((__unused__))) { return 0; } diff --git a/livestatus/src/OffsetDoubleColumn.h b/livestatus/src/OffsetDoubleColumn.h index fe833f2..0a73a73 100644 --- a/livestatus/src/OffsetDoubleColumn.h +++ b/livestatus/src/OffsetDoubleColumn.h @@ -34,7 +34,8 @@ class OffsetDoubleColumn : public DoubleColumn { int _offset; public: - OffsetDoubleColumn(string name, string description, int offset, int indirect_offset = -1) + OffsetDoubleColumn(string name, string description, + int offset, int indirect_offset = -1) : DoubleColumn(name, description, indirect_offset), _offset(offset) {} double getValue(void *data); protected: diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc index fded693..7783272 100644 --- a/livestatus/src/Query.cc +++ b/livestatus/src/Query.cc @@ -489,7 +489,8 @@ void Query::parseAuthUserHeader(char *line) void Query::parseStatsGroupLine(char *line) { // Can be re-enabled from 1.2i1 - //logger(LOG_WARNING, "Warning: StatsGroupBy is deprecated. Please use Columns instead."); + logger(LOG_WARNING, "Warning: StatsGroupBy is deprecated. " + "Please use Columns instead."); parseColumnsLine(line); } @@ -504,7 +505,8 @@ void Query::parseColumnsLine(char *line) if (column) _columns.push_back(column); else { - _output->setError(RESPONSE_CODE_INVALID_HEADER, "Table '%s' has no column '%s'", _table->name(), column_name); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Table '%s' has no column '%s'", _table->name(), column_name); Column *col = createDummyColumn(column_name); _columns.push_back(col); } @@ -550,7 +552,8 @@ void Query::parseOutputFormatLine(char *line) else if (!strcmp(format, "python")) _output_format = OUTPUT_FORMAT_PYTHON; else - _output->setError(RESPONSE_CODE_INVALID_HEADER, "Invalid output format. Only 'csv' and 'json' are available."); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Invalid output format. Only 'csv' and 'json' are available."); } void Query::parseColumnHeadersLine(char *line) @@ -561,7 +564,8 @@ void Query::parseColumnHeadersLine(char *line) else if (!strcmp(value, "off")) _show_column_headers = false; else - _output->setError(RESPONSE_CODE_INVALID_HEADER, "Invalid value for ColumnHeaders: must be 'on' or 'off'"); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Invalid value for ColumnHeaders: must be 'on' or 'off'"); } void Query::parseKeepAliveLine(char *line) @@ -572,7 +576,8 @@ void Query::parseKeepAliveLine(char *line) else if (!strcmp(value, "off")) _output->setDoKeepalive(false); else - _output->setError(RESPONSE_CODE_INVALID_HEADER, "Invalid value for KeepAlive: must be 'on' or 'off'"); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Invalid value for KeepAlive: must be 'on' or 'off'"); } void Query::parseResponseHeaderLine(char *line) @@ -583,7 +588,8 @@ void Query::parseResponseHeaderLine(char *line) else if (!strcmp(value, "fixed16")) _output->setResponseHeader(RESPONSE_HEADER_FIXED16); else - _output->setError(RESPONSE_CODE_INVALID_HEADER, "Invalid value '%s' for ResponseHeader: must be 'off' or 'fixed16'", value); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Invalid value '%s' for ResponseHeader: must be 'off' or 'fixed16'", value); } void Query::parseLimitLine(char *line) @@ -595,7 +601,8 @@ void Query::parseLimitLine(char *line) else { int limit = atoi(value); if (!isdigit(value[0]) || limit < 0) - _output->setError(RESPONSE_CODE_INVALID_HEADER, "Invalid value for Limit: must be non-negative integer"); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Invalid value for Limit: must be non-negative integer"); else _limit = limit; } @@ -610,7 +617,8 @@ void Query::parseWaitTimeoutLine(char *line) else { int timeout = atoi(value); if (!isdigit(value[0]) || timeout < 0) - _output->setError(RESPONSE_CODE_INVALID_HEADER, "Invalid value for WaitTimeout: must be non-negative integer"); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Invalid value for WaitTimeout: must be non-negative integer"); else _wait_timeout = timeout; } @@ -631,7 +639,8 @@ void Query::parseWaitTriggerLine(char *line) return; } } - _output->setError(RESPONSE_CODE_INVALID_HEADER, "WaitTrigger: invalid trigger '%s'. Allowed are %s.", value, WT_ALLNAMES); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "WaitTrigger: invalid trigger '%s'. Allowed are %s.", value, WT_ALLNAMES); } void Query::parseWaitObjectLine(char *line) @@ -642,7 +651,8 @@ void Query::parseWaitObjectLine(char *line) char *objectspec = lstrip(line); _wait_object = _table->findObject(objectspec); if (!_wait_object) { - _output->setError(RESPONSE_CODE_INVALID_HEADER, "WaitObject: object '%s' not found or not supported by this table", objectspec); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "WaitObject: object '%s' not found or not supported by this table", objectspec); } } @@ -670,7 +680,8 @@ void Query::parseLocaltimeLine(char *line) else if (rem >= 900) full ++; if (full >= 48 || full <= -48) { - _output->setError(RESPONSE_CODE_INVALID_HEADER, "Invalid Localtime header: timezone difference greater then 24 hours"); + _output->setError(RESPONSE_CODE_INVALID_HEADER, + "Invalid Localtime header: timezone difference greater then 24 hours"); return; } _timezone_offset = full * 1800;