diff options
| -rw-r--r-- | include/zbxtypes.h | 6 | ||||
| -rw-r--r-- | src/libs/zbxdbhigh/lld.h | 3 | ||||
| -rw-r--r-- | src/libs/zbxdbhigh/lld_common.c | 6 | ||||
| -rw-r--r-- | src/libs/zbxdbhigh/lld_graph.c | 2 | ||||
| -rw-r--r-- | src/libs/zbxdbhigh/lld_trigger.c | 2 | ||||
| -rw-r--r-- | src/libs/zbxserver/expression.c | 12 | ||||
| -rw-r--r-- | src/zabbix_server/poller/checks_simple_vmware.c | 2 |
7 files changed, 16 insertions, 17 deletions
diff --git a/include/zbxtypes.h b/include/zbxtypes.h index 8f44ccd8eb6..b3aaa71fe60 100644 --- a/include/zbxtypes.h +++ b/include/zbxtypes.h @@ -131,9 +131,11 @@ #define ZBX_CONST_STRING(str) ""str -typedef struct { +typedef struct +{ zbx_uint64_t lo; zbx_uint64_t hi; -} zbx_uint128_t; +} +zbx_uint128_t; #endif diff --git a/src/libs/zbxdbhigh/lld.h b/src/libs/zbxdbhigh/lld.h index 82040b6122f..f7ee581a760 100644 --- a/src/libs/zbxdbhigh/lld.h +++ b/src/libs/zbxdbhigh/lld.h @@ -1,7 +1,6 @@ - /* ** Zabbix -** Copyright (C) 2000-2011 Zabbix SIA +** Copyright (C) 2001-2014 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/libs/zbxdbhigh/lld_common.c b/src/libs/zbxdbhigh/lld_common.c index 729719abda4..1d24d0350c0 100644 --- a/src/libs/zbxdbhigh/lld_common.c +++ b/src/libs/zbxdbhigh/lld_common.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2000-2011 Zabbix SIA +** Copyright (C) 2001-2014 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -21,14 +21,12 @@ #include "db.h" #include "log.h" #include "zbxserver.h" -#include "zbxregexp.h" /****************************************************************************** * * * Function: lld_field_str_rollback * * * - * Purpose: finds item in the selected host by an item prototype key and * - * discovered data * + * Author: Alexander Vladishev * * * ******************************************************************************/ void lld_field_str_rollback(char **field, char **field_orig, zbx_uint64_t *flags, zbx_uint64_t flag) diff --git a/src/libs/zbxdbhigh/lld_graph.c b/src/libs/zbxdbhigh/lld_graph.c index 890e4ad464b..c33e4788cc3 100644 --- a/src/libs/zbxdbhigh/lld_graph.c +++ b/src/libs/zbxdbhigh/lld_graph.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2000-2011 Zabbix SIA +** Copyright (C) 2001-2014 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/libs/zbxdbhigh/lld_trigger.c b/src/libs/zbxdbhigh/lld_trigger.c index 18015c2ff25..6b6080acd20 100644 --- a/src/libs/zbxdbhigh/lld_trigger.c +++ b/src/libs/zbxdbhigh/lld_trigger.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2000-2011 Zabbix SIA +** Copyright (C) 2001-2014 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by diff --git a/src/libs/zbxserver/expression.c b/src/libs/zbxserver/expression.c index 032c8eea36f..721f61d9974 100644 --- a/src/libs/zbxserver/expression.c +++ b/src/libs/zbxserver/expression.c @@ -4145,21 +4145,21 @@ static int substitute_discovery_macros_simple(char *data, char **replace_to, siz * * * Parameters: data - [IN/OUT] pointer to a buffer * * jp_row - [IN] discovery data * - * flags - [IN] ZBX_MACRO_ANY - all LLD macros will resolved * + * flags - [IN] ZBX_MACRO_ANY - all LLD macros will be resolved * * without validation of the value type * * ZBX_MACRO_NUMERIC - values for LLD macros should * * be numeric * * ZBX_MACRO_SIMPLE - LLD macros, located in the * - * item key parameters in simple macros will * - * resolved with considering quotes. * + * item key parameters in simple macros will be * + * resolved considering quotes. * * Flag ZBX_MACRO_NUMERIC doesn't affect these * - * macros * + * macros. * * error - [OUT] should be not NULL if ZBX_MACRO_NUMERIC flag is * * set * * * * Return value: Always SUCCEED if numeric flag is not set, otherwise SUCCEED * - * if all discovery macros resoved to numeric values, otherwise * - * FAIL with an error message * + * if all discovery macros resolved to numeric values, * + * otherwise FAIL with an error message. * * * * Author: Alexander Vladishev * * * diff --git a/src/zabbix_server/poller/checks_simple_vmware.c b/src/zabbix_server/poller/checks_simple_vmware.c index 596a8f97245..5382002dc2e 100644 --- a/src/zabbix_server/poller/checks_simple_vmware.c +++ b/src/zabbix_server/poller/checks_simple_vmware.c @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2000-2011 Zabbix SIA +** Copyright (C) 2001-2014 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by |