diff options
247 files changed, 0 insertions, 6414 deletions
diff --git a/bin/win32/dev/zabbix_sender.h b/bin/win32/dev/zabbix_sender.h index d588a38d9fd..d2889811857 100644 --- a/bin/win32/dev/zabbix_sender.h +++ b/bin/win32/dev/zabbix_sender.h @@ -50,8 +50,6 @@ zabbix_sender_info_t; /****************************************************************************** * * - * Function: zabbix_sender_send_values * - * * * Purpose: send values to Zabbix server/proxy * * * * Parameters: address - [IN] zabbix server/proxy address * @@ -74,8 +72,6 @@ ZBX_API int zabbix_sender_send_values(const char *address, unsigned short port, /****************************************************************************** * * - * Function: zabbix_sender_parse_result * - * * * Purpose: parses the result returned from zabbix_sender_send_values() * * function * * * @@ -97,8 +93,6 @@ ZBX_API int zabbix_sender_parse_result(const char *result, int *response, zabbix /****************************************************************************** * * - * Function: zabbix_sender_free_result * - * * * Purpose: free data allocated by zabbix_sender_send_values() function * * * * Parameters: ptr - [IN] pointer to the data to free * diff --git a/bin/win64/dev/zabbix_sender.h b/bin/win64/dev/zabbix_sender.h index d588a38d9fd..d2889811857 100644 --- a/bin/win64/dev/zabbix_sender.h +++ b/bin/win64/dev/zabbix_sender.h @@ -50,8 +50,6 @@ zabbix_sender_info_t; /****************************************************************************** * * - * Function: zabbix_sender_send_values * - * * * Purpose: send values to Zabbix server/proxy * * * * Parameters: address - [IN] zabbix server/proxy address * @@ -74,8 +72,6 @@ ZBX_API int zabbix_sender_send_values(const char *address, unsigned short port, /****************************************************************************** * * - * Function: zabbix_sender_parse_result * - * * * Purpose: parses the result returned from zabbix_sender_send_values() * * function * * * @@ -97,8 +93,6 @@ ZBX_API int zabbix_sender_parse_result(const char *result, int *response, zabbix /****************************************************************************** * * - * Function: zabbix_sender_free_result * - * * * Purpose: free data allocated by zabbix_sender_send_values() function * * * * Parameters: ptr - [IN] pointer to the data to free * diff --git a/src/libs/zbxalgo/algodefs.c b/src/libs/zbxalgo/algodefs.c index bc18707a6e4..1b056f746a1 100644 --- a/src/libs/zbxalgo/algodefs.c +++ b/src/libs/zbxalgo/algodefs.c @@ -387,8 +387,6 @@ int next_prime(int n) /****************************************************************************** * * - * Function: zbx_isqrt32 * - * * * Purpose: calculate integer part of square root of a 32 bit integer value * * * * Parameters: value - [IN] the value to calculate square root for * @@ -422,8 +420,6 @@ unsigned int zbx_isqrt32(unsigned int value) /****************************************************************************** * * - * Function: zbx_gen_uuid4 * - * * * Purpose: calculate UUID version 4 as string of 32 symbols * * * * Parameters: seed - [IN] string for seed calculation * diff --git a/src/libs/zbxalgo/evaluate.c b/src/libs/zbxalgo/evaluate.c index 227b7c5383a..54398d2bc79 100644 --- a/src/libs/zbxalgo/evaluate.c +++ b/src/libs/zbxalgo/evaluate.c @@ -178,8 +178,6 @@ static double evaluate_number(int *unknown_idx) /****************************************************************************** * * - * Function: variant_convert_to_double * - * * * Purpose: cast string variant to a double variant * * * * Parameters: var - [IN/OUT] the variant to cast * @@ -202,8 +200,6 @@ static void variant_convert_to_double(zbx_variant_t *var) /****************************************************************************** * * - * Function: variant_get_double * - * * * Purpose: get variant value in double (float64) format * * * * Parameters: var - [IN] the input variant * @@ -1044,8 +1040,6 @@ int evaluate(double *value, const char *expression, char *error, size_t max_erro /****************************************************************************** * * - * Function: evaluate_unknown * - * * * Purpose: evaluate an expression like "(26.416>10) and not(0=ZBX_UNKNOWN0)" * * * * Parameters: expression - [IN] expression to evaluate * @@ -1096,8 +1090,6 @@ int evaluate_unknown(const char *expression, double *value, char *error, size_t /****************************************************************************** * * - * Function: evaluate_string_to_double * - * * * Purpose: cast string to a double, expand suffixes and parse negative sign * * * * Parameters: in - [IN] the input string * diff --git a/src/libs/zbxalgo/hashset.c b/src/libs/zbxalgo/hashset.c index 3e7ca15a909..489ad33ea05 100644 --- a/src/libs/zbxalgo/hashset.c +++ b/src/libs/zbxalgo/hashset.c @@ -126,8 +126,6 @@ void zbx_hashset_destroy(zbx_hashset_t *hs) /****************************************************************************** * * - * Function: zbx_hashset_reserve * - * * * Purpose: allocation not less than the required number of slots for hashset * * * * Parameters: hs - [IN] the destination hashset * diff --git a/src/libs/zbxalgo/int128.c b/src/libs/zbxalgo/int128.c index ab4036071da..8e1bc237f3c 100644 --- a/src/libs/zbxalgo/int128.c +++ b/src/libs/zbxalgo/int128.c @@ -26,8 +26,6 @@ /****************************************************************************** * * - * Function: udec128_128 * - * * * Purpose: Decrement of 128 bit unsigned integer by the specified value. * * * * Parameters: base - [IN,OUT] the integer to decrement. * @@ -48,8 +46,6 @@ static void udec128_128(zbx_uint128_t *base, const zbx_uint128_t *value) /****************************************************************************** * * - * Function: ushiftr128 * - * * * Purpose: Logical right shift of 128 bit unsigned integer. * * * * Parameters: base - [IN,OUT] the initial value and result * @@ -78,8 +74,6 @@ static void ushiftr128(zbx_uint128_t *base, unsigned int bits) /****************************************************************************** * * - * Function: ushiftl128 * - * * * Purpose: Logical left shift of 128 bit unsigned integer. * * * * Parameters: base - [IN,OUT] the initial value and result * @@ -108,8 +102,6 @@ static void ushiftl128(zbx_uint128_t *base, unsigned int bits) /****************************************************************************** * * - * Function: ucmp128_128 * - * * * Purpose: Comparison of two 128 bit unsigned integer values. * * * * Parameters: value1 - [IN] the first value to compare. * @@ -133,8 +125,6 @@ static int ucmp128_128(const zbx_uint128_t *value1, const zbx_uint128_t *value2) /****************************************************************************** * * - * Function: umul64_32_shift * - * * * Purpose: Multiplication of 64 bit unsigned integer with 32 bit unsigned * * integer value, shifted left by specified number of bits * * * @@ -164,8 +154,6 @@ static void umul64_32_shift(zbx_uint128_t *base, zbx_uint64_t value, zbx_uint64_ /****************************************************************************** * * - * Function: uinc128_64 * - * * * Purpose: Increment of 128 bit unsigned integer by the specified 64 bit * * value. * * * @@ -187,8 +175,6 @@ void uinc128_64(zbx_uint128_t *base, zbx_uint64_t value) /****************************************************************************** * * - * Function: uinc128_128 * - * * * Purpose: Increment of 128 bit unsigned integer by the specified 128 bit * * value * * * @@ -211,8 +197,6 @@ void uinc128_128(zbx_uint128_t *base, const zbx_uint128_t *value) /****************************************************************************** * * - * Function: umul64_64 * - * * * Purpose: Multiplication of two 64 bit unsigned integer values. * * * * Parameters: result - [OUT] the resulting 128 bit unsigned integer value * @@ -233,8 +217,6 @@ void umul64_64(zbx_uint128_t *result, zbx_uint64_t value, zbx_uint64_t factor) /****************************************************************************** * * - * Function: udiv128_64 * - * * * Purpose: Division of 128 bit unsigned integer by a 64 bit unsigned integer * * value. * * * diff --git a/src/libs/zbxalgo/linked_list.c b/src/libs/zbxalgo/linked_list.c index 737173eaf91..b803a332fd0 100644 --- a/src/libs/zbxalgo/linked_list.c +++ b/src/libs/zbxalgo/linked_list.c @@ -22,8 +22,6 @@ /****************************************************************************** * * - * Function: zbx_list_create_ext * - * * * Purpose: create singly linked list (with custom memory functions) * * * * Parameters: queue - [IN] the list * @@ -41,8 +39,6 @@ void zbx_list_create_ext(zbx_list_t *queue, zbx_mem_malloc_func_t mem_malloc_fun /****************************************************************************** * * - * Function: zbx_list_create * - * * * Purpose: create singly linked list * * * * Parameters: queue - [IN] the list * @@ -55,8 +51,6 @@ void zbx_list_create(zbx_list_t *queue) /****************************************************************************** * * - * Function: zbx_list_destroy * - * * * Purpose: destroy list * * * * Parameters: list - [IN] the list * @@ -70,8 +64,6 @@ void zbx_list_destroy(zbx_list_t *list) /****************************************************************************** * * - * Function: list_create_item * - * * * Purpose: allocate memory and initialize a new list item * * * * Parameters: list - [IN] the list * @@ -94,8 +86,6 @@ static void list_create_item(zbx_list_t *list, void *value, zbx_list_item_t **cr /****************************************************************************** * * - * Function: zbx_list_insert_after * - * * * Purpose: insert value after specified position in the list * * * * Parameters: list - [IN] the list * @@ -133,8 +123,6 @@ void zbx_list_insert_after(zbx_list_t *list, zbx_list_item_t *after, void *value /****************************************************************************** * * - * Function: zbx_list_append * - * * * Purpose: append value to the end of the list * * * * Parameters: list - [IN] the list * @@ -149,8 +137,6 @@ void zbx_list_append(zbx_list_t *list, void *value, zbx_list_item_t **inserted) /****************************************************************************** * * - * Function: zbx_list_prepend * - * * * Purpose: prepend value to the beginning of the list * * * * Parameters: list - [IN] the list * @@ -175,8 +161,6 @@ void zbx_list_prepend(zbx_list_t *list, void *value, zbx_list_item_t **inserted) /****************************************************************************** * * - * Function: zbx_list_pop * - * * * Purpose: removes a value from the beginning of the list * * * * Parameters: list - [IN] the list * @@ -209,8 +193,6 @@ int zbx_list_pop(zbx_list_t *list, void **value) /****************************************************************************** * * - * Function: zbx_list_peek * - * * * Purpose: get value from the queue without dequeuing * * * * Parameters: list - [IN] the list * @@ -233,8 +215,6 @@ int zbx_list_peek(const zbx_list_t *list, void **value) /****************************************************************************** * * - * Function: zbx_list_iterator_init * - * * * Purpose: initialize list iterator * * * * Parameters: list - [IN] the list * @@ -250,8 +230,6 @@ void zbx_list_iterator_init(zbx_list_t *list, zbx_list_iterator_t *iterator) /****************************************************************************** * * - * Function: zbx_list_iterator_next * - * * * Purpose: advance list iterator * * * * Parameters: iterator - [IN] the iterator to be advanced * @@ -275,8 +253,6 @@ int zbx_list_iterator_next(zbx_list_iterator_t *iterator) /****************************************************************************** * * - * Function: zbx_list_iterator_peek * - * * * Purpose: get value without removing it from list * * * * Parameters: iterator - [IN] initialized list iterator * @@ -299,8 +275,6 @@ int zbx_list_iterator_peek(const zbx_list_iterator_t *iterator, void **value) /****************************************************************************** * * - * Function: zbx_list_iterator_clear * - * * * Purpose: clears iterator leaving it in uninitialized state * * * * Parameters: iterator - [IN] list iterator * @@ -313,8 +287,6 @@ void zbx_list_iterator_clear(zbx_list_iterator_t *iterator) /****************************************************************************** * * - * Function: zbx_list_iterator_equal * - * * * Purpose: tests if two iterators points at the same list item * * * * Parameters: iterator1 - [IN] first list iterator * @@ -334,8 +306,6 @@ int zbx_list_iterator_equal(const zbx_list_iterator_t *iterator1, const zbx_list /****************************************************************************** * * - * Function: zbx_list_iterator_isset * - * * * Purpose: checks if the iterator points at some list item * * * * Parameters: iterator - [IN] list iterator * @@ -350,8 +320,6 @@ int zbx_list_iterator_isset(const zbx_list_iterator_t *iterator) /****************************************************************************** * * - * Function: zbx_list_iterator_update * - * * * Purpose: updates iterator * * * * Parameters: iterator - [IN] list iterator * diff --git a/src/libs/zbxalgo/queue.c b/src/libs/zbxalgo/queue.c index 10430f96472..11d5fab0e26 100644 --- a/src/libs/zbxalgo/queue.c +++ b/src/libs/zbxalgo/queue.c @@ -22,8 +22,6 @@ /****************************************************************************** * * - * Function: zbx_queue_ptr_values_num * - * * * Purpose: calculates the number of values in queue * * * * Parameters: queue - [IN] the queue * @@ -44,8 +42,6 @@ int zbx_queue_ptr_values_num(zbx_queue_ptr_t *queue) /****************************************************************************** * * - * Function: zbx_queue_ptr_reserve * - * * * Purpose: reserves space in queue for additional values * * * * Parameters: queue - [IN] the queue * @@ -77,8 +73,6 @@ void zbx_queue_ptr_reserve(zbx_queue_ptr_t *queue, int num) /****************************************************************************** * * - * Function: zbx_queue_ptr_compact * - * * * Purpose: compacts queue by freeing unused space * * * * Parameters: queue - [IN] the queue * @@ -116,8 +110,6 @@ void zbx_queue_ptr_compact(zbx_queue_ptr_t *queue) /****************************************************************************** * * - * Function: zbx_queue_ptr_create * - * * * Purpose: creates queue * * * * Parameters: queue - [IN] the queue * @@ -130,8 +122,6 @@ void zbx_queue_ptr_create(zbx_queue_ptr_t *queue) /****************************************************************************** * * - * Function: zbx_queue_ptr_destroy * - * * * Purpose: destroys queue * * * * Parameters: queue - [IN] the queue * @@ -144,8 +134,6 @@ void zbx_queue_ptr_destroy(zbx_queue_ptr_t *queue) /****************************************************************************** * * - * Function: zbx_queue_ptr_push * - * * * Purpose: pushes value in the queue * * * * Parameters: queue - [IN] the queue * @@ -163,8 +151,6 @@ void zbx_queue_ptr_push(zbx_queue_ptr_t *queue, void *value) /****************************************************************************** * * - * Function: zbx_queue_ptr_pop * - * * * Purpose: pops value in the queue * * * * Parameters: queue - [IN] the queue * @@ -194,8 +180,6 @@ void *zbx_queue_ptr_pop(zbx_queue_ptr_t *queue) /****************************************************************************** * * - * Function: zbx_queue_ptr_remove_value * - * * * Purpose: removes specified value from queue * * * * Parameters: queue - [IN] the queue * diff --git a/src/libs/zbxalgo/serialize.c b/src/libs/zbxalgo/serialize.c index 9cb0dc09a0c..feac0c2e383 100644 --- a/src/libs/zbxalgo/serialize.c +++ b/src/libs/zbxalgo/serialize.c @@ -21,8 +21,6 @@ #include "zbxserialize.h" /****************************************************************************** * * - * Function: zbx_serialize_uint31_compact * - * * * Purpose: serialize 31 bit unsigned integer into utf-8 like byte stream * * * * Parameters: ptr - [OUT] the output buffer * @@ -63,8 +61,6 @@ zbx_uint32_t zbx_serialize_uint31_compact(unsigned char *ptr, zbx_uint32_t value /****************************************************************************** * * - * Function: zbx_deserialize_uint31_compact * - * * * Purpose: deserialize 31 bit unsigned integer from utf-8 like byte stream * * * * Parameters: ptr - [IN] the byte stream * diff --git a/src/libs/zbxaudit/audit.c b/src/libs/zbxaudit/audit.c index 77da07f08f9..4a4552eda1d 100644 --- a/src/libs/zbxaudit/audit.c +++ b/src/libs/zbxaudit/audit.c @@ -160,8 +160,6 @@ static void delete_json(struct zbx_json *json, const char *audit_op, const char /****************************************************************************** * * - * Function: zbx_auditlog_global_script * - * * * Purpose: record global script execution results into audit log * * * * Comments: 'hostid' should be always > 0. 'eventid' is > 0 in case of * diff --git a/src/libs/zbxaudit/audit_item.c b/src/libs/zbxaudit/audit_item.c index 1eadbc106cc..af4b34107e0 100644 --- a/src/libs/zbxaudit/audit_item.c +++ b/src/libs/zbxaudit/audit_item.c @@ -366,8 +366,6 @@ PREPARE_AUDIT_ITEM_UPDATE(key, const char*, string) /****************************************************************************** * * - * Function: zbx_audit_item_create_entry_for_delete * - * * * Parameters: id - [IN] resource id * * name - [IN] resource name * * flag - [IN] resource flag * @@ -402,8 +400,6 @@ void zbx_audit_item_create_entry_for_delete(zbx_uint64_t id, const char *name, i /****************************************************************************** * * - * Function: zbx_audit_DBselect_delete_for_item * - * * * Parameters: sql - [IN] sql statement * * ids - [OUT] sorted list of selected uint64 values * * * diff --git a/src/libs/zbxaudit/audit_trigger.c b/src/libs/zbxaudit/audit_trigger.c index 7a6e6199ce8..88ad93f98f9 100644 --- a/src/libs/zbxaudit/audit_trigger.c +++ b/src/libs/zbxaudit/audit_trigger.c @@ -216,8 +216,6 @@ PREPARE_AUDIT_TRIGGER_UPDATE(recovery_expression, const char*, string) /****************************************************************************** * * - * Function: zbx_audit_DBselect_delete_for_trigger * - * * * Parameters: sql - [IN] sql statement * * ids - [OUT] sorted list of selected uint64 values * * * diff --git a/src/libs/zbxcommon/comms.c b/src/libs/zbxcommon/comms.c index 6fa9fafaa07..48a0ecdfc42 100644 --- a/src/libs/zbxcommon/comms.c +++ b/src/libs/zbxcommon/comms.c @@ -113,8 +113,6 @@ int comms_parse_response(char *xml, char *host, size_t host_len, char *key, size /****************************************************************************** * * - * Function: zbx_htole_uint64 * - * * * Purpose: convert unsigned integer 64 bit * * from host byte order * * to little-endian byte order format * @@ -148,8 +146,6 @@ zbx_uint64_t zbx_htole_uint64(zbx_uint64_t data) /****************************************************************************** * * - * Function: zbx_letoh_uint64 * - * * * Purpose: convert unsigned integer 64 bit * * from little-endian byte order format * * to host byte order * @@ -183,8 +179,6 @@ zbx_uint64_t zbx_letoh_uint64(zbx_uint64_t data) /****************************************************************************** * * - * Function: zbx_htole_uint32 * - * * * Purpose: convert unsigned integer 32 bit * * from host byte order * * to little-endian byte order format * @@ -210,8 +204,6 @@ zbx_uint32_t zbx_htole_uint32(zbx_uint32_t data) /****************************************************************************** * * - * Function: zbx_letoh_uint32 * - * * * Purpose: convert unsigned integer 32 bit * * from little-endian byte order format * * to host byte order * diff --git a/src/libs/zbxcommon/cuid.c b/src/libs/zbxcommon/cuid.c index a0ee567a1a1..1b09436492a 100644 --- a/src/libs/zbxcommon/cuid.c +++ b/src/libs/zbxcommon/cuid.c @@ -44,8 +44,6 @@ static char host_block[HOST_TMP_36_BASE_BUF_LEN]; /****************************************************************************** * * - * Function: pad * - * * * Purpose: modify string in-place to the specified length as required by * * CUID algorithm * * * @@ -128,8 +126,6 @@ static void from_decimal(char *res, size_t base, size_t input_num) /****************************************************************************** * * - * Function: zbx_cuid_init * - * * * Purpose: initializes context for the cuid generation * * * ******************************************************************************/ @@ -176,8 +172,6 @@ static size_t next(void) /****************************************************************************** * * - * Function: zbx_new_cuid * - * * * Purpose: generates cuid, is based on the go cuid implementation from * * https://github.com/lucsky/cuid/blob/master/cuid.go * * consider using mutexes around it if used inside threads * diff --git a/src/libs/zbxcommon/file.c b/src/libs/zbxcommon/file.c index dff829b1ab6..e5152d4e21e 100644 --- a/src/libs/zbxcommon/file.c +++ b/src/libs/zbxcommon/file.c @@ -80,8 +80,6 @@ void find_cr_lf_szbyte(const char *encoding, const char **cr, const char **lf, s /****************************************************************************** * * - * Function: zbx_read * - * * * Purpose: Read one text line from a file descriptor into buffer * * * * Parameters: fd - [IN] file descriptor to read from * @@ -189,8 +187,6 @@ char *zbx_fgets(char *buffer, int size, FILE *fp) /****************************************************************************** * * - * Function: zbx_write_all * - * * * Purpose: call write in a loop, iterating until all the data is written. * * * * Parameters: fd - [IN] descriptor * diff --git a/src/libs/zbxcommon/iprange.c b/src/libs/zbxcommon/iprange.c index 4cc14418be6..6a9643d7709 100644 --- a/src/libs/zbxcommon/iprange.c +++ b/src/libs/zbxcommon/iprange.c @@ -21,8 +21,6 @@ /****************************************************************************** * * - * Function: iprange_is_whitespace_character * - * * * Purpose: checks if the specified character is allowed whitespace character * * that can be used before or after iprange definition * * * @@ -48,8 +46,6 @@ static int iprange_is_whitespace_character(unsigned char value) /****************************************************************************** * * - * Function: iprange_address_length * - * * * Purpose: calculates the length of address data without trailing whitespace * * * ******************************************************************************/ @@ -72,8 +68,6 @@ static size_t iprange_address_length(const char *address) /****************************************************************************** * * - * Function: iprange_apply_mask * - * * * Purpose: applies a bit mask to the parsed v4 or v6 IP range * * * * Parameters: iprange - [IN] the IP range * @@ -119,8 +113,6 @@ static void iprange_apply_mask(zbx_iprange_t *iprange, int bits) /****************************************************************************** * * - * Function: iprangev4_parse * - * * * Purpose: parse IPv4 address into IP range structure * * * * Parameters: iprange - [OUT] the IP range * @@ -213,8 +205,6 @@ static int iprangev4_parse(zbx_iprange_t *iprange, const char *address) /****************************************************************************** * * - * Function: iprangev6_parse * - * * * Purpose: parse IPv6 address into IP range structure * * * * Parameters: iprange - [OUT] the IP range * @@ -349,8 +339,6 @@ check_fill: /****************************************************************************** * * - * Function: iprange_parse * - * * * Purpose: parse IP address (v4 or v6) into IP range structure * * * * Parameters: iprange - [OUT] the IP range * @@ -376,8 +364,6 @@ int iprange_parse(zbx_iprange_t *iprange, const char *address) /****************************************************************************** * * - * Function: iprange_first * - * * * Purpose: gets the first IP address from the specified range * * * * Parameters: iprange - [IN] the IP range * @@ -403,8 +389,6 @@ void iprange_first(const zbx_iprange_t *iprange, int *address) /****************************************************************************** * * - * Function: iprange_next * - * * * Purpose: gets the next IP address from the specified range * * * * Parameters: iprange - [IN] the IP range * @@ -454,8 +438,6 @@ int iprange_next(const zbx_iprange_t *iprange, int *address) /****************************************************************************** * * - * Function: iprange_validate * - * * * Purpose: checks if the IP address is in specified range * * * * Parameters: iprange - [IN] the IP range * @@ -483,8 +465,6 @@ int iprange_validate(const zbx_iprange_t *iprange, const int *address) /****************************************************************************** * * - * Function: iprange_volume * - * * * Purpose: get the number of addresses covered by the specified IP range * * * * Parameters: iprange - [IN] the IP range * diff --git a/src/libs/zbxcommon/misc.c b/src/libs/zbxcommon/misc.c index 3a5c5cf3409..59638681871 100644 --- a/src/libs/zbxcommon/misc.c +++ b/src/libs/zbxcommon/misc.c @@ -126,8 +126,6 @@ out: /****************************************************************************** * * - * Function: get_program_name * - * * * Purpose: return program name without path * * * * Parameters: path * @@ -152,8 +150,6 @@ const char *get_program_name(const char *path) /****************************************************************************** * * - * Function: zbx_timespec * - * * * Purpose: Gets the current time. * * * * Author: Alexander Vladishev * @@ -275,8 +271,6 @@ void zbx_timespec(zbx_timespec_t *ts) /****************************************************************************** * * - * Function: zbx_time * - * * * Purpose: Gets the current time. * * * * Return value: Time in seconds * @@ -298,8 +292,6 @@ double zbx_time(void) /****************************************************************************** * * - * Function: zbx_current_time * - * * * Purpose: Gets the current time including UTC offset * * * * Return value: Time in seconds * @@ -314,8 +306,6 @@ double zbx_current_time(void) /****************************************************************************** * * - * Function: zbx_is_leap_year * - * * * Return value: SUCCEED - year is a leap year * * FAIL - year is not a leap year * * * @@ -327,8 +317,6 @@ int zbx_is_leap_year(int year) /****************************************************************************** * * - * Function: zbx_get_time * - * * * Purpose: * * get current time and store it in memory locations provided by caller * * * @@ -378,8 +366,6 @@ void zbx_get_time(struct tm *tm, long *milliseconds, zbx_timezone_t *tz) /****************************************************************************** * * - * Function: zbx_get_timezone_offset * - * * * Purpose: get time offset from UTC * * * * Parameters: t - [IN] input time to calculate offset with * @@ -421,8 +407,6 @@ long zbx_get_timezone_offset(time_t t, struct tm *tm) /****************************************************************************** * * - * Function: zbx_localtime * - * * * Purpose: get broken-down representation of the time in specified time zone * * * * Parameters: time - [IN] input time * @@ -468,8 +452,6 @@ struct tm *zbx_localtime(const time_t *time, const char *tz) /****************************************************************************** * * - * Function: zbx_utc_time * - * * * Purpose: get UTC time from time from broken down time elements * * * * Parameters: * @@ -509,8 +491,6 @@ int zbx_utc_time(int year, int mon, int mday, int hour, int min, int sec, int *t /****************************************************************************** * * - * Function: zbx_day_in_month * - * * * Purpose: returns number of days in a month * * * * Parameters: * @@ -536,8 +516,6 @@ int zbx_day_in_month(int year, int mon) /****************************************************************************** * * - * Function: zbx_get_duration_ms * - * * * Purpose: get duration in milliseconds since time stamp till current time * * * * Parameters: * @@ -557,8 +535,6 @@ zbx_uint64_t zbx_get_duration_ms(const zbx_timespec_t *ts) /****************************************************************************** * * - * Function: zbx_calloc2 * - * * * Purpose: allocates nmemb * size bytes of memory and fills it with zeros * * * * Return value: returns a pointer to the newly allocated memory * @@ -596,8 +572,6 @@ void *zbx_calloc2(const char *filename, int line, void *old, size_t nmemb, size_ /****************************************************************************** * * - * Function: zbx_malloc2 * - * * * Purpose: allocates size bytes of memory * * * * Return value: returns a pointer to the newly allocated memory * @@ -635,8 +609,6 @@ void *zbx_malloc2(const char *filename, int line, void *old, size_t size) /****************************************************************************** * * - * Function: zbx_realloc2 * - * * * Purpose: changes the size of the memory block pointed to by old * * to size bytes * * * @@ -686,8 +658,6 @@ char *zbx_strdup2(const char *filename, int line, char *old, const char *str) /**************************************************************************************** * * - * Function: zbx_guaranteed_memset * - * * * Purpose: For overwriting sensitive data in memory. * * Similar to memset() but should not be optimized out by a compiler. * * * @@ -709,8 +679,6 @@ void *zbx_guaranteed_memset(void *v, int c, size_t n) /****************************************************************************** * * - * Function: __zbx_zbx_setproctitle * - * * * Purpose: set process title * * * * Author: Eugene Grigorjev * @@ -738,8 +706,6 @@ void zbx_setproctitle(const char *fmt, ...) /****************************************************************************** * * - * Function: check_time_period * - * * * Purpose: check if current time is within given period * * * * Parameters: period - [IN] preprocessed time period * @@ -763,8 +729,6 @@ static int check_time_period(const zbx_time_period_t period, struct tm *tm) /****************************************************************************** * * - * Function: get_current_delay * - * * * Purpose: return delay value that is currently applicable * * * * Parameters: default_delay - [IN] default delay value, can be overridden * @@ -797,8 +761,6 @@ static int get_current_delay(int default_delay, const zbx_flexible_interval_t *f /****************************************************************************** * * - * Function: get_next_delay_interval * - * * * Purpose: return time when next delay settings take effect * * * * Parameters: flex_intervals - [IN] preprocessed flexible intervals * @@ -857,8 +819,6 @@ static int get_next_delay_interval(const zbx_flexible_interval_t *flex_intervals /****************************************************************************** * * - * Function: time_parse * - * * * Purpose: parses time of day * * * * Parameters: time - [OUT] number of seconds since the beginning of * @@ -909,8 +869,6 @@ static int time_parse(int *time, const char *text, int len, int *parsed_len) /****************************************************************************** * * - * Function: time_period_parse * - * * * Purpose: parses time period * * * * Parameters: period - [OUT] time period structure * @@ -978,8 +936,6 @@ static int time_period_parse(zbx_time_period_t *period, const char *text, int le /****************************************************************************** * * - * Function: zbx_check_time_period * - * * * Purpose: validate time period and check if specified time is within it * * * * Parameters: period - [IN] semicolon-separated list of time periods in one * @@ -1026,8 +982,6 @@ int zbx_check_time_period(const char *period, time_t time, const char *tz, int * /****************************************************************************** * * - * Function: flexible_interval_free * - * * * Purpose: frees flexible interval * * * * Parameters: interval - [IN] flexible interval * @@ -1046,8 +1000,6 @@ static void flexible_interval_free(zbx_flexible_interval_t *interval) /****************************************************************************** * * - * Function: flexible_interval_parse * - * * * Purpose: parses flexible interval * * * * Parameters: interval - [IN/OUT] the first interval * @@ -1079,8 +1031,6 @@ static int flexible_interval_parse(zbx_flexible_interval_t *interval, const char /****************************************************************************** * * - * Function: calculate_dayofweek * - * * * Purpose: calculates day of week * * * * Parameters: year - [IN] the year (>1752) * @@ -1102,8 +1052,6 @@ static int calculate_dayofweek(int year, int mon, int mday) /****************************************************************************** * * - * Function: scheduler_filter_free * - * * * Purpose: frees scheduler interval filter * * * * Parameters: filter - [IN] scheduler interval filter * @@ -1122,8 +1070,6 @@ static void scheduler_filter_free(zbx_scheduler_filter_t *filter) /****************************************************************************** * * - * Function: scheduler_interval_free * - * * * Purpose: frees scheduler interval * * * * Parameters: interval - [IN] scheduler interval * @@ -1149,8 +1095,6 @@ static void scheduler_interval_free(zbx_scheduler_interval_t *interval) /****************************************************************************** * * - * Function: scheduler_parse_filter_r * - * * * Purpose: parses text string into scheduler filter * * * * Parameters: filter - [IN/OUT] the first filter * @@ -1273,8 +1217,6 @@ static int scheduler_parse_filter_r(zbx_scheduler_filter_t **filter, const char /****************************************************************************** * * - * Function: scheduler_parse_filter * - * * * Purpose: parses text string into scheduler filter * * * * Parameters: filter - [IN/OUT] the first filter * @@ -1305,8 +1247,6 @@ static int scheduler_parse_filter(zbx_scheduler_filter_t **filter, const char *t /****************************************************************************** * * - * Function: scheduler_interval_parse * - * * * Purpose: parses scheduler interval * * * * Parameters: interval - [IN/OUT] the first interval * @@ -1395,8 +1335,6 @@ static int scheduler_interval_parse(zbx_scheduler_interval_t *interval, const ch /****************************************************************************** * * - * Function: scheduler_get_nearest_filter_value * - * * * Purpose: gets the next nearest value that satisfies the filter chain * * * * Parameters: filter - [IN] the filter chain * @@ -1448,8 +1386,6 @@ static int scheduler_get_nearest_filter_value(const zbx_scheduler_filter_t *filt /****************************************************************************** * * - * Function: scheduler_get_wday_nextcheck * - * * * Purpose: calculates the next day that satisfies the week day filter * * * * Parameters: interval - [IN] the scheduler interval * @@ -1493,8 +1429,6 @@ static int scheduler_get_wday_nextcheck(const zbx_scheduler_interval_t *interval /****************************************************************************** * * - * Function: scheduler_validate_wday_filter * - * * * Purpose: checks if the specified date satisfies week day filter * * * * Parameters: interval - [IN] the scheduler interval * @@ -1537,8 +1471,6 @@ static int scheduler_validate_wday_filter(const zbx_scheduler_interval_t *interv /****************************************************************************** * * - * Function: scheduler_get_day_nextcheck * - * * * Purpose: calculates the next day that satisfies month and week day filters * * * * Parameters: interval - [IN] the scheduler interval * @@ -1585,8 +1517,6 @@ static int scheduler_get_day_nextcheck(const zbx_scheduler_interval_t *interval, /****************************************************************************** * * - * Function: scheduler_get_filter_nextcheck * - * * * Purpose: calculates the time/day that satisfies the specified filter * * * * Parameters: interval - [IN] the scheduler interval * @@ -1652,8 +1582,6 @@ static int scheduler_get_filter_nextcheck(const zbx_scheduler_interval_t *interv /****************************************************************************** * * - * Function: scheduler_apply_day_filter * - * * * Purpose: applies day filter to the specified time/day calculating the next * * scheduled check * * * @@ -1687,8 +1615,6 @@ static void scheduler_apply_day_filter(zbx_scheduler_interval_t *interval, struc /****************************************************************************** * * - * Function: scheduler_apply_hour_filter * - * * * Purpose: applies hour filter to the specified time/day calculating the * * next scheduled check * * * @@ -1719,8 +1645,6 @@ static void scheduler_apply_hour_filter(zbx_scheduler_interval_t *interval, stru /****************************************************************************** * * - * Function: scheduler_apply_minute_filter * - * * * Purpose: applies minute filter to the specified time/day calculating the * * next scheduled check * * * @@ -1748,8 +1672,6 @@ static void scheduler_apply_minute_filter(zbx_scheduler_interval_t *interval, st /****************************************************************************** * * - * Function: scheduler_apply_second_filter * - * * * Purpose: applies second filter to the specified time/day calculating the * * next scheduled check * * * @@ -1771,8 +1693,6 @@ static void scheduler_apply_second_filter(zbx_scheduler_interval_t *interval, st /****************************************************************************** * * - * Function: scheduler_find_dst_change * - * * * Purpose: finds daylight saving change time inside specified time period * * * * Parameters: time_start - [IN] the time period start * @@ -1821,8 +1741,6 @@ static time_t scheduler_find_dst_change(time_t time_start, time_t time_end) /****************************************************************************** * * - * Function: scheduler_tm_inc * - * * * Purpose: increment struct tm value by one second * * * * Parameters: tm - [IN/OUT] the tm structure to increment * @@ -1856,8 +1774,6 @@ static void scheduler_tm_inc(struct tm *tm) /****************************************************************************** * * - * Function: scheduler_get_nextcheck * - * * * Purpose: finds the next timestamp satisfying one of intervals. * * * * Parameters: interval - [IN] the scheduler interval * @@ -1916,8 +1832,6 @@ static time_t scheduler_get_nextcheck(zbx_scheduler_interval_t *interval, time_t /****************************************************************************** * * - * Function: parse_user_macro * - * * * Purpose: parses user macro and finds it's length * * * * Parameters: str - [IN] string to check * @@ -1946,8 +1860,6 @@ static int parse_user_macro(const char *str, int *len) /****************************************************************************** * * - * Function: parse_simple_interval * - * * * Purpose: parses user macro and finds it's length * * * * Parameters: str - [IN] string to check * @@ -1978,8 +1890,6 @@ static int parse_simple_interval(const char *str, int *len, char sep, int *value /****************************************************************************** * * - * Function: zbx_validate_interval * - * * * Purpose: validate update interval, flexible and scheduling intervals * * * * Parameters: str - [IN] string to check * @@ -2099,8 +2009,6 @@ int zbx_validate_interval(const char *str, char **error) /****************************************************************************** * * - * Function: zbx_interval_preproc * - * * * Purpose: parses item and low-level discovery rule update intervals * * * * Parameters: interval_str - [IN] update interval string to parse * @@ -2203,8 +2111,6 @@ fail: /****************************************************************************** * * - * Function: zbx_custom_interval_free * - * * * Purpose: frees custom update intervals * * * * Parameters: custom_intervals - [IN] custom intervals * @@ -2219,8 +2125,6 @@ void zbx_custom_interval_free(zbx_custom_interval_t *custom_intervals) /****************************************************************************** * * - * Function: calculate_item_nextcheck * - * * * Purpose: calculate nextcheck timestamp for item * * * * Parameters: seed - [IN] the seed value applied to delay to * @@ -2322,8 +2226,6 @@ int calculate_item_nextcheck(zbx_uint64_t seed, int item_type, int simple_interv } /****************************************************************************** * * - * Function: calculate_item_nextcheck_unreachable * - * * * Purpose: calculate nextcheck timestamp for item on unreachable host * * * * Parameters: simple_interval - [IN] default delay value, can be overridden * @@ -2374,8 +2276,6 @@ int calculate_item_nextcheck_unreachable(int simple_interval, const zbx_custom_i } /****************************************************************************** * * - * Function: calculate_proxy_nextcheck * - * * * Purpose: calculate nextcheck timestamp for passive proxy * * * * Parameters: hostid - [IN] host identifier from database * @@ -2401,8 +2301,6 @@ time_t calculate_proxy_nextcheck(zbx_uint64_t hostid, unsigned int delay, time_t /****************************************************************************** * * - * Function: is_ip4 * - * * * Purpose: is string IPv4 address * * * * Parameters: ip - string * @@ -2454,8 +2352,6 @@ int is_ip4(const char *ip) /****************************************************************************** * * - * Function: is_ip6 * - * * * Purpose: is string IPv6 address * * * * Parameters: ip - string * @@ -2520,8 +2416,6 @@ int is_ip6(const char *ip) /****************************************************************************** * * - * Function: is_supported_ip * - * * * Purpose: is string IP address of supported version * * * * Parameters: ip - string * @@ -2545,8 +2439,6 @@ int is_supported_ip(const char *ip) /****************************************************************************** * * - * Function: is_ip * - * * * Purpose: is string IP address * * * * Parameters: ip - string * @@ -2564,8 +2456,6 @@ int is_ip(const char *ip) /****************************************************************************** * * - * Function: zbx_validate_hostname * - * * * Purpose: check if string is a valid internet hostname * * * * Parameters: hostname - [IN] hostname string to be checked * @@ -2609,8 +2499,6 @@ int zbx_validate_hostname(const char *hostname) /****************************************************************************** * * - * Function: ip_in_list * - * * * Purpose: check if ip matches range of ip addresses * * * * Parameters: list - [IN] comma-separated list of ip ranges * @@ -2669,8 +2557,6 @@ out: /****************************************************************************** * * - * Function: int_in_list * - * * * Purpose: check if integer matches a list of integers * * * * Parameters: list - integers [i1-i2,i3,i4,i5-i6] (10-25,45,67-699) * @@ -2737,8 +2623,6 @@ int zbx_double_compare(double a, double b) /****************************************************************************** * * - * Function: is_double_suffix * - * * * Purpose: check if the string is double * * * * Parameters: str - string to check * @@ -2788,8 +2672,6 @@ static int is_double_valid_syntax(const char *str) /****************************************************************************** * * - * Function: is_double * - * * * Purpose: validate and optionally convert a string to a number of type * * 'double' * * * @@ -2830,8 +2712,6 @@ int is_double(const char *str, double *value) /****************************************************************************** * * - * Function: is_time_suffix * - * * * Purpose: check if the string is a non-negative integer with or without * * supported time suffix * * * @@ -2932,8 +2812,6 @@ int _wis_uint(const wchar_t *wide_string) /****************************************************************************** * * - * Function: is_uint_n_range * - * * * Purpose: check if the string is unsigned integer within the specified * * range and optionally store it into value parameter * * * @@ -2994,8 +2872,6 @@ int is_uint_n_range(const char *str, size_t n, void *value, size_t size, zbx_uin /****************************************************************************** * * - * Function: is_hex_n_range * - * * * Purpose: check if the string is unsigned hexadecimal integer within the * * specified range and optionally store it into value parameter * * * @@ -3058,8 +2934,6 @@ int is_hex_n_range(const char *str, size_t n, void *value, size_t size, zbx_uint /****************************************************************************** * * - * Function: is_boolean * - * * * Purpose: check if the string is boolean * * * * Parameters: str - string to check * @@ -3100,8 +2974,6 @@ int is_boolean(const char *str, zbx_uint64_t *value) /****************************************************************************** * * - * Function: is_uoct * - * * * Purpose: check if the string is unsigned octal * * * * Parameters: str - string to check * @@ -3138,8 +3010,6 @@ int is_uoct(const char *str) /****************************************************************************** * * - * Function: is_uhex * - * * * Purpose: check if the string is unsigned hexadecimal representation of * * data in the form "0-9, a-f or A-F" * * * @@ -3177,8 +3047,6 @@ int is_uhex(const char *str) /****************************************************************************** * * - * Function: is_hex_string * - * * * Purpose: check if the string is a hexadecimal representation of data in * * the form "F4 CE 46 01 0C 44 8B F4\nA0 2C 29 74 5D 3F 13 49\n" * * * @@ -3217,8 +3085,6 @@ int is_hex_string(const char *str) /****************************************************************************** * * - * Function: get_nearestindex * - * * * Purpose: get nearest index position of sorted elements in array * * * * Parameters: p - pointer to array of elements * @@ -3264,8 +3130,6 @@ int get_nearestindex(const void *p, size_t sz, int num, zbx_uint64_t id) /****************************************************************************** * * - * Function: uint64_array_add * - * * * Purpose: add uint64 value to dynamic array * * * * Author: Alexander Vladishev * @@ -3301,8 +3165,6 @@ int uint64_array_add(zbx_uint64_t **values, int *alloc, int *num, zbx_uint64_t v /****************************************************************************** * * - * Function: uint64_array_exists * - * * * Author: Alexander Vladishev * * * ******************************************************************************/ @@ -3319,8 +3181,6 @@ int uint64_array_exists(const zbx_uint64_t *values, int num, zbx_uint64_t value) /****************************************************************************** * * - * Function: uint64_array_remove * - * * * Purpose: remove uint64 values from array * * * * Author: Alexander Vladishev * @@ -3370,8 +3230,6 @@ zbx_uint64_t suffix2factor(char c) /****************************************************************************** * * - * Function: str2uint64 * - * * * Purpose: convert string to 64bit unsigned integer * * * * Parameters: str - string to convert * @@ -3410,8 +3268,6 @@ int str2uint64(const char *str, const char *suffixes, zbx_uint64_t *value) /****************************************************************************** * * - * Function: str2double * - * * * Purpose: convert string to double * * * * Parameters: str - string to convert * @@ -3435,8 +3291,6 @@ double str2double(const char *str) /****************************************************************************** * * - * Function: is_hostname_char * - * * * Return value: SUCCEED - the char is allowed in the host name * * FAIL - otherwise * * * @@ -3459,8 +3313,6 @@ int is_hostname_char(unsigned char c) /****************************************************************************** * * - * Function: is_key_char * - * * * Return value: SUCCEED - the char is allowed in the item key * * FAIL - otherwise * * * @@ -3483,8 +3335,6 @@ int is_key_char(unsigned char c) /****************************************************************************** * * - * Function: is_function_char * - * * * Return value: SUCCEED - the char is allowed in the trigger function * * FAIL - otherwise * * * @@ -3504,8 +3354,6 @@ int is_function_char(unsigned char c) /****************************************************************************** * * - * Function: is_macro_char * - * * * Return value: SUCCEED - the char is allowed in the macro name * * FAIL - otherwise * * * @@ -3531,8 +3379,6 @@ int is_macro_char(unsigned char c) /****************************************************************************** * * - * Function: is_discovery_macro * - * * * Purpose: checks if the name is a valid discovery macro * * * * Return value: SUCCEED - the name is a valid discovery macro * @@ -3559,8 +3405,6 @@ int is_discovery_macro(const char *name) /****************************************************************************** * * - * Function: zbx_get_function_type * - * * * Purpose: Returns function type based on its name * * * * Return value: Function type. * @@ -3582,8 +3426,6 @@ zbx_function_type_t zbx_get_function_type(const char *func) /****************************************************************************** * * - * Function: make_hostname * - * * * Purpose: replace all not-allowed hostname characters in the string * * * * Parameters: host - the target C-style string * @@ -3608,8 +3450,6 @@ void make_hostname(char *host) /****************************************************************************** * * - * Function: get_interface_type_by_item_type * - * * * Purpose: * * * * Parameters: * @@ -3648,8 +3488,6 @@ unsigned char get_interface_type_by_item_type(unsigned char type) /****************************************************************************** * * - * Function: calculate_sleeptime * - * * * Purpose: calculate sleep time for Zabbix processes * * * * Parameters: nextcheck - [IN] next check or -1 (FAIL) if nothing to do * @@ -3680,8 +3518,6 @@ int calculate_sleeptime(int nextcheck, int max_sleeptime) /****************************************************************************** * * - * Function: parse_serveractive_element * - * * * Purpose: parse a ServerActive element like "IP<:port>" or "[IPv6]<:port>" * * * ******************************************************************************/ @@ -3783,8 +3619,6 @@ int zbx_alarm_timed_out(void) /****************************************************************************** * * - * Function: zbx_create_token * - * * * Purpose: creates semi-unique token based on the seed and current timestamp * * * * Parameters: seed - [IN] the seed * @@ -3827,8 +3661,6 @@ char *zbx_create_token(zbx_uint64_t seed) #if !defined(_WINDOWS) && defined(HAVE_RESOLV_H) /****************************************************************************** * * - * Function: update_resolver_conf * - * * * Purpose: react to "/etc/resolv.conf" update * * * * Comments: it is intended to call this function in the end of each process * @@ -3858,8 +3690,6 @@ static void update_resolver_conf(void) /****************************************************************************** * * - * Function: zbx_update_env * - * * * Purpose: throttling of update "/etc/resolv.conf" and "stdio" to the new * * log file after rotation * * * @@ -3883,8 +3713,6 @@ void zbx_update_env(double time_now) /****************************************************************************** * * - * Function: zbx_dc_get_agent_item_nextcheck * - * * * Purpose: calculate item nextcheck for Zabbix agent type items * * * ******************************************************************************/ @@ -3908,8 +3736,6 @@ int zbx_get_agent_item_nextcheck(zbx_uint64_t itemid, const char *delay, int now /****************************************************************************** * * - * Function: zbx_get_report_nextcheck * - * * * Purpose: calculate report nextcheck * * * * Parameters: now - [IN] the current timestamp * @@ -3988,8 +3814,6 @@ void zbx_free_tag(zbx_tag_t *tag) /****************************************************************************** * * - * Function: zbx_md5buf2str * - * * * Purpose: get a textual representation of md5 sum * * * * Parameters: * @@ -4016,8 +3840,6 @@ void zbx_md5buf2str(const md5_byte_t *md5, char *str) /****************************************************************************** * * - * Function: zbx_hex2bin * - * * * Purpose: * * convert ASCII hex digit string to a binary representation (byte * * string) * diff --git a/src/libs/zbxcommon/setproctitle.c b/src/libs/zbxcommon/setproctitle.c index 71b969b45f7..9be327341ab 100644 --- a/src/libs/zbxcommon/setproctitle.c +++ b/src/libs/zbxcommon/setproctitle.c @@ -50,8 +50,6 @@ static size_t ps_buf_size = PS_BUF_SIZE, ps_buf_size_msg = PS_BUF_SIZE; /****************************************************************************** * * - * Function: setproctitle_save_env * - * * * Purpose: prepare for changing process commandline to display status * * messages with "ps" command on platforms which do not support * * setproctitle(). Depending on platform: * @@ -180,8 +178,6 @@ char **setproctitle_save_env(int argc, char **argv) /****************************************************************************** * * - * Function: setproctitle_set_status * - * * * Purpose: set a process command line displayed by "ps" command. * * * * Comments: call this function when a process starts some interesting task. * @@ -244,8 +240,6 @@ void setproctitle_set_status(const char *status) /****************************************************************************** * * - * Function: setproctitle_free_env * - * * * Purpose: release memory allocated in setproctitle_save_env(). * * * * Comments: call this function when process terminates and argv[] and * diff --git a/src/libs/zbxcommon/str.c b/src/libs/zbxcommon/str.c index c79981d36f5..63cdc4fb3f1 100644 --- a/src/libs/zbxcommon/str.c +++ b/src/libs/zbxcommon/str.c @@ -40,8 +40,6 @@ static const char help_message_footer[] = /****************************************************************************** * * - * Function: version * - * * * Purpose: print version and compilation time of application on stdout * * by application request with parameter '-V' * * * @@ -64,8 +62,6 @@ void version(void) /****************************************************************************** * * - * Function: usage * - * * * Purpose: print application parameters on stdout with layout suitable for * * 80-column terminal * * * @@ -122,8 +118,6 @@ void usage(void) /****************************************************************************** * * - * Function: help * - * * * Purpose: print help of application parameters on stdout by application * * request with parameter '-h' * * * @@ -149,8 +143,6 @@ void help(void) /****************************************************************************** * * - * Function: zbx_error * - * * * Purpose: Print error text to the stderr * * * * Parameters: fmt - format of message * @@ -176,8 +168,6 @@ void zbx_error(const char *fmt, ...) /****************************************************************************** * * - * Function: zbx_snprintf * - * * * Purpose: Secure version of snprintf function. * * Add zero character at the end of string. * * * @@ -204,8 +194,6 @@ size_t zbx_snprintf(char *str, size_t count, const char *fmt, ...) /****************************************************************************** * * - * Function: zbx_snprintf_alloc * - * * * Purpose: Secure version of snprintf function. * * Add zero character at the end of string. * * Reallocs memory if not enough. * @@ -254,8 +242,6 @@ retry: /****************************************************************************** * * - * Function: zbx_vsnprintf * - * * * Purpose: Secure version of vsnprintf function. * * Add zero character at the end of string. * * * @@ -287,8 +273,6 @@ size_t zbx_vsnprintf(char *str, size_t count, const char *fmt, va_list args) /****************************************************************************** * * - * Function: zbx_strncpy_alloc, zbx_strcpy_alloc, zbx_chrcpy_alloc * - * * * Purpose: If there is no '\0' byte among the first n bytes of src, * * then all n bytes will be placed into the dest buffer. * * In other case only strlen() bytes will be placed there. * @@ -462,8 +446,6 @@ char *string_replace(const char *str, const char *sub_str1, const char *sub_str2 /****************************************************************************** * * - * Function: del_zeros * - * * * Purpose: delete all right '0' and '.' for the string * * * * Parameters: s - string to trim '0' * @@ -529,8 +511,6 @@ void del_zeros(char *s) /****************************************************************************** * * - * Function: zbx_rtrim * - * * * Purpose: Strip characters from the end of a string * * * * Parameters: str - string for processing * @@ -560,8 +540,6 @@ int zbx_rtrim(char *str, const char *charlist) /****************************************************************************** * * - * Function: zbx_ltrim * - * * * Purpose: Strip characters from the beginning of a string * * * * Parameters: str - string for processing * @@ -593,8 +571,6 @@ void zbx_ltrim(char *str, const char *charlist) /****************************************************************************** * * - * Function: zbx_lrtrim * - * * * Purpose: Removes leading and trailing characters from the specified * * character string * * * @@ -610,8 +586,6 @@ void zbx_lrtrim(char *str, const char *charlist) /****************************************************************************** * * - * Function: zbx_remove_chars * - * * * Purpose: Remove characters 'charlist' from the whole string * * * * Parameters: str - string for processing * @@ -640,8 +614,6 @@ void zbx_remove_chars(char *str, const char *charlist) /****************************************************************************** * * - * Function: zbx_str_printable_dyn * - * * * Purpose: converts text to printable string by converting special * * characters to escape sequences * * * @@ -701,8 +673,6 @@ char *zbx_str_printable_dyn(const char *text) /****************************************************************************** * * - * Function: zbx_strlcpy * - * * * Purpose: Copy src to string dst of size siz. At most siz - 1 characters * * will be copied. Always null terminates (unless siz == 0). * * * @@ -726,8 +696,6 @@ size_t zbx_strlcpy(char *dst, const char *src, size_t siz) /****************************************************************************** * * - * Function: zbx_strlcat * - * * * Purpose: Appends src to string dst of size siz (unlike strncat, size is * * the full size of dst, not space left). At most siz - 1 characters * * will be copied. Always null terminates (unless * @@ -747,8 +715,6 @@ void zbx_strlcat(char *dst, const char *src, size_t siz) /****************************************************************************** * * - * Function: zbx_strlcpy_utf8 * - * * * Purpose: copies utf-8 string + terminating zero character into specified * * buffer * * * @@ -771,8 +737,6 @@ size_t zbx_strlcpy_utf8(char *dst, const char *src, size_t size) /****************************************************************************** * * - * Function: zbx_dvsprintf * - * * * Purpose: dynamical formatted output conversion * * * * Return value: formatted string * @@ -816,8 +780,6 @@ char *zbx_dvsprintf(char *dest, const char *f, va_list args) /****************************************************************************** * * - * Function: zbx_dsprintf * - * * * Purpose: dynamical formatted output conversion * * * * Return value: formatted string * @@ -843,8 +805,6 @@ char *zbx_dsprintf(char *dest, const char *f, ...) /****************************************************************************** * * - * Function: zbx_strdcat * - * * * Purpose: dynamical cating of strings * * * * Return value: new pointer of string * @@ -877,8 +837,6 @@ char *zbx_strdcat(char *dest, const char *src) /****************************************************************************** * * - * Function: zbx_strdcatf * - * * * Purpose: dynamical cating of formatted strings * * * * Return value: new pointer of string * @@ -906,8 +864,6 @@ char *zbx_strdcatf(char *dest, const char *f, ...) /****************************************************************************** * * - * Function: zbx_check_hostname * - * * * Purpose: check a byte stream for a valid hostname * * * * Parameters: hostname - pointer to the first char of hostname * @@ -955,8 +911,6 @@ int zbx_check_hostname(const char *hostname, char **error) /****************************************************************************** * * - * Function: parse_key * - * * * Purpose: advances pointer to first invalid character in string * * ensuring that everything before it is a valid key * * * @@ -1077,8 +1031,6 @@ succeed: /****************************************************************************** * * - * Function: parse_host_key * - * * * Purpose: return hostname and key * * <hostname:>key * * * @@ -1124,8 +1076,6 @@ int parse_host_key(char *exp, char **host, char **key) /****************************************************************************** * * - * Function: zbx_get_escape_string_len * - * * * Purpose: calculate the required size for the escaped string * * * * Parameters: src - [IN] null terminated source string * @@ -1151,8 +1101,6 @@ size_t zbx_get_escape_string_len(const char *src, const char *charlist) /****************************************************************************** * * - * Function: zbx_dyn_escape_string * - * * * Purpose: escape characters in the source string * * * * Parameters: src - [IN] null terminated source string * @@ -1187,8 +1135,6 @@ char *zbx_dyn_escape_string(const char *src, const char *charlist) /****************************************************************************** * * - * Function: zbx_escape_string * - * * * Purpose: escape characters in the source string to fixed output buffer * * * * Parameters: dst - [OUT] the output buffer * @@ -1333,8 +1279,6 @@ int cmp_key_id(const char *key_1, const char *key_2) /****************************************************************************** * * - * Function: get_process_type_string * - * * * Purpose: Returns process name * * * * Parameters: proc_type - [IN] process type; ZBX_PROCESS_TYPE_* * @@ -2132,8 +2076,6 @@ char *zbx_strshift_utf8(char *text, size_t num) /****************************************************************************** * * - * Function: zbx_utf8_char_len * - * * * Purpose: Returns the size (in bytes) of an UTF-8 encoded character or 0 * * if the character is not a valid UTF-8. * * * @@ -2158,8 +2100,6 @@ size_t zbx_utf8_char_len(const char *text) /****************************************************************************** * * - * Function: zbx_strlen_utf8_nchars * - * * * Purpose: calculates number of bytes in utf8 text limited by utf8_maxlen * * characters * * * @@ -2186,8 +2126,6 @@ size_t zbx_strlen_utf8_nchars(const char *text, size_t utf8_maxlen) /****************************************************************************** * * - * Function: zbx_strlen_utf8_nbytes * - * * * Purpose: calculates number of bytes in utf8 text limited by maxlen bytes * * * ******************************************************************************/ @@ -2211,8 +2149,6 @@ size_t zbx_strlen_utf8_nbytes(const char *text, size_t maxlen) /****************************************************************************** * * - * Function: zbx_charcount_utf8_nbytes * - * * * Purpose: calculates number of chars in utf8 text limited by maxlen bytes * * * ******************************************************************************/ @@ -2235,8 +2171,6 @@ size_t zbx_charcount_utf8_nbytes(const char *text, size_t maxlen) /****************************************************************************** * * - * Function: zbx_is_utf8 * - * * * Purpose: check UTF-8 sequences * * * * Parameters: text - [IN] pointer to the string * @@ -2330,8 +2264,6 @@ int zbx_is_utf8(const char *text) /****************************************************************************** * * - * Function: zbx_replace_invalid_utf8 * - * * * Purpose: replace invalid UTF-8 sequences of bytes with '?' character * * * * Parameters: text - [IN/OUT] pointer to the first char * @@ -2438,8 +2370,6 @@ void zbx_replace_invalid_utf8(char *text) /****************************************************************************** * * - * Function: utf8_decode_3byte_sequence * - * * * Purpose: decodes 3-byte utf-8 sequence * * * * Parameters: ptr - [IN] pointer to the 3 byte sequence * @@ -2465,8 +2395,6 @@ static int utf8_decode_3byte_sequence(const char *ptr, zbx_uint32_t *out) /****************************************************************************** * * - * Function: zbx_cesu8_to_utf8 * - * * * Purpose: convert cesu8 encoded string to utf8 * * * * Parameters: cesu8 - [IN] pointer to the first char of NULL terminated CESU8* @@ -2574,8 +2502,6 @@ int is_ascii_string(const char *str) /****************************************************************************** * * - * Function: str_linefeed * - * * * Purpose: wrap long string at specified position with linefeeds * * * * Parameters: src - input string * @@ -2644,8 +2570,6 @@ char *str_linefeed(const char *src, size_t maxline, const char *delim) /****************************************************************************** * * - * Function: zbx_strarr_init * - * * * Purpose: initialize dynamic string array * * * * Parameters: arr - a pointer to array of strings * @@ -2665,8 +2589,6 @@ void zbx_strarr_init(char ***arr) /****************************************************************************** * * - * Function: zbx_strarr_add * - * * * Purpose: add a string to dynamic string array * * * * Parameters: arr - a pointer to array of strings * @@ -2696,8 +2618,6 @@ void zbx_strarr_add(char ***arr, const char *entry) /****************************************************************************** * * - * Function: zbx_strarr_free * - * * * Purpose: free dynamic string array memory * * * * Parameters: arr - array of strings * @@ -2718,8 +2638,6 @@ void zbx_strarr_free(char ***arr) /****************************************************************************** * * - * Function: zbx_replace_string * - * * * Purpose: replace data block with 'value' * * * * Parameters: data - [IN/OUT] pointer to the string * @@ -2759,8 +2677,6 @@ void zbx_replace_string(char **data, size_t l, size_t *r, const char *value) /****************************************************************************** * * - * Function: zbx_trim_str_list * - * * * Purpose: remove whitespace surrounding a string list item delimiters * * * * Parameters: list - the list (a string containing items separated by * @@ -2803,8 +2719,6 @@ void zbx_trim_str_list(char *list, char delimiter) /****************************************************************************** * * - * Function: zbx_strcmp_null * - * * * Purpose: * * compares two strings where any of them can be a NULL pointer * * * @@ -2828,8 +2742,6 @@ int zbx_strcmp_null(const char *s1, const char *s2) /****************************************************************************** * * - * Function: zbx_user_macro_parse * - * * * Purpose: * * parses user macro and finds its end position and context location * * * @@ -2942,8 +2854,6 @@ int zbx_user_macro_parse(const char *macro, int *macro_r, int *context_l, int *c /****************************************************************************** * * - * Function: zbx_user_macro_parse_dyn * - * * * Purpose: * * parses user macro {$MACRO:<context>} into {$MACRO} and <context> * * strings * @@ -3009,8 +2919,6 @@ int zbx_user_macro_parse_dyn(const char *macro, char **name, char **context, int /****************************************************************************** * * - * Function: zbx_user_macro_unquote_context_dyn * - * * * Purpose: * * extracts the macro context unquoting if necessary * * * @@ -3060,8 +2968,6 @@ char *zbx_user_macro_unquote_context_dyn(const char *context, int len) /****************************************************************************** * * - * Function: zbx_user_macro_quote_context_dyn * - * * * Purpose: * * quotes user macro context if necessary * * * @@ -3123,8 +3029,6 @@ char *zbx_user_macro_quote_context_dyn(const char *context, int force_quote, cha /****************************************************************************** * * - * Function: zbx_dyn_escape_shell_single_quote * - * * * Purpose: escape single quote in shell command arguments * * * * Parameters: arg - [IN] the argument to escape * @@ -3167,8 +3071,6 @@ char *zbx_dyn_escape_shell_single_quote(const char *arg) /****************************************************************************** * * - * Function: function_parse_name * - * * * Purpose: parses function name * * * * Parameters: expr - [IN] the function expression: func(p1, p2,...) * @@ -3193,8 +3095,6 @@ static int function_parse_name(const char *expr, size_t *length) /****************************************************************************** * * - * Function: zbx_function_param_parse * - * * * Purpose: parses function parameter * * * * Parameters: expr - [IN] pre-validated function parameter list * @@ -3240,8 +3140,6 @@ void zbx_function_param_parse(const char *expr, size_t *param_pos, size_t *lengt /****************************************************************************** * * - * Function: zbx_function_param_unquote_dyn * - * * * Purpose: unquotes function parameter * * * * Parameters: param - [IN] the parameter to unquote * @@ -3287,8 +3185,6 @@ char *zbx_function_param_unquote_dyn(const char *param, size_t len, int *quoted) /****************************************************************************** * * - * Function: zbx_function_param_quote * - * * * Purpose: quotes function parameter * * * * Parameters: param - [IN/OUT] function parameter * @@ -3336,8 +3232,6 @@ int zbx_function_param_quote(char **param, int forced) /****************************************************************************** * * - * Function: zbx_function_get_param_dyn * - * * * Purpose: return parameter by index (Nparam) from parameter list (params) * * * * Parameters: * @@ -3374,8 +3268,6 @@ char *zbx_function_get_param_dyn(const char *params, int Nparam) /****************************************************************************** * * - * Function: function_validate_parameters * - * * * Purpose: validate parameters and give position of terminator if found and * * not quoted * * * @@ -3468,8 +3360,6 @@ static int function_validate_parameters(const char *expr, char terminator, size_ /****************************************************************************** * * - * Function: function_match_parenthesis * - * * * Purpose: given the position of opening function parenthesis find the * * position of a closing one * * * @@ -3499,8 +3389,6 @@ static int function_match_parenthesis(const char *expr, size_t par_l, size_t *pa /****************************************************************************** * * - * Function: zbx_function_validate_parameters * - * * * Purpose: validate parameters that end with '\0' * * * * Parameters: expr - [IN] string to parse that contains parameters * @@ -3521,8 +3409,6 @@ int zbx_function_validate_parameters(const char *expr, size_t *length) /****************************************************************************** * * - * Function: zbx_function_validate * - * * * Purpose: check whether expression starts with a valid function * * * * Parameters: expr - [IN] string to parse * @@ -3566,8 +3452,6 @@ static int zbx_function_validate(const char *expr, size_t *par_l, size_t *par_r, /****************************************************************************** * * - * Function: zbx_strcmp_natural * - * * * Purpose: performs natural comparison of two strings * * * * Parameters: s1 - [IN] the first string * @@ -3612,8 +3496,6 @@ int zbx_strcmp_natural(const char *s1, const char *s2) /****************************************************************************** * * - * Function: token_parse_user_macro * - * * * Purpose: parses user macro token * * * * Parameters: expression - [IN] the expression * @@ -3673,8 +3555,6 @@ static int token_parse_user_macro(const char *expression, const char *macro, zbx /****************************************************************************** * * - * Function: token_parse_lld_macro * - * * * Purpose: parses lld macro token * * * * Parameters: expression - [IN] the expression * @@ -3726,8 +3606,6 @@ static int token_parse_lld_macro(const char *expression, const char *macro, zbx_ /****************************************************************************** * * - * Function: token_parse_expression_macro * - * * * Purpose: parses expression macro token * * * * Parameters: expression - [IN] the expression * @@ -3827,8 +3705,6 @@ static int token_parse_expression_macro(const char *expression, const char *macr /****************************************************************************** * * - * Function: token_parse_objectid * - * * * Purpose: parses object id token * * * * Parameters: expression - [IN] the expression * @@ -3880,8 +3756,6 @@ static int token_parse_objectid(const char *expression, const char *macro, zbx_t /****************************************************************************** * * - * Function: token_parse_macro_segment * - * * * Purpose: parses macro name segment * * * * Parameters: expression - [IN] the expression * @@ -3955,8 +3829,6 @@ static int token_parse_macro_segment(const char *expression, const char *segment /****************************************************************************** * * - * Function: token_parse_macro_name * - * * * Purpose: parses macro name * * * * Parameters: expression - [IN] the expression * @@ -3996,8 +3868,6 @@ static int token_parse_macro_name(const char *expression, const char *ptr, zbx_s /****************************************************************************** * * - * Function: token_parse_macro * - * * * Purpose: parses normal macro token * * * * Parameters: expression - [IN] the expression * @@ -4037,8 +3907,6 @@ static int token_parse_macro(const char *expression, const char *macro, zbx_toke /****************************************************************************** * * - * Function: token_parse_function * - * * * Purpose: parses function inside token * * * * Parameters: expression - [IN] the expression * @@ -4069,8 +3937,6 @@ static int token_parse_function(const char *expression, const char *func, /****************************************************************************** * * - * Function: token_parse_func_macro * - * * * Purpose: parses function macro token * * * * Parameters: expression - [IN] the expression * @@ -4135,8 +4001,6 @@ static int token_parse_func_macro(const char *expression, const char *macro, con /****************************************************************************** * * - * Function: token_parse_simple_macro_key * - * * * Purpose: parses simple macro token with given key * * * * Parameters: expression - [IN] the expression * @@ -4224,8 +4088,6 @@ static int token_parse_simple_macro_key(const char *expression, const char *macr /****************************************************************************** * * - * Function: token_parse_simple_macro * - * * * Purpose: parses simple macro token * * * * Parameters: expression - [IN] the expression * @@ -4269,8 +4131,6 @@ static int token_parse_simple_macro(const char *expression, const char *macro, z /****************************************************************************** * * - * Function: token_parse_nested_macro * - * * * Purpose: parses token with nested macros * * * * Parameters: expression - [IN] the expression * @@ -4366,8 +4226,6 @@ static int token_parse_nested_macro(const char *expression, const char *macro, i /****************************************************************************** * * - * Function: zbx_token_find * - * * * Purpose: finds token {} inside expression starting at specified position * * also searches for reference if requested * * * @@ -4500,8 +4358,6 @@ int zbx_token_find(const char *expression, int pos, zbx_token_t *token, zbx_toke /****************************************************************************** * * - * Function: zbx_token_parse_user_macro * - * * * Purpose: public wrapper for token_parse_user_macro() function * * * ******************************************************************************/ @@ -4512,8 +4368,6 @@ int zbx_token_parse_user_macro(const char *expression, const char *macro, zbx_to /****************************************************************************** * * - * Function: zbx_token_parse_macro * - * * * Purpose: public wrapper for token_parse_macro() function * * * ******************************************************************************/ @@ -4524,8 +4378,6 @@ int zbx_token_parse_macro(const char *expression, const char *macro, zbx_token_t /****************************************************************************** * * - * Function: zbx_token_parse_objectid * - * * * Purpose: public wrapper for token_parse_objectid() function * * * ******************************************************************************/ @@ -4536,8 +4388,6 @@ int zbx_token_parse_objectid(const char *expression, const char *macro, zbx_toke /****************************************************************************** * * - * Function: zbx_token_parse_lld_macro * - * * * Purpose: public wrapper for token_parse_lld_macro() function * * * ******************************************************************************/ @@ -4548,8 +4398,6 @@ int zbx_token_parse_lld_macro(const char *expression, const char *macro, zbx_tok /****************************************************************************** * * - * Function: zbx_token_parse_nested_macro * - * * * Purpose: public wrapper for token_parse_nested_macro() function * * * ******************************************************************************/ @@ -4561,8 +4409,6 @@ int zbx_token_parse_nested_macro(const char *expression, const char *macro, int /****************************************************************************** * * - * Function: zbx_no_function * - * * * Purpose: count calculated item (prototype) formula characters that can be * * skipped without the risk of missing a function * * * @@ -4628,8 +4474,6 @@ static size_t zbx_no_function(const char *expr) /****************************************************************************** * * - * Function: zbx_function_find * - * * * Purpose: find the location of the next function and its parameters in * * calculated item (prototype) formula * * * @@ -4678,8 +4522,6 @@ int zbx_function_find(const char *expr, size_t *func_pos, size_t *par_l, size_t /****************************************************************************** * * - * Function: zbx_strmatch_condition * - * * * Purpose: check if pattern matches the specified value * * * * Parameters: value - [IN] the value to match * @@ -4718,8 +4560,6 @@ int zbx_strmatch_condition(const char *value, const char *pattern, unsigned char /****************************************************************************** * * - * Function: zbx_number_parse * - * * * Purpose: parse a number like "12.345" * * * * Parameters: number - [IN] start of number * @@ -4780,8 +4620,6 @@ int zbx_number_parse(const char *number, int *len) /****************************************************************************** * * - * Function: zbx_suffixed_number_parse * - * * * Purpose: parse a suffixed number like "12.345K" * * * * Parameters: number - [IN] start of number * @@ -4808,8 +4646,6 @@ int zbx_suffixed_number_parse(const char *number, int *len) /****************************************************************************** * * - * Function: num_param * - * * * Purpose: find number of parameters in parameter list * * * * Parameters: * @@ -4908,8 +4744,6 @@ int num_param(const char *p) /****************************************************************************** * * - * Function: get_param * - * * * Purpose: return parameter by index (num) from parameter list (param) * * * * Parameters: * @@ -5079,8 +4913,6 @@ int get_param(const char *p, int num, char *buf, size_t max_len, zbx_request_par /****************************************************************************** * * - * Function: get_param_len * - * * * Purpose: return length of the parameter by index (num) * * from parameter list (param) * * * @@ -5211,8 +5043,6 @@ static int get_param_len(const char *p, int num, size_t *sz) /****************************************************************************** * * - * Function: get_param_dyn * - * * * Purpose: return parameter by index (num) from parameter list (param) * * * * Parameters: * @@ -5248,8 +5078,6 @@ char *get_param_dyn(const char *p, int num, zbx_request_parameter_type_t *type) /****************************************************************************** * * - * Function: replace_key_param * - * * * Purpose: replaces an item key, SNMP OID or their parameters when callback * * function returns a new string * * * @@ -5280,8 +5108,6 @@ static int replace_key_param(char **data, int key_type, size_t l, size_t *r, int /****************************************************************************** * * - * Function: replace_key_params_dyn * - * * * Purpose: replaces an item key, SNMP OID or their parameters by using * * callback function * * * @@ -5445,8 +5271,6 @@ clean: /****************************************************************************** * * - * Function: remove_param * - * * * Purpose: remove parameter by index (num) from parameter list (param) * * * * Parameters: * @@ -5494,8 +5318,6 @@ void remove_param(char *param, int num) /****************************************************************************** * * - * Function: str_n_in_list * - * * * Purpose: check if string is contained in a list of delimited strings * * * * Parameters: list - [IN] strings a,b,ccc,ddd * @@ -5538,8 +5360,6 @@ int str_n_in_list(const char *list, const char *value, size_t len, char delimite /****************************************************************************** * * - * Function: str_in_list * - * * * Purpose: check if string is contained in a list of delimited strings * * * * Parameters: list - strings a,b,ccc,ddd * @@ -5558,8 +5378,6 @@ int str_in_list(const char *list, const char *value, char delimiter) /****************************************************************************** * * - * Function: get_key_param * - * * * Purpose: return parameter by index (num) from parameter list (param) * * to be used for keys: key[param1,param2] * * * @@ -5598,8 +5416,6 @@ int get_key_param(char *param, int num, char *buf, size_t max_len) /****************************************************************************** * * - * Function: num_key_param * - * * * Purpose: calculate count of parameters from parameter list (param) * * to be used for keys: key[param1,param2] * * * @@ -5636,8 +5452,6 @@ int num_key_param(char *param) /****************************************************************************** * * - * Function: zbx_replace_mem_dyn * - * * * Purpose: to replace memory block and allocate more memory if needed * * * * Parameters: data - [IN/OUT] allocated memory * @@ -5681,8 +5495,6 @@ int zbx_replace_mem_dyn(char **data, size_t *data_alloc, size_t *data_len, size_ /****************************************************************************** * * - * Function: zbx_strsplit * - * * * Purpose: splits string * * * * Parameters: src - [IN] source string * @@ -5720,8 +5532,6 @@ void zbx_strsplit(const char *src, char delimiter, char **left, char **right) /****************************************************************************** * * - * Function: zbx_trim_number * - * * * Purpose: Removes spaces from both ends of the string, then unquotes it if * * double quotation mark is present on both ends of the string. If * * strip_plus_sign is non-zero, then removes single "+" sign from * @@ -5791,8 +5601,6 @@ static void zbx_trim_number(char *str, int strip_plus_sign) /****************************************************************************** * * - * Function: zbx_trim_integer * - * * * Purpose: Removes spaces from both ends of the string, then unquotes it if * * double quotation mark is present on both ends of the string, then * * removes single "+" sign from the beginning of the trimmed and * @@ -5813,8 +5621,6 @@ void zbx_trim_integer(char *str) /****************************************************************************** * * - * Function: zbx_trim_float * - * * * Purpose: Removes spaces from both ends of the string, then unquotes it if * * double quotation mark is present on both ends of the string. * * * @@ -5833,8 +5639,6 @@ void zbx_trim_float(char *str) /****************************************************************************** * * - * Function: zbx_get_component_version * - * * * Purpose: extracts protocol version from value * * * * Parameters: * @@ -5861,8 +5665,6 @@ int zbx_get_component_version(char *value) /****************************************************************************** * * - * Function: zbx_str_extract * - * * * Purpose: extracts value from a string, unquoting if necessary * * * * Parameters: * @@ -5931,8 +5733,6 @@ fail: /****************************************************************************** * * - * Function: zbx_truncate_itemkey * - * * * Purpose: check the item key characters length and, if the length exceeds * * max allowable characters length, truncate the item key, while * * maintaining the right square bracket * @@ -6027,8 +5827,6 @@ const char *zbx_truncate_itemkey(const char *key, const size_t char_max, char *b /****************************************************************************** * * - * Function: zbx_truncate_value * - * * * Purpose: check the value characters length and, if the length exceeds * * max allowable characters length, truncate the value * * * @@ -6064,8 +5862,6 @@ const char *zbx_truncate_value(const char *val, const size_t char_max, char *buf /****************************************************************************** * * - * Function: zbx_print_double * - * * * Purpose: converts double value to string and truncates insignificant * * precision * * * @@ -6088,8 +5884,6 @@ const char *zbx_print_double(char *buffer, size_t size, double val) /****************************************************************************** * * - * Function: zbx_substr_unquote * - * * * Purpose: unquotes valid substring at the specified location * * * * Parameters: src - [IN] the source string * @@ -6145,8 +5939,6 @@ char *zbx_substr_unquote(const char *src, size_t left, size_t right) /****************************************************************************** * * - * Function: zbx_substr * - * * * Purpose: extracts substring at the specified location * * * * Parameters: src - [IN] the source string * @@ -6169,8 +5961,6 @@ char *zbx_substr(const char *src, size_t left, size_t right) /****************************************************************************** * * - * Function: utf8_chr_next * - * * * Purpose: return pointer to the next utf-8 character * * * * Parameters: str - [IN] the input string * @@ -6190,8 +5980,6 @@ static const char *utf8_chr_next(const char *str) /****************************************************************************** * * - * Function: utf8_chr_prev * - * * * Purpose: return pointer to the previous utf-8 character * * * * Parameters: str - [IN] the input string * @@ -6214,8 +6002,6 @@ static char *utf8_chr_prev(char *str, const char *start) /****************************************************************************** * * - * Function: strchr_utf8 * - * * * Purpose: checks if string contains utf-8 character * * * * Parameters: seq - [IN] the input string * @@ -6254,8 +6040,6 @@ static int strchr_utf8(const char *seq, const char *c) /****************************************************************************** * * - * Function: zbx_ltrim_utf8 * - * * * Purpose: trim the specified utf-8 characters from the left side of input * * string * * * @@ -6286,8 +6070,6 @@ void zbx_ltrim_utf8(char *str, const char *charlist) /****************************************************************************** * * - * Function: zbx_rtrim_utf8 * - * * * Purpose: trim the specified utf-8 characters from the right side of input * * string * * * diff --git a/src/libs/zbxcommon/time.c b/src/libs/zbxcommon/time.c index c996533adef..89e1d6f6d04 100644 --- a/src/libs/zbxcommon/time.c +++ b/src/libs/zbxcommon/time.c @@ -50,8 +50,6 @@ zbx_time_unit_t zbx_tm_str_to_unit(const char *text) /****************************************************************************** * * - * Function: zbx_tm_parse_period * - * * * Purpose: parse time period in format <multiplier><time unit> * * * * Parameters: period - [IN] the time period * @@ -90,8 +88,6 @@ int zbx_tm_parse_period(const char *period, size_t *len, int *multiplier, zbx_ti /****************************************************************************** * * - * Function: tm_add_seconds * - * * * Purpose: add seconds to the time and adjust result by dst * * * * Parameter: tm - [IN/OUT] the time structure * @@ -125,8 +121,6 @@ static void tm_add_seconds(struct tm *tm, int seconds) /****************************************************************************** * * - * Function: tm_add * - * * * Purpose: add time duration without adjusting DST clocks * * * * Parameter: tm - [IN/OUT] the time structure * @@ -181,8 +175,6 @@ static void tm_add(struct tm *tm, int multiplier, zbx_time_unit_t base) /****************************************************************************** * * - * Function: zbx_tm_add * - * * * Purpose: add time duration * * * * Parameter: tm - [IN/OUT] the time structure * @@ -210,8 +202,6 @@ void zbx_tm_add(struct tm *tm, int multiplier, zbx_time_unit_t base) /****************************************************************************** * * - * Function: neg_to_pos_wrap * - * * * Purpose: convert negative number to positive by wrapping around the base * * * * Parameter: value - [IN/OUT] the value to convert * @@ -227,8 +217,6 @@ static void neg_to_pos_wrap(int *value, int base) /****************************************************************************** * * - * Function: tm_sub * - * * * Purpose: subtracts time duration without adjusting DST clocks * * * * Parameter: tm - [IN/OUT] the time structure * @@ -294,8 +282,6 @@ static void tm_sub(struct tm *tm, int multiplier, zbx_time_unit_t base) /****************************************************************************** * * - * Function: zbx_tm_sub * - * * * Purpose: subtracts time duration * * * * Parameter: tm - [IN/OUT] the time structure * @@ -337,8 +323,6 @@ void zbx_tm_sub(struct tm *tm, int multiplier, zbx_time_unit_t base) /****************************************************************************** * * - * Function: zbx_tm_round_up * - * * * Purpose: rounds time by the specified unit upwards * * * * Parameter: tm - [IN/OUT] the time structure * @@ -404,8 +388,6 @@ void zbx_tm_round_up(struct tm *tm, zbx_time_unit_t base) /****************************************************************************** * * - * Function: zbx_tm_round_down * - * * * Purpose: rounds time by the specified unit downwards * * * * Parameter: tm - [IN/OUT] the time structure * @@ -476,8 +458,6 @@ static int get_week_days(int yday, int wday) /****************************************************************************** * * - * Function: zbx_get_week_number * - * * * Purpose: get ISO 8061 week number (1-53) * * * ******************************************************************************/ diff --git a/src/libs/zbxcommon/variant.c b/src/libs/zbxcommon/variant.c index 18a35eb3948..bee95769493 100644 --- a/src/libs/zbxcommon/variant.c +++ b/src/libs/zbxcommon/variant.c @@ -135,8 +135,6 @@ void zbx_variant_set_dbl_vector(zbx_variant_t *value, zbx_vector_dbl_t *dbl_vect /****************************************************************************** * * - * Function: zbx_variant_copy * - * * * Purpose: copy variant contents from source to value * * * * Comments: String and binary data are cloned, which is different from * @@ -412,8 +410,6 @@ int zbx_validate_value_dbl(double value, int dbl_precision) /****************************************************************************** * * - * Function: variant_compare_empty * - * * * Purpose: compares two variant values when at least one is empty (having * * type of ZBX_VARIANT_NONE) * * * @@ -433,8 +429,6 @@ static int variant_compare_empty(const zbx_variant_t *value1, const zbx_variant_ /****************************************************************************** * * - * Function: variant_compare_bin * - * * * Purpose: compare two variant values when at least one contains binary data * * * ******************************************************************************/ @@ -458,8 +452,6 @@ static int variant_compare_bin(const zbx_variant_t *value1, const zbx_variant_t /****************************************************************************** * * - * Function: variant_compare_error * - * * * Purpose: compare two variant values when at least one contains error * * * ******************************************************************************/ @@ -478,8 +470,6 @@ static int variant_compare_error(const zbx_variant_t *value1, const zbx_variant_ /****************************************************************************** * * - * Function: variant_compare_dbl_vector * - * * * Purpose: compare two variant values when at least one contains error * * * ******************************************************************************/ @@ -506,8 +496,6 @@ static int variant_compare_dbl_vector(const zbx_variant_t *value1, const zbx_var } /****************************************************************************** * * - * Function: variant_compare_str * - * * * Purpose: compare two variant values when at least one is string * * * ******************************************************************************/ @@ -521,8 +509,6 @@ static int variant_compare_str(const zbx_variant_t *value1, const zbx_variant_t /****************************************************************************** * * - * Function: variant_compare_dbl * - * * * Purpose: compare two variant values when at least one is double and the * * other is double, uint64 or a string representing a valid double * * value * @@ -581,8 +567,6 @@ static int variant_compare_dbl(const zbx_variant_t *value1, const zbx_variant_t /****************************************************************************** * * - * Function: variant_compare_ui64 * - * * * Purpose: compare two variant values when both are uint64 * * * ******************************************************************************/ @@ -594,8 +578,6 @@ static int variant_compare_ui64(const zbx_variant_t *value1, const zbx_variant_t /****************************************************************************** * * - * Function: zbx_variant_compare * - * * * Purpose: compare two variant values * * * * Parameters: value1 - [IN] the first value * diff --git a/src/libs/zbxcommon/variant_misc.c b/src/libs/zbxcommon/variant_misc.c index 87272b3f27f..e6ba4458b7e 100644 --- a/src/libs/zbxcommon/variant_misc.c +++ b/src/libs/zbxcommon/variant_misc.c @@ -22,8 +22,6 @@ /****************************************************************************** * * - * Function: zbx_variant_to_value_type * - * * * Purpose: converts variant value to type compatible with requested value * * type * * * diff --git a/src/libs/zbxcomms/comms.c b/src/libs/zbxcomms/comms.c index 2a56b617c12..b03c52f0d50 100644 --- a/src/libs/zbxcomms/comms.c +++ b/src/libs/zbxcomms/comms.c @@ -52,8 +52,6 @@ extern int CONFIG_TCP_MAX_BACKLOG_SIZE; /****************************************************************************** * * - * Function: zbx_socket_strerror * - * * * Purpose: return string describing tcp error * * * * Return value: pointer to the null terminated string * @@ -86,8 +84,6 @@ static void zbx_set_socket_strerror(const char *fmt, ...) /****************************************************************************** * * - * Function: zbx_socket_peer_ip_save * - * * * Purpose: get peer IP address info from a socket early while it is * * connected. Connection can be terminated due to various errors at * * any time and peer IP address will not be available anymore. * @@ -129,8 +125,6 @@ static int zbx_socket_peer_ip_save(zbx_socket_t *s) #ifndef _WINDOWS /****************************************************************************** * * - * Function: zbx_gethost_by_ip * - * * * Purpose: retrieve 'hostent' by IP address * * * * Author: Alexei Vladishev * @@ -187,8 +181,6 @@ void zbx_gethost_by_ip(const char *ip, char *host, size_t hostlen) /****************************************************************************** * * - * Function: zbx_getip_by_host * - * * * Purpose: retrieve IP address by host name * * * ******************************************************************************/ @@ -228,8 +220,6 @@ out: #ifdef _WINDOWS /****************************************************************************** * * - * Function: zbx_is_win_ver_or_greater * - * * * Purpose: check Windows version * * * * Parameters: major - [IN] major windows version * @@ -261,8 +251,6 @@ static int zbx_is_win_ver_or_greater(zbx_uint32_t major, zbx_uint32_t minor, zbx /****************************************************************************** * * - * Function: zbx_socket_start * - * * * Purpose: Initialize Windows Sockets APIs * * * * Parameters: error - [OUT] the error message * @@ -290,8 +278,6 @@ int zbx_socket_start(char **error) /****************************************************************************** * * - * Function: zbx_socket_clean * - * * * Purpose: initialize socket * * * * Author: Alexei Vladishev * @@ -306,8 +292,6 @@ static void zbx_socket_clean(zbx_socket_t *s) /****************************************************************************** * * - * Function: zbx_socket_free * - * * * Purpose: free socket's dynamic buffer * * * * Author: Alexei Vladishev * @@ -321,8 +305,6 @@ static void zbx_socket_free(zbx_socket_t *s) /****************************************************************************** * * - * Function: zbx_socket_timeout_set * - * * * Purpose: set timeout for socket operations * * * * Parameters: s - [IN] socket descriptor * @@ -355,8 +337,6 @@ void zbx_socket_timeout_set(zbx_socket_t *s, int timeout) /****************************************************************************** * * - * Function: zbx_socket_timeout_cleanup * - * * * Purpose: clean up timeout for socket operations * * * * Parameters: s - [OUT] socket descriptor * @@ -377,8 +357,6 @@ static void zbx_socket_timeout_cleanup(zbx_socket_t *s) /****************************************************************************** * * - * Function: zbx_socket_connect * - * * * Purpose: connect to the specified address with an optional timeout value * * * * Parameters: s - [IN] socket descriptor * @@ -488,8 +466,6 @@ static int zbx_socket_connect(zbx_socket_t *s, const struct sockaddr *addr, sock /****************************************************************************** * * - * Function: zbx_socket_create * - * * * Purpose: connect the socket of the specified type to external host * * * * Parameters: s - [OUT] socket descriptor * @@ -793,8 +769,6 @@ static ssize_t zbx_tcp_write(zbx_socket_t *s, const char *buf, size_t len) /****************************************************************************** * * - * Function: zbx_tcp_send_ext * - * * * Purpose: send data * * * * Return value: SUCCEED - success * @@ -951,8 +925,6 @@ cleanup: /****************************************************************************** * * - * Function: zbx_tcp_close * - * * * Purpose: close open TCP socket * * * * Author: Alexei Vladishev * @@ -970,8 +942,6 @@ void zbx_tcp_close(zbx_socket_t *s) /****************************************************************************** * * - * Function: get_address_family * - * * * Purpose: return address family * * * * Parameters: addr - [IN] address or hostname * @@ -1021,8 +991,6 @@ out: /****************************************************************************** * * - * Function: zbx_tcp_listen * - * * * Purpose: create socket for listening * * * * Return value: SUCCEED - success * @@ -1410,8 +1378,6 @@ void zbx_tcp_unlisten(zbx_socket_t *s) /****************************************************************************** * * - * Function: zbx_tcp_accept * - * * * Purpose: permits an incoming connection attempt on a socket * * * * Return value: SUCCEED - success * @@ -1535,8 +1501,6 @@ out: /****************************************************************************** * * - * Function: zbx_tcp_unaccept * - * * * Purpose: close accepted connection * * * * Author: Eugene Grigorjev * @@ -1561,8 +1525,6 @@ void zbx_tcp_unaccept(zbx_socket_t *s) /****************************************************************************** * * - * Function: zbx_socket_find_line * - * * * Purpose: finds the next line in socket data buffer * * * * Parameters: s - [IN] the socket * @@ -1595,8 +1557,6 @@ static const char *zbx_socket_find_line(zbx_socket_t *s) /****************************************************************************** * * - * Function: zbx_tcp_recv_line * - * * * Purpose: reads next line from a socket * * * * Parameters: s - [IN] the socket * @@ -1768,8 +1728,6 @@ static ssize_t zbx_tcp_read(zbx_socket_t *s, char *buf, size_t len) /****************************************************************************** * * - * Function: zbx_tcp_recv_ext * - * * * Purpose: receive data * * * * Return value: number of bytes received - success, * @@ -2035,8 +1993,6 @@ out: /****************************************************************************** * * - * Function: zbx_tcp_recv_raw_ext * - * * * Purpose: receive data till connection is closed * * * * Return value: number of bytes received - success, * @@ -2145,8 +2101,6 @@ static int subnet_match(int af, unsigned int prefix_size, const void *address1, /****************************************************************************** * * - * Function: zbx_ip_cmp * - * * * Purpose: check if the address belongs to the given subnet * * * * Parameters: prefix_size - [IN] subnet prefix size * @@ -2299,8 +2253,6 @@ int zbx_validate_peer_list(const char *peer_list, char **error) /****************************************************************************** * * - * Function: zbx_tcp_check_allowed_peers * - * * * Purpose: check if connection initiator is in list of peers * * * * Parameters: s - [IN] socket descriptor * @@ -2383,8 +2335,6 @@ int zbx_tcp_check_allowed_peers(const zbx_socket_t *s, const char *peer_list) /****************************************************************************** * * - * Function: zbx_tcp_connection_type_name * - * * * Purpose: translate connection type code to name * * * ******************************************************************************/ diff --git a/src/libs/zbxcommshigh/comms.c b/src/libs/zbxcommshigh/comms.c index e15b3a2a08d..e82630f8f8c 100644 --- a/src/libs/zbxcommshigh/comms.c +++ b/src/libs/zbxcommshigh/comms.c @@ -137,8 +137,6 @@ void disconnect_server(zbx_socket_t *sock) /****************************************************************************** * * - * Function: get_data_from_server * - * * * Purpose: get configuration and other data from server * * * * Return value: SUCCEED - processed successfully * @@ -176,8 +174,6 @@ exit: /****************************************************************************** * * - * Function: put_data_to_server * - * * * Purpose: send data to server * * * * Return value: SUCCEED - processed successfully * @@ -210,8 +206,6 @@ out: /****************************************************************************** * * - * Function: zbx_send_response * - * * * Purpose: send json SUCCEED or FAIL to socket along with an info message * * * * Parameters: sock - [IN] socket descriptor * @@ -268,8 +262,6 @@ int zbx_send_response_ext(zbx_socket_t *sock, int result, const char *info, cons /****************************************************************************** * * - * Function: zbx_recv_response * - * * * Purpose: read a response message (in JSON format) from socket, optionally * * extract "info" value. * * * diff --git a/src/libs/zbxcompress/compress.c b/src/libs/zbxcompress/compress.c index bb20c1ab3da..3971cd96974 100644 --- a/src/libs/zbxcompress/compress.c +++ b/src/libs/zbxcompress/compress.c @@ -30,8 +30,6 @@ static int zbx_zlib_errno = 0; /****************************************************************************** * * - * Function: zbx_compress_strerror * - * * * Purpose: returns last conversion error message * * * ******************************************************************************/ @@ -63,8 +61,6 @@ const char *zbx_compress_strerror(void) /****************************************************************************** * * - * Function: zbx_compress * - * * * Purpose: compress data * * * * Parameters: in - [IN] the data to compress * @@ -101,8 +97,6 @@ int zbx_compress(const char *in, size_t size_in, char **out, size_t *size_out) /****************************************************************************** * * - * Function: zbx_uncompress * - * * * Purpose: uncompress data * * * * Parameters: in - [IN] the data to uncompress * diff --git a/src/libs/zbxconf/cfg.c b/src/libs/zbxconf/cfg.c index 46fd3598fec..d74e28e0d19 100644 --- a/src/libs/zbxconf/cfg.c +++ b/src/libs/zbxconf/cfg.c @@ -38,8 +38,6 @@ static int __parse_cfg_file(const char *cfg_file, struct cfg_line *cfg, int leve /****************************************************************************** * * - * Function: match_glob * - * * * Purpose: see whether a file (e.g., "parameter.conf") * * matches a pattern (e.g., "p*.conf") * * * @@ -127,8 +125,6 @@ static int match_glob(const char *file, const char *pattern) /****************************************************************************** * * - * Function: parse_glob * - * * * Purpose: parse a glob like "/usr/local/etc/zabbix_agentd.conf.d/p*.conf" * * into "/usr/local/etc/zabbix_agentd.conf.d" and "p*.conf" parts * * * @@ -199,8 +195,6 @@ trim: /****************************************************************************** * * - * Function: parse_cfg_dir * - * * * Purpose: parse directory with configuration files * * * * Parameters: path - full path to directory * @@ -307,8 +301,6 @@ out: /****************************************************************************** * * - * Function: parse_cfg_object * - * * * Purpose: parse "Include=..." line in configuration file * * * * Parameters: cfg_file - full name of config file * @@ -358,8 +350,6 @@ clean: /****************************************************************************** * * - * Function: parse_cfg_file * - * * * Purpose: parse configuration file * * * * Parameters: cfg_file - full name of config file * @@ -638,8 +628,6 @@ static int addr_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: zbx_set_data_destination_hosts * - * * * Purpose: parse "ServerActive' parameter value and set destination servers * * using a callback function * * * diff --git a/src/libs/zbxcrypto/base64.c b/src/libs/zbxcrypto/base64.c index aaea02504f0..9f3d2e22820 100644 --- a/src/libs/zbxcrypto/base64.c +++ b/src/libs/zbxcrypto/base64.c @@ -22,8 +22,6 @@ /****************************************************************************** * * - * Function: is_base64 * - * * * Purpose: is the character passed in a base64 character? * * * * Parameters: c - character to test * @@ -50,8 +48,6 @@ static int is_base64(char c) /****************************************************************************** * * - * Function: char_base64_encode * - * * * Purpose: encode a byte into a base64 character * * * * Parameters: uc - character to encode * @@ -68,8 +64,6 @@ static char char_base64_encode(unsigned char uc) /****************************************************************************** * * - * Function: char_base64_decode * - * * * Purpose: decode a base64 character into a byte * * * * Parameters: c - character to decode * @@ -104,8 +98,6 @@ static unsigned char char_base64_decode(char c) /****************************************************************************** * * - * Function: str_base64_encode * - * * * Purpose: encode a string into a base64 string * * * * Parameters: p_str - [IN] the string to encode * @@ -170,8 +162,6 @@ void str_base64_encode(const char *p_str, char *p_b64str, int in_size) /****************************************************************************** * * - * Function: str_base64_encode_dyn * - * * * Purpose: encode a string into a base64 string * * with dynamic memory allocation * * * @@ -217,8 +207,6 @@ void str_base64_encode_dyn(const char *p_str, char **p_b64str, int in_size) /****************************************************************************** * * - * Function: str_base64_decode * - * * * Purpose: decode a base64 string into a string * * * * Parameters: p_b64str - [IN] the base64 string to decode * diff --git a/src/libs/zbxcrypto/tls.c b/src/libs/zbxcrypto/tls.c index c7bcd3f4220..bc4c06ff3fc 100644 --- a/src/libs/zbxcrypto/tls.c +++ b/src/libs/zbxcrypto/tls.c @@ -214,8 +214,6 @@ ZBX_THREAD_LOCAL char info_buf[256]; #if defined(HAVE_GNUTLS) /****************************************************************************** * * - * Function: zbx_gnutls_debug_cb * - * * * Purpose: write a GnuTLS debug message into Zabbix log * * * * Comments: * @@ -234,8 +232,6 @@ static void zbx_gnutls_debug_cb(int level, const char *str) /****************************************************************************** * * - * Function: zbx_gnutls_audit_cb * - * * * Purpose: write a GnuTLS audit message into Zabbix log * * * * Comments: * @@ -259,8 +255,6 @@ static void zbx_gnutls_audit_cb(gnutls_session_t session, const char *str) #if defined(HAVE_OPENSSL) /****************************************************************************** * * - * Function: zbx_openssl_info_cb * - * * * Purpose: get state, alert, error information on TLS connection * * * * Comments: * @@ -313,8 +307,6 @@ static void zbx_openssl_info_cb(const SSL *ssl, int where, int ret) /****************************************************************************** * * - * Function: zbx_tls_error_msg * - * * * Purpose: compose a TLS error message * * * ******************************************************************************/ @@ -342,8 +334,6 @@ void zbx_tls_error_msg(char **error, size_t *error_alloc, size_t *error_offset) /****************************************************************************** * * - * Function: zbx_tls_parameter_name * - * * * Purpose: * * return the name of a configuration file or command line parameter that * * the value of the given parameter comes from * @@ -435,8 +425,6 @@ static const char *zbx_tls_parameter_name(int type, char **param) /****************************************************************************** * * - * Function: zbx_tls_parameter_not_empty * - * * * Purpose: * * Helper function: check if a configuration parameter is defined it must * * not be empty. Otherwise log error and exit. * @@ -493,8 +481,6 @@ static void zbx_tls_parameter_not_empty(char **param) /****************************************************************************** * * - * Function: zbx_tls_validation_error * - * * * Purpose: * * Helper function: log error message depending on program type and exit. * * * @@ -628,8 +614,6 @@ static void zbx_tls_validation_error(int type, char **param1, char **param2) /****************************************************************************** * * - * Function: zbx_tls_validation_error2 * - * * * Purpose: * * Helper function: log error message depending on program type and exit * * * @@ -680,8 +664,6 @@ static void zbx_tls_validation_error2(int type, char **param1, char **param2, ch /****************************************************************************** * * - * Function: zbx_tls_validate_config * - * * * Purpose: check for allowed combinations of TLS configuration parameters * * * * Comments: * @@ -988,8 +970,6 @@ static void zbx_psk_warn_misconfig(const char *psk_identity) #if defined(HAVE_GNUTLS) /****************************************************************************** * * - * Function: zbx_psk_cb * - * * * Purpose: * * find and set the requested pre-shared key upon GnuTLS request * * * @@ -1101,8 +1081,6 @@ static int zbx_psk_cb(gnutls_session_t session, const char *psk_identity, gnutls #elif defined(HAVE_OPENSSL) && defined(HAVE_OPENSSL_WITH_PSK) /****************************************************************************** * * - * Function: zbx_psk_client_cb * - * * * Purpose: * * set pre-shared key for outgoing TLS connection upon OpenSSL request * * * @@ -1157,8 +1135,6 @@ static unsigned int zbx_psk_client_cb(SSL *ssl, const char *hint, char *identity /****************************************************************************** * * - * Function: zbx_psk_server_cb * - * * * Purpose: * * set pre-shared key for incoming TLS connection upon OpenSSL request * * * @@ -1274,8 +1250,6 @@ fail: /****************************************************************************** * * - * Function: zbx_check_psk_identity_len * - * * * Purpose: Check PSK identity length. Exit if length exceeds the maximum. * * * ******************************************************************************/ @@ -1292,8 +1266,6 @@ static void zbx_check_psk_identity_len(size_t psk_identity_len) /****************************************************************************** * * - * Function: zbx_read_psk_file * - * * * Purpose: * * read a pre-shared key from a configured file and convert it from * * textual representation (ASCII hex digit string) to a binary * @@ -1379,8 +1351,6 @@ out: #if defined(HAVE_GNUTLS) /****************************************************************************** * * - * Function: zbx_log_ciphersuites * - * * * Purpose: write names of enabled GnuTLS ciphersuites into Zabbix log for * * debugging * * * @@ -1425,8 +1395,6 @@ static void zbx_log_ciphersuites(const char *title1, const char *title2, gnutls_ #elif defined(HAVE_OPENSSL) /****************************************************************************** * * - * Function: zbx_log_ciphersuites * - * * * Purpose: write names of enabled OpenSSL ciphersuites into Zabbix log for * * debugging * * * @@ -1465,8 +1433,6 @@ static void zbx_log_ciphersuites(const char *title1, const char *title2, SSL_CTX #if defined(HAVE_GNUTLS) /****************************************************************************** * * - * Function: zbx_print_rdn_value * - * * * Purpose: * * print an RDN (relative distinguished name) value into buffer * * * @@ -1591,8 +1557,6 @@ small_buf: #if defined(HAVE_GNUTLS) /****************************************************************************** * * - * Function: zbx_x509_dn_gets * - * * * Purpose: * * Print distinguished name (i.e. issuer, subject) into buffer. Intended * * to use as an alternative to GnuTLS gnutls_x509_crt_get_issuer_dn() and * @@ -1740,8 +1704,6 @@ small_buf: #elif defined(HAVE_OPENSSL) /****************************************************************************** * * - * Function: zbx_x509_dn_gets * - * * * Purpose: * * Print distinguished name (i.e. issuer, subject) into buffer. Intended * * to use as an alternative to OpenSSL X509_NAME_oneline() and to meet * @@ -1808,8 +1770,6 @@ out: #if defined(HAVE_GNUTLS) /****************************************************************************** * * - * Function: zbx_get_peer_cert * - * * * Purpose: get peer certificate from session * * * * Parameters: * @@ -1876,8 +1836,6 @@ static gnutls_x509_crt_t zbx_get_peer_cert(const gnutls_session_t session, char /****************************************************************************** * * - * Function: zbx_log_peer_cert * - * * * Purpose: write peer certificate information into Zabbix log for debugging * * * * Parameters: * @@ -1945,8 +1903,6 @@ static void zbx_log_peer_cert(const char *function_name, const zbx_tls_context_t #if defined(HAVE_GNUTLS) /****************************************************************************** * * - * Function: zbx_verify_peer_cert * - * * * Purpose: basic verification of peer certificate * * * * Return value: * @@ -1989,8 +1945,6 @@ static int zbx_verify_peer_cert(const gnutls_session_t session, char **error) /****************************************************************************** * * - * Function: zbx_verify_issuer_subject * - * * * Purpose: * * verify peer certificate issuer and subject of the given TLS context * * * @@ -2107,8 +2061,6 @@ static int zbx_verify_issuer_subject(const zbx_tls_context_t *tls_ctx, const cha /****************************************************************************** * * - * Function: zbx_check_server_issuer_subject * - * * * Purpose: * * check server certificate issuer and subject (for passive proxies and * * agent passive checks) * @@ -2152,8 +2104,6 @@ int zbx_check_server_issuer_subject(zbx_socket_t *sock, char **error) /****************************************************************************** * * - * Function: zbx_tls_library_init * - * * * Purpose: initialize TLS library, log library version * * * * Comments: * @@ -2194,8 +2144,6 @@ static void zbx_tls_library_init(void) /****************************************************************************** * * - * Function: zbx_tls_library_deinit * - * * * Purpose: deinitialize TLS library * * * ******************************************************************************/ @@ -2218,8 +2166,6 @@ void zbx_tls_library_deinit(void) /****************************************************************************** * * - * Function: zbx_tls_init_parent * - * * * Purpose: initialize TLS library in a parent process * * * ******************************************************************************/ @@ -2232,8 +2178,6 @@ void zbx_tls_init_parent(void) /****************************************************************************** * * - * Function: zbx_tls_init_child * - * * * Purpose: read available configuration parameters and initialize TLS * * library in a child process * * * @@ -3118,8 +3062,6 @@ out1: /****************************************************************************** * * - * Function: zbx_tls_free_on_signal * - * * * Purpose: TLS cleanup for using in signal handlers * * * ******************************************************************************/ @@ -3131,8 +3073,6 @@ void zbx_tls_free_on_signal(void) /****************************************************************************** * * - * Function: zbx_tls_free * - * * * Purpose: release TLS library resources allocated in zbx_tls_init_parent() * * and zbx_tls_init_child() * * * @@ -3205,8 +3145,6 @@ void zbx_tls_free(void) /****************************************************************************** * * - * Function: zbx_tls_connect * - * * * Purpose: establish a TLS connection over an established TCP connection * * * * Parameters: * @@ -3739,8 +3677,6 @@ out1: /****************************************************************************** * * - * Function: zbx_tls_accept * - * * * Purpose: establish a TLS connection over an accepted TCP connection * * * * Parameters: * @@ -4432,8 +4368,6 @@ ssize_t zbx_tls_read(zbx_socket_t *s, char *buf, size_t len, char **error) /****************************************************************************** * * - * Function: zbx_tls_close * - * * * Purpose: close a TLS connection before closing a TCP socket * * * ******************************************************************************/ @@ -4509,8 +4443,6 @@ void zbx_tls_close(zbx_socket_t *s) /****************************************************************************** * * - * Function: zbx_tls_get_attr_cert * - * * * Purpose: get certificate attributes from the context of established * * connection * * * @@ -4600,8 +4532,6 @@ int zbx_tls_get_attr_cert(const zbx_socket_t *s, zbx_tls_conn_attr_t *attr) /****************************************************************************** * * - * Function: zbx_tls_get_attr_psk * - * * * Purpose: get PSK attributes from the context of established connection * * * * Comments: * @@ -4640,8 +4570,6 @@ int zbx_tls_get_attr_psk(const zbx_socket_t *s, zbx_tls_conn_attr_t *attr) #if defined(_WINDOWS) /****************************************************************************** * * - * Function: zbx_tls_pass_vars * - * * * Purpose: pass some TLS variables from one thread to other * * * * Comments: used in Zabbix sender on MS Windows * @@ -4668,8 +4596,6 @@ void zbx_tls_pass_vars(ZBX_THREAD_SENDVAL_TLS_ARGS *args) /****************************************************************************** * * - * Function: zbx_tls_take_vars * - * * * Purpose: pass some TLS variables from one thread to other * * * * Comments: used in Zabbix sender on MS Windows * diff --git a/src/libs/zbxcrypto/tls_version.c b/src/libs/zbxcrypto/tls_version.c index d1c14f1ae49..83ea5df6f1b 100644 --- a/src/libs/zbxcrypto/tls_version.c +++ b/src/libs/zbxcrypto/tls_version.c @@ -35,8 +35,6 @@ /****************************************************************************** * * - * Function: zbx_tls_version * - * * * Purpose: print tls library version on stdout by application request with * * parameter '-V' * * * diff --git a/src/libs/zbxdb/db.c b/src/libs/zbxdb/db.c index 0123612da06..17ce79a3c3e 100644 --- a/src/libs/zbxdb/db.c +++ b/src/libs/zbxdb/db.c @@ -167,8 +167,6 @@ static void zbx_db_errlog(zbx_err_codes_t zbx_errno, int db_errno, const char *d /****************************************************************************** * * - * Function: zbx_db_last_strerr * - * * * Purpose: get last error set by database * * * * Return value: last database error message * @@ -181,8 +179,6 @@ const char *zbx_db_last_strerr(void) /****************************************************************************** * * - * Function: zbx_db_last_errcode * - * * * Purpose: get last error code returned by database * * * * Return value: last database error code * @@ -238,8 +234,6 @@ static const char *zbx_oci_error(sword status, sb4 *err) /****************************************************************************** * * - * Function: OCI_handle_sql_error * - * * * Purpose: handles Oracle prepare/bind/execute/select operation error * * * * Parameters: zerrcode - [IN] the Zabbix errorcode for the failed database * @@ -363,8 +357,6 @@ static int is_recoverable_postgresql_error(const PGconn *pg_conn, const PGresult /****************************************************************************** * * - * Function: zbx_db_init_autoincrement_options * - * * * Purpose: specify the autoincrement options during db connect * * * ******************************************************************************/ @@ -375,8 +367,6 @@ void zbx_db_init_autoincrement_options(void) /****************************************************************************** * * - * Function: zbx_db_connect * - * * * Purpose: connect to the database * * * * Return value: ZBX_DB_OK - successfully connected * @@ -1016,8 +1006,6 @@ void zbx_db_close(void) /****************************************************************************** * * - * Function: zbx_db_begin * - * * * Purpose: start transaction * * * * Comments: do nothing if DB does not support transactions * @@ -1050,8 +1038,6 @@ int zbx_db_begin(void) /****************************************************************************** * * - * Function: zbx_db_commit * - * * * Purpose: commit transaction * * * * Comments: do nothing if DB does not support transactions * @@ -1098,8 +1084,6 @@ int zbx_db_commit(void) /****************************************************************************** * * - * Function: zbx_db_rollback * - * * * Purpose: rollback transaction * * * * Comments: do nothing if DB does not support transactions * @@ -1215,8 +1199,6 @@ int zbx_db_statement_prepare(const char *sql) /****************************************************************************** * * - * Function: db_bind_dynamic_cb * - * * * Purpose: callback function used by dynamic parameter binding * * * ******************************************************************************/ @@ -1270,8 +1252,6 @@ static sb4 db_bind_dynamic_cb(dvoid *ctxp, OCIBind *bindp, ub4 iter, ub4 index, /****************************************************************************** * * - * Function: zbx_db_bind_parameter_dyn * - * * * Purpose: performs dynamic parameter binding, converting value if necessary * * * * Parameters: context - [OUT] the bind context * @@ -1425,8 +1405,6 @@ out: /****************************************************************************** * * - * Function: zbx_db_vexecute * - * * * Purpose: Execute SQL statement. For non-select statements only. * * * * Return value: ZBX_DB_FAIL (on error) or ZBX_DB_DOWN (on recoverable error) * @@ -1607,8 +1585,6 @@ clean: /****************************************************************************** * * - * Function: zbx_db_vselect * - * * * Purpose: execute a select statement * * * * Return value: data, NULL (on error) or (DB_RESULT)ZBX_DB_DOWN * @@ -1913,8 +1889,6 @@ DB_RESULT zbx_db_select_n(const char *query, int n) #ifdef HAVE_POSTGRESQL /****************************************************************************** * * - * Function: zbx_db_bytea_unescape * - * * * Purpose: converts the null terminated string into binary buffer * * * * Transformations: * @@ -2247,8 +2221,6 @@ static int zbx_db_is_escape_sequence(char c) /****************************************************************************** * * - * Function: zbx_db_escape_string * - * * * Return value: escaped string * * * * Comments: sync changes with 'zbx_db_get_escape_string_len' * @@ -2288,8 +2260,6 @@ static void zbx_db_escape_string(const char *src, char *dst, size_t len, zbx_esc /****************************************************************************** * * - * Function: zbx_db_get_escape_string_len * - * * * Purpose: to calculate escaped string length limited by bytes or characters * * whichever is reached first. * * * @@ -2335,8 +2305,6 @@ static size_t zbx_db_get_escape_string_len(const char *s, size_t max_bytes, size /****************************************************************************** * * - * Function: zbx_db_dyn_escape_string * - * * * Purpose: to escape string limited by bytes or characters, whichever limit * * is reached first. * * * @@ -2364,8 +2332,6 @@ char *zbx_db_dyn_escape_string(const char *src, size_t max_bytes, size_t max_cha /****************************************************************************** * * - * Function: zbx_db_get_escape_like_pattern_len * - * * * Return value: return length of escaped LIKE pattern with terminating '\0' * * * * Comments: sync changes with 'zbx_db_escape_like_pattern' * @@ -2391,8 +2357,6 @@ static int zbx_db_get_escape_like_pattern_len(const char *src) /****************************************************************************** * * - * Function: zbx_db_escape_like_pattern * - * * * Return value: escaped string to be used as pattern in LIKE * * * * Comments: sync changes with 'zbx_db_get_escape_like_pattern_len' * @@ -2448,8 +2412,6 @@ static void zbx_db_escape_like_pattern(const char *src, char *dst, int len) /****************************************************************************** * * - * Function: zbx_db_dyn_escape_like_pattern * - * * * Return value: escaped string to be used as pattern in LIKE * * * ******************************************************************************/ @@ -2469,8 +2431,6 @@ char *zbx_db_dyn_escape_like_pattern(const char *src) /****************************************************************************** * * - * Function: zbx_db_strlen_n * - * * * Purpose: return the string length to fit into a database field of the * * specified size * * * @@ -2484,8 +2444,6 @@ int zbx_db_strlen_n(const char *text_loc, size_t maxlen) /********************************************************************************* * * - * Function: zbx_db_version_check * - * * * Purpose: determine if a vendor database(MySQL, MariaDB, PostgreSQL, * * Oracle, ElasticDB) version satisfies Zabbix requirements * * * @@ -2533,8 +2491,6 @@ int zbx_db_version_check(const char *database, zbx_uint32_t current_version, zbx /****************************************************************************** * * - * Function: zbx_db_version_json_create * - * * * Purpose: prepare json for front-end with the DB current, minimum and * * maximum versions and a flag that indicates if the version * * satisfies the requirements * @@ -2567,8 +2523,6 @@ void zbx_db_version_json_create(struct zbx_json *json, struct zbx_db_version_inf /****************************************************************************** * * - * Function: zbx_dbms_version_get * - * * * Purpose: For PostgreSQL, MySQL and MariaDB: * * returns DBMS version as integer: MMmmuu * * M = major version part * @@ -2607,8 +2561,6 @@ zbx_uint32_t zbx_dbms_version_get(void) #ifdef HAVE_MYSQL /****************************************************************************** * * - * Function: zbx_dbms_mariadb_used * - * * * Purpose: returns flag if the mariadb was detected * * * * Return value: ON - mariadb detected * @@ -2622,8 +2574,6 @@ int zbx_dbms_mariadb_used(void) /*************************************************************************************************************** * * - * Function: zbx_dbms_version_info_extract * - * * * Purpose: retrieves the DB version info, including numeric version value * * * * For PostgreSQL: * @@ -2840,8 +2790,6 @@ out: #if defined(HAVE_POSTGRESQL) /****************************************************************************** * * - * Function: zbx_tsdb_get_version * - * * * Purpose: returns TimescaleDB (TSDB) version as integer: MMmmuu * * M = major version part * * m = minor version part * diff --git a/src/libs/zbxdbcache/dbcache.c b/src/libs/zbxdbcache/dbcache.c index ea57addf803..25bccccdebc 100644 --- a/src/libs/zbxdbcache/dbcache.c +++ b/src/libs/zbxdbcache/dbcache.c @@ -197,8 +197,6 @@ ZBX_PTR_VECTOR_IMPL(tags, zbx_tag_t*) /****************************************************************************** * * - * Function: DCget_stats_all * - * * * Purpose: retrieves all internal metrics of the database cache * * * * Parameters: stats - [OUT] write cache metrics * @@ -225,8 +223,6 @@ void DCget_stats_all(zbx_wcache_info_t *wcache_info) /****************************************************************************** * * - * Function: DCget_stats * - * * * Purpose: get statistics of the database cache * * * * Author: Alexander Vladishev * @@ -343,8 +339,6 @@ void *DCget_stats(int request) /****************************************************************************** * * - * Function: DCget_trend * - * * * Purpose: find existing or add new structure and return pointer * * * * Return value: pointer to a trend structure * @@ -367,8 +361,6 @@ static ZBX_DC_TREND *DCget_trend(zbx_uint64_t itemid) /****************************************************************************** * * - * Function: DCupdate_trends * - * * * Purpose: apply disable_from changes to cache * * * ******************************************************************************/ @@ -395,8 +387,6 @@ static void DCupdate_trends(zbx_vector_uint64_pair_t *trends_diff) /****************************************************************************** * * - * Function: dc_insert_trends_in_db * - * * * Purpose: helper function for DCflush trends * * * ******************************************************************************/ @@ -445,8 +435,6 @@ static void dc_insert_trends_in_db(ZBX_DC_TREND *trends, int trends_num, unsigne /****************************************************************************** * * - * Function: dc_remove_updated_trends * - * * * Purpose: Update trends disable_until for items without trends data past or * * equal the specified clock * * * @@ -518,8 +506,6 @@ static void dc_remove_updated_trends(ZBX_DC_TREND *trends, int trends_num, const /****************************************************************************** * * - * Function: dc_trends_update_float * - * * * Purpose: helper function for DCflush trends * * * ******************************************************************************/ @@ -551,8 +537,6 @@ static void dc_trends_update_float(ZBX_DC_TREND *trend, DB_ROW row, int num, siz /****************************************************************************** * * - * Function: dc_trends_update_uint * - * * * Purpose: helper function for DCflush trends * * * ******************************************************************************/ @@ -591,8 +575,6 @@ static void dc_trends_update_uint(ZBX_DC_TREND *trend, DB_ROW row, int num, size /****************************************************************************** * * - * Function: dc_trends_fetch_and_update * - * * * Purpose: helper function for DCflush trends * * * ******************************************************************************/ @@ -669,8 +651,6 @@ static void dc_trends_fetch_and_update(ZBX_DC_TREND *trends, int trends_num, zbx /****************************************************************************** * * - * Function: DBflush_trends * - * * * Purpose: flush trend to the database * * * * Author: Alexander Vladishev * @@ -793,8 +773,6 @@ static void DBflush_trends(ZBX_DC_TREND *trends, int *trends_num, zbx_vector_uin /****************************************************************************** * * - * Function: DCflush_trend * - * * * Purpose: move trend to the array of trends for flushing to DB * * * * Author: Alexander Vladishev * @@ -820,8 +798,6 @@ static void DCflush_trend(ZBX_DC_TREND *trend, ZBX_DC_TREND **trends, int *trend /****************************************************************************** * * - * Function: DCadd_trend * - * * * Purpose: add new value to the trends * * * * Author: Alexander Vladishev * @@ -868,8 +844,6 @@ static void DCadd_trend(const ZBX_DC_HISTORY *history, ZBX_DC_TREND **trends, in /****************************************************************************** * * - * Function: DCmass_update_trends * - * * * Purpose: update trends cache and get list of trends to flush into database * * * * Parameters: history - [IN] array of history data * @@ -955,8 +929,6 @@ static int zbx_trend_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: DBmass_update_trends * - * * * Purpose: prepare history data using items from configuration cache * * * * Parameters: trends - [IN] trends from cache to be added to database * @@ -991,8 +963,6 @@ zbx_host_info_t; /****************************************************************************** * * - * Function: zbx_host_info_clean * - * * * Purpose: frees resources allocated to store host groups names * * * * Parameters: host_info - [IN] host information * @@ -1006,8 +976,6 @@ static void zbx_host_info_clean(zbx_host_info_t *host_info) /****************************************************************************** * * - * Function: db_get_hosts_info_by_hostid * - * * * Purpose: get hosts groups names * * * * Parameters: hosts_info - [IN/OUT] output names of host groups for a host * @@ -1068,8 +1036,6 @@ zbx_item_info_t; /****************************************************************************** * * - * Function: db_get_items_info_by_itemid * - * * * Purpose: get items name and item tags * * * * Parameters: items_info - [IN/OUT] output item name and item tags * @@ -1135,8 +1101,6 @@ static void db_get_items_info_by_itemid(zbx_hashset_t *items_info, const zbx_vec /****************************************************************************** * * - * Function: item_tag_free * - * * * Purpose: frees resources allocated to store item tag * * * * Parameters: item_tag - [IN] item tag * @@ -1150,8 +1114,6 @@ static void item_tag_free(zbx_tag_t item_tag) /****************************************************************************** * * - * Function: zbx_item_info_clean * - * * * Purpose: frees resources allocated to store item tags and name * * * * Parameters: item_info - [IN] item information * @@ -1166,8 +1128,6 @@ static void zbx_item_info_clean(zbx_item_info_t *item_info) /****************************************************************************** * * - * Function: DCexport_trends * - * * * Purpose: export trends * * * * Parameters: trends - [IN] trends from cache * @@ -1266,8 +1226,6 @@ static void DCexport_trends(const ZBX_DC_TREND *trends, int trends_num, zbx_hash /****************************************************************************** * * - * Function: DCexport_history * - * * * Purpose: export history * * * * Parameters: history - [IN/OUT] array of history data * @@ -1381,8 +1339,6 @@ static void DCexport_history(const ZBX_DC_HISTORY *history, int history_num, zbx /****************************************************************************** * * - * Function: DCexport_history_and_trends * - * * * Purpose: export history and trends * * * * Parameters: history - [IN/OUT] array of history data * @@ -1502,8 +1458,6 @@ clean: /****************************************************************************** * * - * Function: DCexport_all_trends * - * * * Purpose: export all trends * * * * Parameters: trends - [IN] trends from cache * @@ -1551,8 +1505,6 @@ static void DCexport_all_trends(const ZBX_DC_TREND *trends, int trends_num) /****************************************************************************** * * - * Function: DCsync_trends * - * * * Purpose: flush all trends to the database * * * * Author: Alexander Vladishev * @@ -1604,8 +1556,6 @@ static void DCsync_trends(void) /****************************************************************************** * * - * Function: recalculate_triggers * - * * * Purpose: re-calculate and update values of triggers related to the items * * * * Parameters: history - [IN] array of history data * @@ -1780,8 +1730,6 @@ static void DCinventory_value_free(zbx_inventory_value_t *inventory_value) /****************************************************************************** * * - * Function: dc_history_clean_value * - * * * Purpose: frees resources allocated to store str/text/log value * * * * Parameters: history - [IN] the history data * @@ -1815,8 +1763,6 @@ static void dc_history_clean_value(ZBX_DC_HISTORY *history) /****************************************************************************** * * - * Function: hc_free_item_values * - * * * Purpose: frees resources allocated to store str/text/log values * * * * Parameters: history - [IN] the history data * @@ -1833,8 +1779,6 @@ static void hc_free_item_values(ZBX_DC_HISTORY *history, int history_num) /****************************************************************************** * * - * Function: dc_history_set_error * - * * * Purpose: sets history data to notsupported * * * * Parameters: history - [IN] the history data * @@ -1854,8 +1798,6 @@ static void dc_history_set_error(ZBX_DC_HISTORY *hdata, char *errmsg) /****************************************************************************** * * - * Function: dc_history_set_value * - * * * Purpose: sets history data value * * * * Parameters: hdata - [IN/OUT] the history data * @@ -1910,8 +1852,6 @@ static void dc_history_set_value(ZBX_DC_HISTORY *hdata, unsigned char value_type /****************************************************************************** * * - * Function: normalize_item_value * - * * * Purpose: normalize item value by performing truncation of long text * * values and changes value format according to the item value type * * * @@ -1987,8 +1927,6 @@ static void normalize_item_value(const DC_ITEM *item, ZBX_DC_HISTORY *hdata) /****************************************************************************** * * - * Function: calculate_item_update * - * * * Purpose: calculates what item fields must be updated * * * * Parameters: item - [IN] the item * @@ -2080,8 +2018,6 @@ static zbx_item_diff_t *calculate_item_update(DC_ITEM *item, const ZBX_DC_HISTOR /****************************************************************************** * * - * Function: DBmass_update_items * - * * * Purpose: update item data and inventory in database * * * * Parameters: item_diff - item changes * @@ -2130,8 +2066,6 @@ static void DBmass_update_items(const zbx_vector_ptr_t *item_diff, const zbx_vec /****************************************************************************** * * - * Function: DCmass_proxy_prepare_itemdiff * - * * * Purpose: prepare itemdiff after receiving new values * * * * Parameters: history - array of history data * @@ -2170,8 +2104,6 @@ static void DCmass_proxy_prepare_itemdiff(ZBX_DC_HISTORY *history, int history_n /****************************************************************************** * * - * Function: DCmass_proxy_update_items * - * * * Purpose: update items info after new value is received * * * * Parameters: item_diff - diff of items to be updated * @@ -2363,8 +2295,6 @@ static int add_history(ZBX_DC_HISTORY *history, int history_num, zbx_vector_ptr_ /****************************************************************************** * * - * Function: DBmass_add_history * - * * * Purpose: inserting new history data after new value is received * * * * Parameters: history - array of history data * @@ -2401,8 +2331,6 @@ static int DBmass_add_history(ZBX_DC_HISTORY *history, int history_num) /****************************************************************************** * * - * Function: dc_add_proxy_history * - * * * Purpose: helper function for DCmass_proxy_add_history() * * * * Comment: this function is meant for items with value_type other other than * @@ -2470,8 +2398,6 @@ static void dc_add_proxy_history(ZBX_DC_HISTORY *history, int history_num) /****************************************************************************** * * - * Function: dc_add_proxy_history_meta * - * * * Purpose: helper function for DCmass_proxy_add_history() * * * * Comment: this function is meant for items with value_type other other than * @@ -2540,8 +2466,6 @@ static void dc_add_proxy_history_meta(ZBX_DC_HISTORY *history, int history_num) /****************************************************************************** * * - * Function: dc_add_proxy_history_log * - * * * Purpose: helper function for DCmass_proxy_add_history() * * * * Comment: this function is meant for items with value_type * @@ -2611,8 +2535,6 @@ static void dc_add_proxy_history_log(ZBX_DC_HISTORY *history, int history_num) /****************************************************************************** * * - * Function: dc_add_proxy_history_notsupported * - * * * Purpose: helper function for DCmass_proxy_add_history() * * * ******************************************************************************/ @@ -2642,8 +2564,6 @@ static void dc_add_proxy_history_notsupported(ZBX_DC_HISTORY *history, int histo /****************************************************************************** * * - * Function: DCmass_proxy_add_history * - * * * Purpose: inserting new history data after new value is received * * * * Parameters: history - array of history data * @@ -2707,8 +2627,6 @@ static void DBmass_proxy_add_history(ZBX_DC_HISTORY *history, int history_num) /****************************************************************************** * * - * Function: DCmass_prepare_history * - * * * Purpose: prepare history data using items from configuration cache and * * generate item changes to be applied and host inventory values to * * be added * @@ -2832,8 +2750,6 @@ static void DCmass_prepare_history(ZBX_DC_HISTORY *history, const zbx_vector_uin /****************************************************************************** * * - * Function: DCmodule_prepare_history * - * * * Purpose: prepare history data to share them with loadable modules, sort * * data by type skipping low-level discovery data, meta information * * updates and notsupported items * @@ -3019,8 +2935,6 @@ static void DCmodule_sync_history(int history_float_num, int history_integer_num /****************************************************************************** * * - * Function: proxy_prepare_history * - * * * Purpose: prepares history update by checking which values must be stored * * * * Parameters: history - [IN/OUT] the history values * @@ -3164,8 +3078,6 @@ static void sync_proxy_history(int *total_num, int *more) /****************************************************************************** * * - * Function: sync_server_history * - * * * Purpose: flush history cache to database, process triggers of flushed * * and timer triggers from timer queue * * * @@ -3501,8 +3413,6 @@ static void sync_server_history(int *values_num, int *triggers_num, int *more) /****************************************************************************** * * - * Function: sync_history_cache_full * - * * * Purpose: writes updates and new data from history cache to database * * * * Comments: This function is used to flush history cache at server/proxy * @@ -3579,8 +3489,6 @@ static void sync_history_cache_full(void) /****************************************************************************** * * - * Function: zbx_log_sync_history_cache_progress * - * * * Purpose: log progress of syncing history data * * * ******************************************************************************/ @@ -3630,8 +3538,6 @@ void zbx_log_sync_history_cache_progress(void) /****************************************************************************** * * - * Function: zbx_sync_history_cache * - * * * Purpose: writes updates and new data from history cache to database * * * * Parameters: values_num - [OUT] the number of synced values * @@ -3887,8 +3793,6 @@ static void dc_local_add_history_empty(zbx_uint64_t itemid, unsigned char item_v /****************************************************************************** * * - * Function: dc_add_history * - * * * Purpose: add new value to the cache * * * * Parameters: itemid - [IN] the itemid * @@ -4030,8 +3934,6 @@ ZBX_MEM_FUNC_IMPL(__hc, hc_mem) /****************************************************************************** * * - * Function: hc_queue_elem_compare_func * - * * * Purpose: compares history queue elements * * * ******************************************************************************/ @@ -4049,8 +3951,6 @@ static int hc_queue_elem_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: hc_free_data * - * * * Purpose: free history item data allocated in history cache * * * * Parameters: data - [IN] history item data * @@ -4089,8 +3989,6 @@ static void hc_free_data(zbx_hc_data_t *data) /****************************************************************************** * * - * Function: hc_queue_item * - * * * Purpose: put back item into history queue * * * * Parameters: data - [IN] history item data * @@ -4105,8 +4003,6 @@ static void hc_queue_item(zbx_hc_item_t *item) /****************************************************************************** * * - * Function: hc_get_item * - * * * Purpose: returns history item by itemid * * * * Parameters: itemid - [IN] the item id * @@ -4122,8 +4018,6 @@ static zbx_hc_item_t *hc_get_item(zbx_uint64_t itemid) /****************************************************************************** * * - * Function: hc_add_item * - * * * Purpose: adds a new item to history cache * * * * Parameters: itemid - [IN] the item id * @@ -4141,8 +4035,6 @@ static zbx_hc_item_t *hc_add_item(zbx_uint64_t itemid, zbx_hc_data_t *data) /****************************************************************************** * * - * Function: hc_mem_value_str_dup * - * * * Purpose: copies string value to history cache * * * * Parameters: str - [IN] the string value * @@ -4165,8 +4057,6 @@ static char *hc_mem_value_str_dup(const dc_value_str_t *str) /****************************************************************************** * * - * Function: hc_clone_history_str_data * - * * * Purpose: clones string value into history data memory * * * * Parameters: dst - [IN/OUT] a reference to the cloned value * @@ -4197,8 +4087,6 @@ static int hc_clone_history_str_data(char **dst, const dc_value_str_t *str) /****************************************************************************** * * - * Function: hc_clone_history_log_data * - * * * Purpose: clones log value into history data memory * * * * Parameters: dst - [IN/OUT] a reference to the cloned value * @@ -4237,8 +4125,6 @@ static int hc_clone_history_log_data(zbx_log_value_t **dst, const dc_item_value_ /****************************************************************************** * * - * Function: hc_clone_history_data * - * * * Purpose: clones item value from local cache into history cache * * * * Parameters: data - [IN/OUT] a reference to the cloned value * @@ -4354,8 +4240,6 @@ static int hc_clone_history_data(zbx_hc_data_t **data, const dc_item_value_t *it /****************************************************************************** * * - * Function: hc_add_item_values * - * * * Purpose: adds item values to the history cache * * * * Parameters: values - [IN] the item values to add * @@ -4427,8 +4311,6 @@ static void hc_add_item_values(dc_item_value_t *values, int values_num) /****************************************************************************** * * - * Function: hc_copy_history_data * - * * * Purpose: copies item value from history cache into the specified history * * value * * * @@ -4491,8 +4373,6 @@ static void hc_copy_history_data(ZBX_DC_HISTORY *history, zbx_uint64_t itemid, z /****************************************************************************** * * - * Function: hc_pop_items * - * * * Purpose: pops the next batch of history items from cache for processing * * * * Parameters: history_items - [OUT] the locked history items * @@ -4518,8 +4398,6 @@ static void hc_pop_items(zbx_vector_ptr_t *history_items) /****************************************************************************** * * - * Function: hc_get_item_values * - * * * Purpose: gets item history values * * * * Parameters: history - [OUT] the history valeus * @@ -4546,8 +4424,6 @@ static void hc_get_item_values(ZBX_DC_HISTORY *history, zbx_vector_ptr_t *histor /****************************************************************************** * * - * Function: hc_push_processed_items * - * * * Purpose: push back the processed history items into history cache * * * * Parameters: history_items - [IN] the history items containing processed * @@ -4591,8 +4467,6 @@ void hc_push_items(zbx_vector_ptr_t *history_items) /****************************************************************************** * * - * Function: hc_queue_get_size * - * * * Purpose: retrieve the size of history queue * * * ******************************************************************************/ @@ -4624,8 +4498,6 @@ int hc_get_history_compression_age(void) /****************************************************************************** * * - * Function: init_trend_cache * - * * * Purpose: Allocate shared memory for trend cache (part of database cache) * * * * Author: Vladimir Levijev * @@ -4675,8 +4547,6 @@ out: /****************************************************************************** * * - * Function: init_database_cache * - * * * Purpose: Allocate shared memory for database cache * * * * Author: Alexei Vladishev, Alexander Vladishev * @@ -4754,8 +4624,6 @@ out: /****************************************************************************** * * - * Function: DCsync_all * - * * * Purpose: writes updates and new data from pool and cache data to database * * * * Author: Alexei Vladishev * @@ -4774,8 +4642,6 @@ static void DCsync_all(void) /****************************************************************************** * * - * Function: free_database_cache * - * * * Purpose: Free memory allocated for database cache * * * * Author: Alexei Vladishev, Alexander Vladishev * @@ -4810,8 +4676,6 @@ void free_database_cache(int sync) /****************************************************************************** * * - * Function: DCget_nextid * - * * * Purpose: Return next id for requested table * * * * Author: Alexander Vladishev * @@ -4890,8 +4754,6 @@ zbx_uint64_t DCget_nextid(const char *table_name, int num) /****************************************************************************** * * - * Function: DCupdate_interfaces_availability * - * * * Purpose: performs interface availability reset for hosts with * * availability set on interfaces without enabled items * * * @@ -4917,8 +4779,6 @@ out: /****************************************************************************** * * - * Function: zbx_hc_get_diag_stats * - * * * Purpose: get history cache diagnostics statistics * * * ******************************************************************************/ @@ -4934,8 +4794,6 @@ void zbx_hc_get_diag_stats(zbx_uint64_t *items_num, zbx_uint64_t *values_num) /****************************************************************************** * * - * Function: zbx_hc_get_mem_stats * - * * * Purpose: get shared memory allocator statistics * * * ******************************************************************************/ @@ -4954,8 +4812,6 @@ void zbx_hc_get_mem_stats(zbx_mem_stats_t *data, zbx_mem_stats_t *index) /****************************************************************************** * * - * Function: zbx_hc_get_items * - * * * Purpose: get statistics of cached items * * * ******************************************************************************/ @@ -4980,8 +4836,6 @@ void zbx_hc_get_items(zbx_vector_uint64_pair_t *items) /****************************************************************************** * * - * Function: zbx_db_trigger_queue_locked * - * * * Purpose: checks if database trigger queue table is locked * * * ******************************************************************************/ @@ -4992,8 +4846,6 @@ int zbx_db_trigger_queue_locked(void) /****************************************************************************** * * - * Function: zbx_db_trigger_queue_unlock * - * * * Purpose: unlocks database trigger queue table * * * ******************************************************************************/ @@ -5004,8 +4856,6 @@ void zbx_db_trigger_queue_unlock(void) /****************************************************************************** * * - * Function: zbx_hc_proxyqueue_peek * - * * * Purpose: return first proxy in a queue, function assumes that a queue is * * not empty * * * @@ -5026,8 +4876,6 @@ static zbx_uint64_t zbx_hc_proxyqueue_peek(void) /****************************************************************************** * * - * Function: zbx_hc_proxyqueue_enqueue * - * * * Purpose: add new proxyid to a queue * * * * Parameters: proxyid - [IN] the proxy id * @@ -5046,8 +4894,6 @@ static void zbx_hc_proxyqueue_enqueue(zbx_uint64_t proxyid) /****************************************************************************** * * - * Function: zbx_hc_proxyqueue_dequeue * - * * * Purpose: try to dequeue proxyid from a proxy queue * * * * Parameters: chk_proxyid - [IN] the proxyid * @@ -5076,8 +4922,6 @@ static int zbx_hc_proxyqueue_dequeue(zbx_uint64_t proxyid) /****************************************************************************** * * - * Function: zbx_hc_proxyqueue_clear * - * * * Purpose: remove all proxies from proxy priority queue * * * ******************************************************************************/ @@ -5089,8 +4933,6 @@ static void zbx_hc_proxyqueue_clear(void) /****************************************************************************** * * - * Function: zbx_hc_check_proxy * - * * * Purpose: check status of a history cache usage, enqueue/dequeue proxy * * from priority list and accordingly enable or disable wait mode * * * diff --git a/src/libs/zbxdbcache/dbconfig.c b/src/libs/zbxdbcache/dbconfig.c index cbd0a907f06..4839fbe7bcf 100644 --- a/src/libs/zbxdbcache/dbconfig.c +++ b/src/libs/zbxdbcache/dbconfig.c @@ -78,8 +78,6 @@ int sync_in_progress = 0; /****************************************************************************** * * - * Function: zbx_value_validator_func_t * - * * * Purpose: validate macro value when expanding user macros * * * * Parameters: macro - [IN] the user macro * @@ -109,8 +107,6 @@ extern char *CONFIG_VAULTDBPATH; extern char *CONFIG_VAULTTOKEN; /****************************************************************************** * * - * Function: dc_strdup * - * * * Purpose: copies string into configuration cache shared memory * * * ******************************************************************************/ @@ -127,8 +123,6 @@ static char *dc_strdup(const char *source) /****************************************************************************** * * - * Function: is_item_processed_by_server * - * * * Parameters: type - [IN] item type [ITEM_TYPE_* flag] * * key - [IN] item key * * * @@ -250,8 +244,6 @@ static unsigned char poller_by_item(unsigned char type, const char *key) /****************************************************************************** * * - * Function: zbx_is_counted_in_item_queue * - * * * Purpose: determine whether the given item type is counted in item queue * * * * Return value: SUCCEED if item is counted in the queue, FAIL otherwise * @@ -282,8 +274,6 @@ int zbx_is_counted_in_item_queue(unsigned char type, const char *key) /****************************************************************************** * * - * Function: get_item_nextcheck_seed * - * * * Purpose: get the seed value to be used for item nextcheck calculations * * * * Return value: the seed for nextcheck calculations * @@ -438,8 +428,6 @@ static void DCincrease_disable_until(ZBX_DC_INTERFACE *interface, int now) /****************************************************************************** * * - * Function: DCfind_id * - * * * Purpose: Find an element in a hashset by its 'id' or create the element if * * it does not exist * * * @@ -500,8 +488,6 @@ static ZBX_DC_HOST *DCfind_host(const char *host) /****************************************************************************** * * - * Function: DCfind_proxy * - * * * Purpose: Find a record with proxy details in configuration cache using the * * proxy name * * * @@ -648,8 +634,6 @@ static void DCupdate_proxy_queue(ZBX_DC_PROXY *proxy) /****************************************************************************** * * - * Function: config_gmacro_add_index * - * * * Purpose: adds global macro index * * * * Parameters: gmacro_index - [IN/OUT] a global macro index hashset * @@ -679,8 +663,6 @@ static ZBX_DC_GMACRO_M *config_gmacro_add_index(zbx_hashset_t *gmacro_index, ZBX /****************************************************************************** * * - * Function: config_gmacro_remove_index * - * * * Purpose: removes global macro index * * * * Parameters: gmacro_index - [IN/OUT] a global macro index hashset * @@ -704,8 +686,6 @@ static ZBX_DC_GMACRO_M *config_gmacro_remove_index(zbx_hashset_t *gmacro_index, /****************************************************************************** * * - * Function: config_gmacro_context_compare * - * * * Purpose: comparison function to sort global macro vector by context * * operator, value and macro name * * * @@ -730,8 +710,6 @@ static int config_gmacro_context_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: config_hmacro_add_index * - * * * Purpose: adds host macro index * * * * Parameters: hmacro_index - [IN/OUT] a host macro index hashset * @@ -760,8 +738,6 @@ static ZBX_DC_HMACRO_HM *config_hmacro_add_index(zbx_hashset_t *hmacro_index, ZB /****************************************************************************** * * - * Function: config_hmacro_remove_index * - * * * Purpose: removes host macro index * * * * Parameters: hmacro_index - [IN/OUT] a host macro index hashset * @@ -786,8 +762,6 @@ static ZBX_DC_HMACRO_HM *config_hmacro_remove_index(zbx_hashset_t *hmacro_index, /****************************************************************************** * * - * Function: config_hmacro_context_compare * - * * * Purpose: comparison function to sort host macro vector by context * * operator, value and macro name * * * @@ -906,8 +880,6 @@ clean: /****************************************************************************** * * - * Function: set_hk_opt * - * * * Purpose: sets and validates global housekeeping option * * * * Parameters: value - [OUT] housekeeping setting * @@ -2230,8 +2202,6 @@ void DCsync_kvs_paths(const struct zbx_json_parse *jp_kvs_paths) /****************************************************************************** * * - * Function: substitute_host_interface_macros * - * * * Purpose: trying to resolve the macros in host interface * * * ******************************************************************************/ @@ -2272,8 +2242,6 @@ static void substitute_host_interface_macros(ZBX_DC_INTERFACE *interface) /****************************************************************************** * * - * Function: dc_interface_snmpaddrs_remove * - * * * Purpose: remove interface from SNMP address -> interfaceid index * * * * Parameters: interface - [IN] the interface * @@ -2310,8 +2278,6 @@ static void dc_interface_snmpaddrs_remove(ZBX_DC_INTERFACE *interface) /****************************************************************************** * * - * Function: dc_interface_snmp_set * - * * * Purpose: setup SNMP attributes for interface with interfaceid index * * * * Parameters: interface - [IN] the interface * @@ -2356,8 +2322,6 @@ static ZBX_DC_SNMPINTERFACE *dc_interface_snmp_set(zbx_uint64_t interfaceid, con /****************************************************************************** * * - * Function: dc_interface_snmp_remove * - * * * Purpose: remove interface from SNMP address -> interfaceid index * * * * Parameters: interface - [IN] the interface * @@ -2628,8 +2592,6 @@ static void DCsync_interfaces(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dc_interface_snmpitems_remove * - * * * Purpose: remove item from interfaceid -> itemid index * * * * Parameters: interface - [IN] the item * @@ -2661,8 +2623,6 @@ static void dc_interface_snmpitems_remove(ZBX_DC_ITEM *item) /****************************************************************************** * * - * Function: dc_masteritem_remove_depitem * - * * * Purpose: remove itemid from master item dependent itemid vector * * * * Parameters: master_itemid - [IN] the master item identifier * @@ -2696,8 +2656,6 @@ static void dc_masteritem_remove_depitem(zbx_uint64_t master_itemid, zbx_uint64_ /****************************************************************************** * * - * Function: dc_interface_update_agent_stats * - * * * Purpose: update number of items per agent statistics * * * * Parameters: interface - [IN/OUT] the interface * @@ -3787,8 +3745,6 @@ static void DCconfig_sort_triggers_topologically(void); /****************************************************************************** * * - * Function: dc_trigger_deplist_release * - * * * Purpose: releases trigger dependency list, removing it if necessary * * * ******************************************************************************/ @@ -3806,8 +3762,6 @@ static int dc_trigger_deplist_release(ZBX_DC_TRIGGER_DEPLIST *trigdep) /****************************************************************************** * * - * Function: dc_trigger_deplist_init * - * * * Purpose: initializes trigger dependency list * * * ******************************************************************************/ @@ -3821,8 +3775,6 @@ static void dc_trigger_deplist_init(ZBX_DC_TRIGGER_DEPLIST *trigdep, ZBX_DC_TRIG /****************************************************************************** * * - * Function: dc_trigger_deplist_reset * - * * * Purpose: resets trigger dependency list to release memory allocated by * * dependencies vector * * * @@ -4017,8 +3969,6 @@ static int dc_function_calculate_nextcheck(const zbx_trigger_timer_t *timer, tim /****************************************************************************** * * - * Function: dc_trigger_function_timer_create * - * * * Purpose: create trigger timer based on the trend function * * * * Return value: Created timer or NULL in the case of error. * @@ -4070,8 +4020,6 @@ static zbx_trigger_timer_t *dc_trigger_function_timer_create(ZBX_DC_FUNCTION *fu /****************************************************************************** * * - * Function: dc_trigger_timer_create * - * * * Purpose: create trigger timer based on the specified trigger * * * * Return value: Created timer or NULL in the case of error. * @@ -4097,8 +4045,6 @@ static zbx_trigger_timer_t *dc_trigger_timer_create(ZBX_DC_TRIGGER *trigger) /****************************************************************************** * * - * Function: dc_trigger_timer_free * - * * * Purpose: free trigger timer * * * ******************************************************************************/ @@ -4112,8 +4058,6 @@ static void dc_trigger_timer_free(zbx_trigger_timer_t *timer) /****************************************************************************** * * - * Function: dc_schedule_trigger_timer * - * * * Purpose: schedule trigger timer to be executed at the specified time * * * * Parameter: timer - [IN] the timer to schedule * @@ -4141,8 +4085,6 @@ static void dc_schedule_trigger_timer(zbx_trigger_timer_t *timer, const zbx_time /****************************************************************************** * * - * Function: dc_schedule_new_trigger_timers * - * * * Purpose: set timer schedule and evaluation times based on functions and * * old trend function queue * * * @@ -4320,8 +4262,6 @@ static void DCsync_functions(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dc_regexp_remove_expression * - * * * Purpose: removes expression from regexp * * * ******************************************************************************/ @@ -4348,8 +4288,6 @@ static ZBX_DC_REGEXP *dc_regexp_remove_expression(const char *regexp_name, zbx_u /****************************************************************************** * * - * Function: DCsync_expressions * - * * * Purpose: Updates expressions configuration cache * * * * Parameters: result - [IN] the result of expressions database select * @@ -4441,8 +4379,6 @@ static void DCsync_expressions(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: DCsync_actions * - * * * Purpose: Updates actions configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -4513,8 +4449,6 @@ static void DCsync_actions(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: DCsync_action_ops * - * * * Purpose: Updates action operation class flags in configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -4549,8 +4483,6 @@ static void DCsync_action_ops(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dc_compare_action_conditions_by_type * - * * * Purpose: compare two action conditions by their type * * * * Comments: This function is used to sort action conditions by type. * @@ -4568,8 +4500,6 @@ static int dc_compare_action_conditions_by_type(const void *d1, const void *d2) /****************************************************************************** * * - * Function: DCsync_action_conditions * - * * * Purpose: Updates action conditions configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -4673,8 +4603,6 @@ static void DCsync_action_conditions(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: DCsync_correlations * - * * * Purpose: Updates correlations configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -4743,8 +4671,6 @@ static void DCsync_correlations(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dc_corr_condition_get_size * - * * * Purpose: get the actual size of correlation condition data depending on * * its type * * * @@ -4777,8 +4703,6 @@ static size_t dc_corr_condition_get_size(unsigned char type) /****************************************************************************** * * - * Function: dc_corr_condition_init_data * - * * * Purpose: initializes correlation condition data from database row * * * * Parameters: condition - [IN] the condition to initialize * @@ -4826,8 +4750,6 @@ static void dc_corr_condition_init_data(zbx_dc_corr_condition_t *condition, int /****************************************************************************** * * - * Function: corr_condition_free_data * - * * * Purpose: frees correlation condition data * * * * Parameters: condition - [IN] the condition * @@ -4857,8 +4779,6 @@ static void corr_condition_free_data(zbx_dc_corr_condition_t *condition) /****************************************************************************** * * - * Function: dc_compare_corr_conditions_by_type * - * * * Purpose: compare two correlation conditions by their type * * * * Comments: This function is used to sort correlation conditions by type. * @@ -4876,8 +4796,6 @@ static int dc_compare_corr_conditions_by_type(const void *d1, const void *d2) /****************************************************************************** * * - * Function: DCsync_corr_conditions * - * * * Purpose: Updates correlation conditions configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -4985,8 +4903,6 @@ static void DCsync_corr_conditions(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: DCsync_corr_operations * - * * * Purpose: Updates correlation operations configuration cache * * * * Parameters: result - [IN] the result of correlation operations database * @@ -5069,8 +4985,6 @@ static int dc_compare_hgroups(const void *d1, const void *d2) /****************************************************************************** * * - * Function: DCsync_hostgroups * - * * * Purpose: Updates host groups configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -5137,8 +5051,6 @@ static void DCsync_hostgroups(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: DCsync_trigger_tags * - * * * Purpose: Updates trigger tags in configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -5222,8 +5134,6 @@ static void DCsync_trigger_tags(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: DCsync_item_tags * - * * * Purpose: Updates item tags in configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -5307,8 +5217,6 @@ static void DCsync_item_tags(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: DCsync_host_tags * - * * * Purpose: Updates host tags in configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -5405,8 +5313,6 @@ static void DCsync_host_tags(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dc_compare_itemscript_param * - * * * Purpose: compare two item script parameters * * * ******************************************************************************/ @@ -5423,8 +5329,6 @@ static int dc_compare_itemscript_param(const void *d1, const void *d2) /****************************************************************************** * * - * Function: dc_compare_item_preproc_by_step * - * * * Purpose: compare two item preprocessing operations by step * * * * Comments: This function is used to sort correlation conditions by type. * @@ -5448,8 +5352,6 @@ static int dc_compare_preprocops_by_step(const void *d1, const void *d2) /****************************************************************************** * * - * Function: DCsync_item_preproc * - * * * Purpose: Updates item preprocessing steps in configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -5568,8 +5470,6 @@ static void DCsync_item_preproc(zbx_dbsync_t *sync, int timestamp) /****************************************************************************** * * - * Function: DCsync_itemscript_param * - * * * Purpose: Updates item script parameters in configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -5678,8 +5578,6 @@ static void DCsync_itemscript_param(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: DCsync_hostgroup_hosts * - * * * Purpose: Updates group hosts in configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -5742,8 +5640,6 @@ static void DCsync_hostgroup_hosts(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dc_trigger_update_topology * - * * * Purpose: updates trigger topology after trigger dependency changes * * * ******************************************************************************/ @@ -5772,8 +5668,6 @@ static int zbx_default_ptr_pair_ptr_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: dc_trigger_update_cache * - * * * Purpose: updates trigger related cache data; * * 1) time triggers assigned to timer processes * * 2) trigger functionality (if it uses contain disabled * @@ -5858,8 +5752,6 @@ static void dc_trigger_update_cache(void) /****************************************************************************** * * - * Function: dc_hostgroups_update_cache * - * * * Purpose: updates hostgroup name index and resets nested group lists * * * ******************************************************************************/ @@ -5883,8 +5775,6 @@ static void dc_hostgroups_update_cache(void) /****************************************************************************** * * - * Function: dc_load_trigger_queue * - * * * Purpose: load trigger queue from database * * * * Comments: This function is called when syncing configuration cache for the * @@ -5925,8 +5815,6 @@ static void dc_load_trigger_queue(zbx_hashset_t *trend_functions) /****************************************************************************** * * - * Function: DCsync_configuration * - * * * Purpose: Synchronize configuration data from database * * * * Author: Alexander Vladishev, Aleksandrs Saveljevs * @@ -6990,8 +6878,6 @@ static int __config_data_session_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: init_configuration_cache * - * * * Purpose: Allocate shared memory for configuration cache * * * * Author: Alexander Vladishev, Aleksandrs Saveljevs * @@ -7187,8 +7073,6 @@ out: /****************************************************************************** * * - * Function: free_configuration_cache * - * * * Purpose: Free memory allocated for configuration cache * * * * Author: Alexei Vladishev, Aleksandrs Saveljevs * @@ -7213,8 +7097,6 @@ void free_configuration_cache(void) /****************************************************************************** * * - * Function: in_maintenance_without_data_collection * - * * * Parameters: maintenance_status - [IN] maintenance status * * HOST_MAINTENANCE_STATUS_* flag * * maintenance_type - [IN] maintenance type * @@ -7308,8 +7190,6 @@ static void DCget_host(DC_HOST *dst_host, const ZBX_DC_HOST *src_host, unsigned /****************************************************************************** * * - * Function: DCget_host_by_hostid * - * * * Purpose: Locate host in configuration cache * * * * Parameters: host - [OUT] pointer to DC_HOST structure * @@ -7340,8 +7220,6 @@ int DCget_host_by_hostid(DC_HOST *host, zbx_uint64_t hostid) /****************************************************************************** * * - * Function: DCcheck_proxy_permissions * - * * * Purpose: * * Check access rights for an active proxy and get the proxy ID * * * @@ -7469,8 +7347,6 @@ int DCcheck_proxy_permissions(const char *host, const zbx_socket_t *sock, zbx_ui #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) /****************************************************************************** * * - * Function: DCget_psk_by_identity * - * * * Purpose: * * Find PSK with the specified identity in configuration cache * * * @@ -7547,8 +7423,6 @@ size_t DCget_psk_by_identity(const unsigned char *psk_identity, unsigned char *p /****************************************************************************** * * - * Function: DCget_autoregistration_psk * - * * * Purpose: * * Copy autoregistration PSK identity and value from configuration cache * * into caller's buffers * @@ -8097,8 +7971,6 @@ static void DCclean_trigger(DC_TRIGGER *trigger) /****************************************************************************** * * - * Function: DCconfig_get_items_by_keys * - * * * Purpose: locate item in configuration cache by host and key * * * * Parameters: items - [OUT] pointer to array of DC_ITEM structures * @@ -8156,8 +8028,6 @@ int DCconfig_get_hostid_by_name(const char *host, zbx_uint64_t *hostid) /****************************************************************************** * * - * Function: DCconfig_get_items_by_itemids * - * * * Purpose: Get item with specified ID * * * * Parameters: items - [OUT] pointer to DC_ITEM structures * @@ -8249,8 +8119,6 @@ void DCconfig_get_items_by_itemids_partial(DC_ITEM *items, const zbx_uint64_t *i /****************************************************************************** * * - * Function: dc_preproc_item_init * - * * * Purpose: initialize new preprocessor item from configuration cache * * * * Parameters: item - [OUT] the item to initialize * @@ -8294,8 +8162,6 @@ static int dc_preproc_item_init(zbx_preproc_item_t *item, zbx_uint64_t itemid) /****************************************************************************** * * - * Function: DCconfig_get_preprocessable_items * - * * * Purpose: get preprocessable items: * * * items with preprocessing steps * * * items with dependent items * @@ -8460,8 +8326,6 @@ void DCconfig_get_triggers_by_triggerids(DC_TRIGGER *triggers, const zbx_uint64_ /****************************************************************************** * * - * Function: DCconfig_get_functions_by_functionids * - * * * Purpose: Get functions by IDs * * * * Parameters: functions - [OUT] pointer to DC_FUNCTION structures * @@ -8497,8 +8361,6 @@ void DCconfig_get_functions_by_functionids(DC_FUNCTION *functions, zbx_uint64_t /****************************************************************************** * * - * Function: DCconfig_clean_functions * - * * * Author: Alexander Vladishev * * * ******************************************************************************/ @@ -8530,8 +8392,6 @@ void DCconfig_clean_triggers(DC_TRIGGER *triggers, int *errcodes, size_t num) /****************************************************************************** * * - * Function: DCconfig_lock_triggers_by_history_items * - * * * Purpose: Lock triggers for specified items so that multiple processes do * * not process one trigger simultaneously. Otherwise, this leads to * * problems like multiple successive OK events or escalations being * @@ -8617,8 +8477,6 @@ next:; /****************************************************************************** * * - * Function: DCconfig_lock_triggers_by_triggerids * - * * * Purpose: Lock triggers so that multiple processes do not process one * * trigger simultaneously. * * * @@ -8653,8 +8511,6 @@ void DCconfig_lock_triggers_by_triggerids(zbx_vector_uint64_t *triggerids_in, zb /****************************************************************************** * * - * Function: DCconfig_unlock_triggers * - * * * Author: Aleksandrs Saveljevs * * * ******************************************************************************/ @@ -8679,8 +8535,6 @@ void DCconfig_unlock_triggers(const zbx_vector_uint64_t *triggerids) /****************************************************************************** * * - * Function: DCconfig_unlock_all_triggers * - * * * Purpose: Unlocks all locked triggers before doing full history sync at * * program exit * * * @@ -8702,8 +8556,6 @@ void DCconfig_unlock_all_triggers(void) /****************************************************************************** * * - * Function: DCconfig_get_triggers_by_itemids * - * * * Purpose: get enabled triggers for specified items * * * * Author: Aleksandrs Saveljevs * @@ -8761,8 +8613,6 @@ void DCconfig_get_triggers_by_itemids(zbx_hashset_t *trigger_info, zbx_vector_pt /****************************************************************************** * * - * Function: DCconfig_find_active_time_function * - * * * Purpose: check if the expression contains time based functions * * * * Parameters: expression - [IN] the original expression * @@ -8813,8 +8663,6 @@ out: /****************************************************************************** * * - * Function: zbx_dc_get_triggers_by_timers * - * * * Purpose: gets timer triggers from cache * * * * Parameters: trigger_info - [IN/OUT] triggers * @@ -8882,8 +8730,6 @@ void zbx_dc_get_triggers_by_timers(zbx_hashset_t *trigger_info, zbx_vector_ptr_t /****************************************************************************** * * - * Function: trigger_timer_validate * - * * * Purpose: validate trigger timer * * * * Parameters: timer - [IN] trigger timer * @@ -8934,8 +8780,6 @@ static int trigger_timer_validate(zbx_trigger_timer_t *timer, ZBX_DC_TRIGGER **d /****************************************************************************** * * - * Function: zbx_dc_get_trigger_timers * - * * * Purpose: gets timers from trigger queue * * * * Parameters: timers - [OUT] the timer triggers that must be processed * @@ -9037,8 +8881,6 @@ void zbx_dc_get_trigger_timers(zbx_vector_ptr_t *timers, int now, int soft_limit /****************************************************************************** * * - * Function: dc_reschedule_trigger_timers * - * * * Purpose: reschedule trigger timers * * * * Comments: Triggers are unlocked by DCconfig_unlock_triggers() * @@ -9086,8 +8928,6 @@ static void dc_reschedule_trigger_timers(zbx_vector_ptr_t *timers) /****************************************************************************** * * - * Function: zbx_dc_reschedule_trigger_timers * - * * * Purpose: reschedule trigger timers while locking configuration cache * * * * Comments: Triggers are unlocked by DCconfig_unlock_triggers() * @@ -9117,8 +8957,6 @@ void zbx_dc_reschedule_trigger_timers(zbx_vector_ptr_t *timers, int now) /****************************************************************************** * * - * Function: zbx_dc_get_timer_queue * - * * * Purpose: clears timer trigger queue * * * ******************************************************************************/ @@ -9153,8 +8991,6 @@ void zbx_dc_clear_timer_queue(zbx_vector_ptr_t *timers) /****************************************************************************** * * - * Function: zbx_dc_free_timers * - * * ******************************************************************************/ void zbx_dc_free_timers(zbx_vector_ptr_t *timers) { @@ -9266,8 +9102,6 @@ static int dc_get_interface_by_type(DC_INTERFACE *interface, zbx_uint64_t hostid /****************************************************************************** * * - * Function: DCconfig_get_interface_by_type * - * * * Purpose: Locate main interface of specified type in configuration cache * * * * Parameters: interface - [OUT] pointer to DC_INTERFACE structure * @@ -9292,8 +9126,6 @@ int DCconfig_get_interface_by_type(DC_INTERFACE *interface, zbx_uint64_t hostid, /****************************************************************************** * * - * Function: DCconfig_get_interface * - * * * Purpose: Locate interface in configuration cache * * * * Parameters: interface - [OUT] pointer to DC_INTERFACE structure * @@ -9349,8 +9181,6 @@ unlock: /****************************************************************************** * * - * Function: dc_config_get_queue_nextcheck * - * * * Purpose: Get nextcheck for selected queue * * * * Parameters: queue - [IN] the queue * @@ -9379,8 +9209,6 @@ static int dc_config_get_queue_nextcheck(zbx_binary_heap_t *queue) /****************************************************************************** * * - * Function: DCconfig_get_poller_nextcheck * - * * * Purpose: Get nextcheck for selected poller * * * * Parameters: poller_type - [IN] poller type (ZBX_POLLER_TYPE_...) * @@ -9427,8 +9255,6 @@ static void dc_requeue_item(ZBX_DC_ITEM *dc_item, const ZBX_DC_HOST *dc_host, co /****************************************************************************** * * - * Function: dc_requeue_item_at * - * * * Purpose: requeues items at the specified time * * * * Parameters: dc_item - [IN] the item to reque * @@ -9454,8 +9280,6 @@ static void dc_requeue_item_at(ZBX_DC_ITEM *dc_item, ZBX_DC_HOST *dc_host, int n /****************************************************************************** * * - * Function: DCconfig_get_poller_items * - * * * Purpose: Get array of items for selected poller * * * * Parameters: poller_type - [IN] poller type (ZBX_POLLER_TYPE_...) * @@ -9614,8 +9438,6 @@ int DCconfig_get_poller_items(unsigned char poller_type, DC_ITEM **items) /****************************************************************************** * * - * Function: DCconfig_get_ipmi_poller_items * - * * * Purpose: Get array of items for IPMI poller * * * * Parameters: now - [IN] current timestamp * @@ -9709,8 +9531,6 @@ int DCconfig_get_ipmi_poller_items(int now, DC_ITEM *items, int items_num, int * /****************************************************************************** * * - * Function: DCconfig_get_snmp_interfaceids_by_addr * - * * * Purpose: get array of interface IDs for the specified address * * * * Return value: number of interface IDs returned * @@ -9749,8 +9569,6 @@ unlock: /****************************************************************************** * * - * Function: DCconfig_get_snmp_items_by_interfaceid * - * * * Purpose: get array of snmp trap items for the specified interfaceid * * * * Return value: number of items returned * @@ -9891,8 +9709,6 @@ void DCpoller_requeue_items(const zbx_uint64_t *itemids, const int *lastclocks, /****************************************************************************** * * - * Function: zbx_dc_requeue_unreachable_items * - * * * Purpose: requeue unreachable items * * * * Parameters: itemids - [IN] the item id array * @@ -9942,8 +9758,6 @@ void zbx_dc_requeue_unreachable_items(zbx_uint64_t *itemids, size_t itemids_num) /****************************************************************************** * * - * Function: DCinterface_get_agent_availability * - * * * Purpose: get interface availability data for the specified agent * * * * Parameters: dc_interface - [IN] the interface * @@ -9996,8 +9810,6 @@ static void DCagent_set_availability(zbx_agent_availability_t *av, unsigned cha /****************************************************************************** * * - * Function: DCinterface_set_agent_availability * - * * * Purpose: set interface availability data in configuration cache * * * * Parameters: dc_interface - [OUT] the interface * @@ -10030,8 +9842,6 @@ static int DCinterface_set_agent_availability(ZBX_DC_INTERFACE *dc_interface, in /****************************************************************************** * * - * Function: DCinterface_set_availability * - * * * Purpose: set interface availability data in configuration cache * * * * Parameters: dc_interface - [OUT] the interface * @@ -10066,8 +9876,6 @@ static int DCinterface_set_availability(ZBX_DC_INTERFACE *dc_interface, int now, /****************************************************************************** * * - * Function: zbx_interface_availability_init * - * * * Purpose: initializes interface availability data * * * * Parameters: availability - [IN/OUT] interface availability data * @@ -10082,8 +9890,6 @@ void zbx_interface_availability_init(zbx_interface_availability_t *availability, /******************************************************************************** * * - * Function: zbx_interface_availability_clean * - * * * Purpose: releases resources allocated to store interface availability data * * * * Parameters: ia - [IN] interface availability data * @@ -10096,8 +9902,6 @@ void zbx_interface_availability_clean(zbx_interface_availability_t *ia) /****************************************************************************** * * - * Function: zbx_interface_availability_free * - * * * Purpose: frees interface availability data * * * * Parameters: availability - [IN] interface availability data * @@ -10112,8 +9916,6 @@ void zbx_interface_availability_free(zbx_interface_availability_t *availability) ZBX_PTR_VECTOR_IMPL(availability_ptr, zbx_interface_availability_t *) /****************************************************************************** * * - * Function: zbx_agent_availability_init * - * * * Purpose: initializes agent availability with the specified data * * * * Parameters: agent - [IN/OUT] agent availability data * @@ -10135,8 +9937,6 @@ static void zbx_agent_availability_init(zbx_agent_availability_t *agent, unsigne /****************************************************************************** * * - * Function: zbx_interface_availability_is_set * - * * * Purpose: checks interface availability if agent availability field is set * * * * Parameters: ia - [IN] interface availability data * @@ -10194,8 +9994,6 @@ int zbx_interface_availability_is_set(const zbx_interface_availability_t *ia) /******************************************************************************* * * - * Function: DCinterface_activate * - * * * Purpose: set interface as available based on the agent availability data * * * * Parameters: interfaceid - [IN] the interface identifier * @@ -10257,8 +10055,6 @@ out: /************************************************************************************ * * - * Function: DCinterface_deactivate * - * * * Purpose: attempt to set interface as unavailable based on agent availability * * * * Parameters: interfaceid - [IN] the interface identifier * @@ -10359,8 +10155,6 @@ out: /****************************************************************************** * * - * Function: DCset_interfaces_availability * - * * * Purpose: update availability of interfaces in configuration cache and * * return the updated field flags * * * @@ -10480,8 +10274,6 @@ static int DCconfig_check_trigger_dependencies_rec(const ZBX_DC_TRIGGER_DEPLIST /****************************************************************************** * * - * Function: DCconfig_check_trigger_dependencies * - * * * Purpose: check whether any of trigger dependencies have value PROBLEM * * * * Return value: SUCCEED - trigger can change its value * @@ -10555,8 +10347,6 @@ exit: /****************************************************************************** * * - * Function: DCconfig_sort_triggers_topologically * - * * * Purpose: assign each trigger an index based on trigger dependency topology * * * * Author: Aleksandrs Saveljevs * @@ -10583,8 +10373,6 @@ static void DCconfig_sort_triggers_topologically(void) /****************************************************************************** * * - * Function: DCconfig_triggers_apply_changes * - * * * Purpose: apply trigger value,state,lastchange or error changes to * * configuration cache after committed to database * * * @@ -10625,8 +10413,6 @@ void DCconfig_triggers_apply_changes(zbx_vector_ptr_t *trigger_diff) /****************************************************************************** * * - * Function: DCconfig_get_stats * - * * * Purpose: get statistics of the database cache * * * * Author: Alexander Vladishev, Aleksandrs Saveljevs * @@ -10739,8 +10525,6 @@ int DCconfig_get_last_sync_time(void) /****************************************************************************** * * - * Function: DCconfig_get_proxypoller_hosts * - * * * Purpose: Get array of proxies for proxy poller * * * * Parameters: hosts - [OUT] array of hosts * @@ -10794,8 +10578,6 @@ int DCconfig_get_proxypoller_hosts(DC_PROXY *proxies, int max_hosts) /****************************************************************************** * * - * Function: DCconfig_get_proxypoller_nextcheck * - * * * Purpose: Get nextcheck for passive proxies * * * * Return value: nextcheck or FAIL if no passive proxies in queue * @@ -11086,8 +10868,6 @@ out: /****************************************************************************** * * - * Function: dc_expand_user_macros * - * * * Purpose: expand user macros in the specified text value * * * * Parameters: text - [IN] the text value to expand * @@ -11170,8 +10950,6 @@ int dc_expand_user_macros_len(const char *text, size_t text_len, zbx_uint64_t *h /****************************************************************************** * * - * Function: zbx_dc_expand_user_macros_len * - * * * Purpose: expand user macros in the specified text * * * * Parameters: text - [IN] the text value to expand * @@ -11206,8 +10984,6 @@ int zbx_dc_expand_user_macros_len(const char *text, size_t text_len, zbx_uint64_ /****************************************************************************** * * - * Function: dc_expand_user_macros * - * * * Purpose: expand user macros in the specified text value * * WARNING - DO NOT USE FOR TRIGGERS, for triggers use the dedicated function * * * @@ -11269,8 +11045,6 @@ char *dc_expand_user_macros(const char *text, zbx_uint64_t *hostids, int hostids /****************************************************************************** * * - * Function: zbx_dc_expand_user_macros * - * * * Purpose: expand user macros in the specified text value * * * * Parameters: text - [IN] the text value to expand * @@ -11295,8 +11069,6 @@ char *zbx_dc_expand_user_macros(const char *text, zbx_uint64_t hostid) /****************************************************************************** * * - * Function: DCfree_item_queue * - * * * Purpose: frees the item queue data vector created by DCget_item_queue() * * * * Parameters: queue - [IN] the item queue data vector to free * @@ -11312,8 +11084,6 @@ void DCfree_item_queue(zbx_vector_ptr_t *queue) /****************************************************************************** * * - * Function: DCget_item_queue * - * * * Purpose: retrieves vector of delayed items * * * * Parameters: queue - [OUT] the vector of delayed items (optional) * @@ -11406,8 +11176,6 @@ int DCget_item_queue(zbx_vector_ptr_t *queue, int from, int to) /****************************************************************************** * * - * Function: dc_trigger_items_hosts_enabled * - * * * Purpose: check that functionids in trigger (recovery) expression * * * * Parameters: expression - [IN] trigger (recovery) expression * @@ -11459,8 +11227,6 @@ out: /****************************************************************************** * * - * Function: dc_status_update * - * * * Purpose: check when status information stored in configuration cache was * * updated last time and update it if necessary * * * @@ -11668,8 +11434,6 @@ static void dc_status_update(void) /****************************************************************************** * * - * Function: DCget_item_count * - * * * Purpose: return the number of active items * * * * Parameters: hostid - [IN] the host id, pass 0 to specify all hosts * @@ -11700,8 +11464,6 @@ zbx_uint64_t DCget_item_count(zbx_uint64_t hostid) /****************************************************************************** * * - * Function: DCget_item_unsupported_count * - * * * Purpose: return the number of active unsupported items * * * * Parameters: hostid - [IN] the host id, pass 0 to specify all hosts * @@ -11732,8 +11494,6 @@ zbx_uint64_t DCget_item_unsupported_count(zbx_uint64_t hostid) /****************************************************************************** * * - * Function: DCget_trigger_count * - * * * Purpose: count active triggers * * * ******************************************************************************/ @@ -11754,8 +11514,6 @@ zbx_uint64_t DCget_trigger_count(void) /****************************************************************************** * * - * Function: DCget_host_count * - * * * Purpose: count monitored and not monitored hosts * * * ******************************************************************************/ @@ -11776,8 +11534,6 @@ zbx_uint64_t DCget_host_count(void) /****************************************************************************** * * - * Function: DCget_required_performance * - * * * Return value: the required nvps number * * * ******************************************************************************/ @@ -11798,8 +11554,6 @@ double DCget_required_performance(void) /****************************************************************************** * * - * Function: DCget_count_stats_all * - * * * Purpose: retrieves all internal metrics of the configuration cache * * * * Parameters: stats - [OUT] the configuration cache statistics * @@ -11887,8 +11641,6 @@ void DCget_status(zbx_vector_ptr_t *hosts_monitored, zbx_vector_ptr_t *hosts_not /****************************************************************************** * * - * Function: DCget_expressions_by_names * - * * * Purpose: retrieves global expression data from cache * * * * Parameters: expressions - [OUT] a vector of expression data pointers * @@ -11939,8 +11691,6 @@ void DCget_expressions_by_names(zbx_vector_ptr_t *expressions, const char * cons /****************************************************************************** * * - * Function: DCget_expression * - * * * Purpose: retrieves regular expression data from cache * * * * Parameters: expressions - [OUT] a vector of expression data pointers * @@ -11957,8 +11707,6 @@ void DCget_expressions_by_name(zbx_vector_ptr_t *expressions, const char *name) /****************************************************************************** * * - * Function: DCget_data_expected_from * - * * * Purpose: Returns time since which data is expected for the given item. We * * would not mind not having data for the item before that time, but * * since that time we expect data to be coming. * @@ -11998,8 +11746,6 @@ unlock: /****************************************************************************** * * - * Function: dc_get_hostids_by_functionids * - * * * Purpose: get host identifiers for the specified list of functions * * * * Parameters: functionids - [IN] the function ids * @@ -12031,8 +11777,6 @@ void dc_get_hostids_by_functionids(const zbx_uint64_t *functionids, int function /****************************************************************************** * * - * Function: DCget_hostids_by_functionids * - * * * Purpose: get function host ids grouped by an object (trigger) id * * * * Parameters: functionids - [IN] the function ids * @@ -12054,8 +11798,6 @@ void DCget_hostids_by_functionids(zbx_vector_uint64_t *functionids, zbx_vector_u /****************************************************************************** * * - * Function: dc_get_hosts_by_functionids * - * * * Purpose: get hosts for the specified list of functions * * * * Parameters: functionids - [IN] the function ids * @@ -12089,8 +11831,6 @@ static void dc_get_hosts_by_functionids(const zbx_uint64_t *functionids, int fun /****************************************************************************** * * - * Function: DCget_hosts_by_functionids * - * * * Purpose: get hosts for the specified list of functions * * * * Parameters: functionids - [IN] the function ids * @@ -12112,8 +11852,6 @@ void DCget_hosts_by_functionids(const zbx_vector_uint64_t *functionids, zbx_hash /****************************************************************************** * * - * Function: DCget_internal_action_count * - * * * Purpose: get number of enabled internal actions * * * * Return value: number of enabled internal actions * @@ -12134,8 +11872,6 @@ unsigned int DCget_internal_action_count(void) /****************************************************************************** * * - * Function: zbx_config_get * - * * * Purpose: get global configuration data * * * * Parameters: cfg - [OUT] the global configuration data * @@ -12196,8 +11932,6 @@ void zbx_config_get(zbx_config_t *cfg, zbx_uint64_t flags) /****************************************************************************** * * - * Function: zbx_config_get_hk_mode * - * * * Purpose: get housekeeping mode for history and trends tables * * * * Parameters: history_mode - [OUT] history housekeeping mode, can be either * @@ -12216,8 +11950,6 @@ void zbx_config_get_hk_mode(unsigned char *history_mode, unsigned char *trends_m /****************************************************************************** * * - * Function: zbx_config_clean * - * * * Purpose: cleans global configuration data structure filled * * by zbx_config_get() function * * * @@ -12245,8 +11977,6 @@ void zbx_config_clean(zbx_config_t *cfg) /********************************************************************************* * * - * Function: DCreset_interfaces_availability * - * * * Purpose: resets interfaces availability for disabled hosts and hosts * * without enabled items for the corresponding interface * * * @@ -12342,8 +12072,6 @@ int DCreset_interfaces_availability(zbx_vector_availability_ptr_t *interfaces) /******************************************************************************* * * - * Function: DCget_interfaces_availability * - * * * Purpose: gets availability data for interfaces with availability data * * changed in period from last availability update to the specified * * timestamp * @@ -12394,8 +12122,6 @@ int DCget_interfaces_availability(zbx_vector_ptr_t *interfaces, int *ts) /****************************************************************************** * * - * Function: DCtouch_interfaces_availability * - * * * Purpose: sets availability timestamp to current time for the specified * * interfaces * * * @@ -12426,8 +12152,6 @@ void DCtouch_interfaces_availability(const zbx_vector_uint64_t *interfaceids) /****************************************************************************** * * - * Function: dc_action_copy_conditions * - * * * Purpose: copies configuration cache action conditions to the specified * * vector * * * @@ -12463,8 +12187,6 @@ static void dc_action_copy_conditions(const zbx_dc_action_t *dc_action, zbx_vect /****************************************************************************** * * - * Function: dc_action_eval_create * - * * * Purpose: creates action evaluation data from configuration cache action * * * * Parameters: dc_action - [IN] the source action * @@ -12495,8 +12217,6 @@ static zbx_action_eval_t *dc_action_eval_create(const zbx_dc_action_t *dc_action /****************************************************************************** * * - * Function: zbx_dc_get_actions_eval * - * * * Purpose: gets action evaluation data * * * * Parameters: actions - [OUT] the action evaluation data * @@ -12534,8 +12254,6 @@ void zbx_dc_get_actions_eval(zbx_vector_ptr_t *actions, unsigned char opflags) /****************************************************************************** * * - * Function: zbx_set_availability_update_ts * - * * * Purpose: sets timestamp of the last availability update * * * * Parameter: ts - [IN] the last availability update timestamp * @@ -12552,8 +12270,6 @@ void zbx_set_availability_diff_ts(int ts) /****************************************************************************** * * - * Function: corr_condition_clean * - * * * Purpose: frees correlation condition * * * * Parameter: condition - [IN] the condition to free * @@ -12583,8 +12299,6 @@ static void corr_condition_clean(zbx_corr_condition_t *condition) /****************************************************************************** * * - * Function: dc_correlation_free * - * * * Purpose: frees global correlation rule * * * * Parameter: condition - [IN] the condition to free * @@ -12604,8 +12318,6 @@ static void dc_correlation_free(zbx_correlation_t *correlation) /****************************************************************************** * * - * Function: dc_corr_condition_copy * - * * * Purpose: copies cached correlation condition to memory * * * * Parameter: dc_condition - [IN] the condition to copy * @@ -12645,8 +12357,6 @@ static void dc_corr_condition_copy(const zbx_dc_corr_condition_t *dc_condition, /****************************************************************************** * * - * Function: zbx_dc_corr_operation_dup * - * * * Purpose: clones cached correlation operation to memory * * * * Parameter: operation - [IN] the operation to clone * @@ -12666,8 +12376,6 @@ static zbx_corr_operation_t *zbx_dc_corr_operation_dup(const zbx_dc_corr_operati /****************************************************************************** * * - * Function: dc_correlation_formula_dup * - * * * Purpose: clones cached correlation formula, generating it if necessary * * * * Parameter: correlation - [IN] the correlation * @@ -12788,8 +12496,6 @@ void zbx_dc_correlation_rules_free(zbx_correlation_rules_t *rules) /****************************************************************************** * * - * Function: zbx_dc_correlation_get_rules * - * * * Purpose: gets correlation rules from configuration cache * * * * Parameter: rules - [IN/OUT] the correlation rules * @@ -12855,8 +12561,6 @@ void zbx_dc_correlation_rules_get(zbx_correlation_rules_t *rules) /****************************************************************************** * * - * Function: dc_hostgroup_cache_nested_groupids * - * * * Purpose: cache nested group identifiers * * * ******************************************************************************/ @@ -12891,8 +12595,6 @@ void dc_hostgroup_cache_nested_groupids(zbx_dc_hostgroup_t *parent_group) /****************************************************************************** * * - * Function: dc_maintenance_precache_nested_groups * - * * * Purpose: pre-caches nested groups for groups used in running maintenances * * * ******************************************************************************/ @@ -12935,8 +12637,6 @@ static void dc_maintenance_precache_nested_groups(void) /****************************************************************************** * * - * Function: dc_get_nested_hostgroupids * - * * * Purpose: gets nested group ids for the specified host group * * (including the target group id) * * * @@ -12969,8 +12669,6 @@ void dc_get_nested_hostgroupids(zbx_uint64_t groupid, zbx_vector_uint64_t *neste /****************************************************************************** * * - * Function: zbx_dc_get_nested_hostgroupids * - * * * Purpose: gets nested group ids for the specified host groups * * * * Parameter: groupids - [IN] the parent group identifiers * @@ -12995,8 +12693,6 @@ void zbx_dc_get_nested_hostgroupids(zbx_uint64_t *groupids, int groupids_num, zb /****************************************************************************** * * - * Function: zbx_dc_get_hostids_by_group_name * - * * * Purpose: gets hostids belonging to the group and its nested groups * * * * Parameter: name - [IN] the group name * @@ -13055,8 +12751,6 @@ void zbx_dc_get_hostids_by_group_name(const char *name, zbx_vector_uint64_t *hos /****************************************************************************** * * - * Function: zbx_dc_get_active_proxy_by_name * - * * * Purpose: gets active proxy data by its name from configuration cache * * * * Parameters: * @@ -13105,8 +12799,6 @@ out: /****************************************************************************** * * - * Function: zbx_dc_items_update_nextcheck * - * * * Purpose: updates item nextcheck values in configuration cache * * * * Parameters: items - [IN] the items to update * @@ -13162,8 +12854,6 @@ void zbx_dc_items_update_nextcheck(DC_ITEM *items, zbx_agent_value_t *values, in /****************************************************************************** * * - * Function: zbx_dc_get_host_interfaces * - * * * Purpose: get data of all network interfaces for a host in configuration * * cache * * * @@ -13241,8 +12931,6 @@ unlock: /****************************************************************************** * * - * Function: DCconfig_items_apply_changes * - * * * Purpose: apply item state, error, mtime, lastlogsize changes to * * configuration cache * * * @@ -13283,8 +12971,6 @@ void DCconfig_items_apply_changes(const zbx_vector_ptr_t *item_diff) /****************************************************************************** * * - * Function: DCconfig_update_inventory_values * - * * * Purpose: update automatic inventory in configuration cache * * * ******************************************************************************/ @@ -13318,8 +13004,6 @@ void DCconfig_update_inventory_values(const zbx_vector_ptr_t *inventory_values) /****************************************************************************** * * - * Function: dc_get_host_inventory_value_by_hostid * - * * * Purpose: find inventory value in automatically populated cache, if not * * found then look in main inventory cache * * * @@ -13350,8 +13034,6 @@ static int dc_get_host_inventory_value_by_hostid(zbx_uint64_t hostid, char **rep /****************************************************************************** * * - * Function: DCget_host_inventory_value_by_itemid * - * * * Purpose: find inventory value in automatically populated cache, if not * * found then look in main inventory cache * * * @@ -13373,8 +13055,6 @@ int DCget_host_inventory_value_by_itemid(zbx_uint64_t itemid, char **replace_to, /****************************************************************************** * * - * Function: DCget_host_inventory_value_by_hostid * - * * * Purpose: find inventory value in automatically populated cache, if not * * found then look in main inventory cache * * * @@ -13394,8 +13074,6 @@ int DCget_host_inventory_value_by_hostid(zbx_uint64_t hostid, char **replace_to, /****************************************************************************** * * - * Function: zbx_dc_get_trigger_dependencies * - * * * Purpose: checks/returns trigger dependencies for a set of triggers * * * * Parameter: triggerids - [IN] the currently processing trigger ids * @@ -13459,8 +13137,6 @@ void zbx_dc_get_trigger_dependencies(const zbx_vector_uint64_t *triggerids, zbx_ /****************************************************************************** * * - * Function: zbx_dc_reschedule_items * - * * * Purpose: reschedules items that are processed by the target daemon * * * * Parameter: itemids - [IN] the item identifiers * @@ -13515,8 +13191,6 @@ void zbx_dc_reschedule_items(const zbx_vector_uint64_t *itemids, int nextcheck, /****************************************************************************** * * - * Function: zbx_dc_proxy_update_nodata * - * * * Purpose: stop suppress mode of the nodata() trigger * * * * Parameter: subscriptions - [IN] the array of trigger id and time of values * @@ -13564,8 +13238,6 @@ void zbx_dc_proxy_update_nodata(zbx_vector_uint64_pair_t *subscriptions) /****************************************************************************** * * - * Function: zbx_dc_update_proxy * - * * * Purpose: updates changed proxy data in configuration cache and updates * * diff flags to reflect the updated data * * * @@ -13655,8 +13327,6 @@ void zbx_dc_update_proxy(zbx_proxy_diff_t *diff) /****************************************************************************** * * - * Function: zbx_dc_get_proxy_lastaccess * - * * * Purpose: returns proxy lastaccess changes since last lastaccess request * * * * Parameter: lastaccess - [OUT] last access updates for proxies that need * @@ -13697,8 +13367,6 @@ void zbx_dc_get_proxy_lastaccess(zbx_vector_uint64_pair_t *lastaccess) /****************************************************************************** * * - * Function: zbx_dc_get_session_token * - * * * Purpose: returns session token * * * * Return value: pointer to session token (NULL for server). * @@ -13715,8 +13383,6 @@ const char *zbx_dc_get_session_token(void) /****************************************************************************** * * - * Function: zbx_dc_get_or_create_data_session * - * * * Purpose: returns data session, creates a new session if none found * * * * Parameter: hostid - [IN] the host (proxy) identifier * @@ -13761,8 +13427,6 @@ zbx_data_session_t *zbx_dc_get_or_create_data_session(zbx_uint64_t hostid, const /****************************************************************************** * * - * Function: zbx_dc_cleanup_data_sessions * - * * * Purpose: removes data sessions not accessed for 24 hours * * * ******************************************************************************/ @@ -13910,8 +13574,6 @@ void zbx_dc_get_item_tags_by_functionids(const zbx_uint64_t *functionids, size_t /****************************************************************************** * * - * Function: DCget_proxy_nodata_win * - * * * Purpose: retrieves proxy suppress window data from the cache * * * * Parameters: hostid - [IN] proxy host id * @@ -13950,8 +13612,6 @@ int DCget_proxy_nodata_win(zbx_uint64_t hostid, zbx_proxy_suppress_t *nodata_win /****************************************************************************** * * - * Function: DCget_proxy_delay * - * * * Purpose: retrieves proxy delay from the cache * * * * Parameters: hostid - [IN] proxy host id * @@ -13984,8 +13644,6 @@ int DCget_proxy_delay(zbx_uint64_t hostid, int *delay) /****************************************************************************** * * - * Function: DCget_proxy_delay_by_name * - * * * Purpose: retrieves proxy delay from the cache * * * * Parameters: name - [IN] proxy host name * @@ -14021,8 +13679,6 @@ int DCget_proxy_delay_by_name(const char *name, int *delay, char **error) /****************************************************************************** * * - * Function: zbx_dc_set_macro_env * - * * * Purpose: sets user macro environment security level * * * * Parameter: env - [IN] the security level (see ZBX_MACRO_ENV_* defines) * @@ -14040,8 +13696,6 @@ unsigned char zbx_dc_set_macro_env(unsigned char env) /****************************************************************************** * * - * Function: zbx_dc_get_instanceid * - * * * Purpose: returns server/proxy instance id * * * * Return value: the instance id * @@ -14056,8 +13710,6 @@ const char *zbx_dc_get_instanceid(void) /****************************************************************************** * * - * Function: dc_expand_user_macros_in_func_params * - * * * Purpose: expand user macros in trigger function parameters * * * * Parameters: params - [IN] the function parameters * @@ -14107,8 +13759,6 @@ char *dc_expand_user_macros_in_func_params(const char *params, zbx_uint64_t host /********************************************************************************* * * - * Function: zbx_get_host_interfaces_availability * - * * * Purpose: get host interfaces availability * * * * Parameters: hostid - [IN] the host id * @@ -14157,8 +13807,6 @@ void zbx_get_host_interfaces_availability(zbx_uint64_t hostid, zbx_agent_availab /********************************************************************************* * * - * Function: zbx_dc_eval_expand_user_macros * - * * * Purpose: resolve user macros in parsed expression * * * * Parameters: ctx - [IN] the expression evaluation context * diff --git a/src/libs/zbxdbcache/dbconfig_maintenance.c b/src/libs/zbxdbcache/dbconfig_maintenance.c index 4d834306251..efcb7c55a77 100644 --- a/src/libs/zbxdbcache/dbconfig_maintenance.c +++ b/src/libs/zbxdbcache/dbconfig_maintenance.c @@ -46,8 +46,6 @@ zbx_host_event_maintenance_t; /****************************************************************************** * * - * Function: DCsync_maintenances * - * * * Purpose: Updates maintenances in configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -126,8 +124,6 @@ void DCsync_maintenances(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dc_compare_maintenance_tags * - * * * Purpose: compare maintenance tags by tag name for sorting * * * ******************************************************************************/ @@ -141,8 +137,6 @@ static int dc_compare_maintenance_tags(const void *d1, const void *d2) /****************************************************************************** * * - * Function: DCsync_maintenance_tags * - * * * Purpose: Updates maintenance tags in configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -246,8 +240,6 @@ void DCsync_maintenance_tags(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: DCsync_maintenance_periods * - * * * Purpose: Updates maintenance period in configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -338,8 +330,6 @@ void DCsync_maintenance_periods(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: DCsync_maintenance_groups * - * * * Purpose: Updates maintenance groups in configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -411,8 +401,6 @@ void DCsync_maintenance_groups(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: DCsync_maintenance_hosts * - * * * Purpose: Updates maintenance hosts in configuration cache * * * * Parameters: sync - [IN] the db synchronization data * @@ -500,8 +488,6 @@ void DCsync_maintenance_hosts(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dc_subtract_time * - * * * Purpose: subtract two local times with DST correction * * * * Parameter: minuend - [IN] the minuend time * @@ -525,8 +511,6 @@ static time_t dc_subtract_time(time_t minuend, int subtrahend, struct tm *tm) /****************************************************************************** * * - * Function: dc_calculate_maintenance_period * - * * * Purpose: calculate start time for the specified maintenance period * * * * Parameter: maintenance - [IN] the maintenance * @@ -651,8 +635,6 @@ static int dc_calculate_maintenance_period(const zbx_dc_maintenance_t *maintenan /****************************************************************************** * * - * Function: dc_check_maintenance_period * - * * * Purpose: calculates start time for the specified maintenance period and * * checks if we are inside the maintenance period * * * @@ -703,8 +685,6 @@ out: /****************************************************************************** * * - * Function: zbx_dc_maintenance_set_update_flags * - * * * Purpose: sets maintenance update flags for all timers * * * ******************************************************************************/ @@ -724,8 +704,6 @@ void zbx_dc_maintenance_set_update_flags(void) /****************************************************************************** * * - * Function: zbx_dc_maintenance_reset_update_flag * - * * * Purpose: resets maintenance update flags for the specified timer * * * * Parameters: timer - [IN] the timer process number * @@ -751,8 +729,6 @@ void zbx_dc_maintenance_reset_update_flag(int timer) /****************************************************************************** * * - * Function: zbx_dc_maintenance_check_update_flag * - * * * Purpose: checks if the maintenance update flag is set for the specified * * timer * * * @@ -783,8 +759,6 @@ int zbx_dc_maintenance_check_update_flag(int timer) /****************************************************************************** * * - * Function: zbx_dc_maintenance_check_update_flags * - * * * Purpose: checks if at least one maintenance update flag is set * * * * Return value: SUCCEED - a maintenance update flag is set * @@ -815,8 +789,6 @@ out: /****************************************************************************** * * - * Function: zbx_dc_update_maintenances * - * * * Purpose: update maintenance state depending on maintenance periods * * * * Return value: SUCCEED - maintenance status was changed, host/event update * @@ -930,8 +902,6 @@ int zbx_dc_update_maintenances(void) /****************************************************************************** * * - * Function: dc_assign_maintenance_to_host * - * * * Purpose: assign maintenance to a host, host can only be in one maintenance * * * * Parameters: host_maintenances - [OUT] host with maintenance * @@ -960,8 +930,6 @@ static void dc_assign_maintenance_to_host(zbx_hashset_t *host_maintenances, zbx_ /****************************************************************************** * * - * Function: dc_assign_event_maintenance_to_host * - * * * Purpose: assign maintenance to a host that event belongs to, events can be * * in multiple maintenances at a time * * * @@ -995,8 +963,6 @@ typedef void (*assign_maintenance_to_host_f)(zbx_hashset_t *host_maintenances, /****************************************************************************** * * - * Function: dc_get_host_maintenances_by_ids * - * * * Purpose: get hosts and their maintenances * * * * Parameters: maintenanceids - [IN] the maintenance ids * @@ -1060,8 +1026,6 @@ static void dc_get_host_maintenances_by_ids(const zbx_vector_uint64_t *maintenan /****************************************************************************** * * - * Function: dc_get_host_maintenance_updates * - * * * Purpose: gets maintenance updates for all hosts * * * * Parameters: host_maintenances - [IN] the maintenances running on hosts * @@ -1130,8 +1094,6 @@ static void dc_get_host_maintenance_updates(zbx_hashset_t *host_maintenances, zb /****************************************************************************** * * - * Function: zbx_dc_flush_host_maintenance_updates * - * * * Purpose: flush host maintenance updates to configuration cache * * * * Parameters: updates - [IN] the updates to flush * @@ -1190,8 +1152,6 @@ void zbx_dc_flush_host_maintenance_updates(const zbx_vector_ptr_t *updates) /****************************************************************************** * * - * Function: zbx_dc_get_host_maintenance_updates * - * * * Purpose: calculates required host maintenance updates based on specified * * maintenances * * * @@ -1232,8 +1192,6 @@ void zbx_dc_get_host_maintenance_updates(const zbx_vector_uint64_t *maintenancei /****************************************************************************** * * - * Function: dc_maintenance_tag_match * - * * * Purpose: perform maintenance tag comparison using maintenance tag operator * * * ******************************************************************************/ @@ -1253,8 +1211,6 @@ static int dc_maintenance_tag_value_match(const zbx_dc_maintenance_tag_t *mt, co /****************************************************************************** * * - * Function: dc_maintenance_match_tag_range * - * * * Purpose: matches tags with [*mt_pos] maintenance tag name * * * * Parameters: mtags - [IN] the maintenance tags, sorted by tag names * @@ -1349,8 +1305,6 @@ static int dc_maintenance_match_tag_range(const zbx_vector_ptr_t *mtags, const z /****************************************************************************** * * - * Function: dc_maintenance_match_tags_or * - * * * Purpose: matches maintenance and event tags using OR eval type * * * * Parameters: mtags - [IN] the maintenance tags, sorted by tag names * @@ -1375,8 +1329,6 @@ static int dc_maintenance_match_tags_or(const zbx_dc_maintenance_t *maintenance, /****************************************************************************** * * - * Function: dc_maintenance_match_tags_andor * - * * * Purpose: matches maintenance and event tags using AND/OR eval type * * * * Parameters: mtags - [IN] the maintenance tags, sorted by tag names * @@ -1404,8 +1356,6 @@ static int dc_maintenance_match_tags_andor(const zbx_dc_maintenance_t *maintenan /****************************************************************************** * * - * Function: dc_maintenance_match_tags * - * * * Purpose: check if the tags must be processed by the specified maintenance * * * * Parameters: maintenance - [IN] the maintenance * @@ -1441,8 +1391,6 @@ static int dc_maintenance_match_tags(const zbx_dc_maintenance_t *maintenance, co /****************************************************************************** * * - * Function: dc_compare_tags * - * * * Purpose: compare maintenance tags by tag name for sorting * * * ******************************************************************************/ @@ -1461,8 +1409,6 @@ static void host_event_maintenance_clean(zbx_host_event_maintenance_t *host_even /****************************************************************************** * * - * Function: zbx_dc_get_event_maintenances * - * * * Purpose: get maintenance data for events * * * * Parameters: event_queries - [IN/OUT] in - event data * @@ -1620,8 +1566,6 @@ unlock: /****************************************************************************** * * - * Function: zbx_event_suppress_query_free * - * * * Purpose: free event suppress query structure * * * ******************************************************************************/ @@ -1636,8 +1580,6 @@ void zbx_event_suppress_query_free(zbx_event_suppress_query_t *query) /****************************************************************************** * * - * Function: zbx_dc_get_running_maintenanceids * - * * * Purpose: get identifiers of the running maintenances * * * * Return value: SUCCEED - at least one running maintenance was found * diff --git a/src/libs/zbxdbcache/dbsync.c b/src/libs/zbxdbcache/dbsync.c index 7ac7e159ffd..0c99ed2bde5 100644 --- a/src/libs/zbxdbcache/dbsync.c +++ b/src/libs/zbxdbcache/dbsync.c @@ -85,8 +85,6 @@ static void dbsync_strfree(char *str) /****************************************************************************** * * - * Function: dbsync_compare_uint64 * - * * * Purpose: compares 64 bit unsigned integer with a raw database value * * * ******************************************************************************/ @@ -101,8 +99,6 @@ static int dbsync_compare_uint64(const char *value_raw, zbx_uint64_t value) /****************************************************************************** * * - * Function: dbsync_compare_int * - * * * Purpose: compares 32 bit signed integer with a raw database value * * * ******************************************************************************/ @@ -113,8 +109,6 @@ static int dbsync_compare_int(const char *value_raw, int value) /****************************************************************************** * * - * Function: dbsync_compare_uchar * - * * * Purpose: compares unsigned character with a raw database value * * * ******************************************************************************/ @@ -129,8 +123,6 @@ static int dbsync_compare_uchar(const char *value_raw, unsigned char value) /****************************************************************************** * * - * Function: dbsync_compare_str * - * * * Purpose: compares string with a raw database value * * * ******************************************************************************/ @@ -142,8 +134,6 @@ static int dbsync_compare_str(const char *value_raw, const char *value) /****************************************************************************** * * - * Function: dbsync_add_row * - * * * Purpose: adds a new row to the changeset * * * * Parameter: sync - [IN] the changeset * @@ -191,8 +181,6 @@ static void dbsync_add_row(zbx_dbsync_t *sync, zbx_uint64_t rowid, unsigned char /****************************************************************************** * * - * Function: dbsync_prepare * - * * * Purpose: prepares changeset * * * * Parameter: sync - [IN] the changeset * @@ -214,8 +202,6 @@ static void dbsync_prepare(zbx_dbsync_t *sync, int columns_num, zbx_dbsync_prepr /****************************************************************************** * * - * Function: dbsync_check_row_macros * - * * * Purpose: checks if the specified column in the row contains user macros * * * * Parameter: row - [IN] the row to check * @@ -235,8 +221,6 @@ static int dbsync_check_row_macros(char **row, int column) /****************************************************************************** * * - * Function: dbsync_preproc_row * - * * * Purpose: applies necessary pre-processing before row is compared/used * * * * Parameter: sync - [IN] the changeset * @@ -271,8 +255,6 @@ static char **dbsync_preproc_row(zbx_dbsync_t *sync, char **row) /****************************************************************************** * * - * Function: zbx_dbsync_init_env * - * * ******************************************************************************/ void zbx_dbsync_init_env(ZBX_DC_CONFIG *cache) { @@ -282,8 +264,6 @@ void zbx_dbsync_init_env(ZBX_DC_CONFIG *cache) /****************************************************************************** * * - * Function: dbsync_env_release * - * * ******************************************************************************/ void zbx_dbsync_free_env(void) { @@ -292,8 +272,6 @@ void zbx_dbsync_free_env(void) /****************************************************************************** * * - * Function: zbx_dbsync_init * - * * * Purpose: initializes changeset * * * ******************************************************************************/ @@ -321,8 +299,6 @@ void zbx_dbsync_init(zbx_dbsync_t *sync, unsigned char mode) /****************************************************************************** * * - * Function: zbx_dbsync_clear * - * * * Purpose: frees resources allocated by changeset * * * ******************************************************************************/ @@ -365,8 +341,6 @@ void zbx_dbsync_clear(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: zbx_dbsync_next * - * * * Purpose: gets the next row from the changeset * * * * Parameters: sync - [IN] the changeset * @@ -419,8 +393,6 @@ int zbx_dbsync_next(zbx_dbsync_t *sync, zbx_uint64_t *rowid, char ***row, unsign /****************************************************************************** * * - * Function: encode_expression * - * * * Purpose: encode serialized expression to be returned as db field * * * * Parameter: sync - [OUT] the changeset * @@ -444,8 +416,6 @@ static char *encode_expression(const zbx_eval_context_t *ctx) /****************************************************************************** * * - * Function: dbsync_compare_serialized_expression * - * * * Purpose: compare serialized expression * * * * Parameter: col - [IN] the base64 encoded expression * @@ -494,8 +464,6 @@ out: /****************************************************************************** * * - * Function: zbx_dbsync_compare_config * - * * * Purpose: compares config table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -546,8 +514,6 @@ int zbx_dbsync_compare_config(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: zbx_dbsync_compare_autoreg_psk * - * * * Purpose: compares 'config_autoreg_tls' table with cached configuration * * data * * * @@ -623,8 +589,6 @@ int zbx_dbsync_compare_autoreg_psk(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_host * - * * * Purpose: compares hosts table row with cached configuration data * * * * Parameter: host - [IN] the cached host * @@ -736,8 +700,6 @@ static int dbsync_compare_host(ZBX_DC_HOST *host, const DB_ROW dbrow) /****************************************************************************** * * - * Function: zbx_dbsync_compare_hosts * - * * * Purpose: compares hosts table with cached configuration data * * and populates the changeset * * * @@ -832,8 +794,6 @@ int zbx_dbsync_compare_hosts(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_host_inventory * - * * * Purpose: compares host inventory table row with cached configuration data * * * * Parameter: hi - [IN] the cached host inventory data * @@ -861,8 +821,6 @@ static int dbsync_compare_host_inventory(const ZBX_DC_HOST_INVENTORY *hi, const /****************************************************************************** * * - * Function: zbx_dbsync_compare_host_inventory * - * * * Purpose: compares host_inventory table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -943,8 +901,6 @@ int zbx_dbsync_compare_host_inventory(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: zbx_dbsync_compare_host_templates * - * * * Purpose: compares hosts_templates table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -1025,8 +981,6 @@ int zbx_dbsync_compare_host_templates(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_global_macro * - * * * Purpose: compares global macro table row with cached configuration data * * * * Parameter: gmacro - [IN] the cached global macro data * @@ -1076,8 +1030,6 @@ out: /****************************************************************************** * * - * Function: zbx_dbsync_compare_global_macros * - * * * Purpose: compares global macros table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -1144,8 +1096,6 @@ int zbx_dbsync_compare_global_macros(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_host_macro * - * * * Purpose: compares host macro table row with cached configuration data * * * * Parameter: hmacro - [IN] the cached host macro data * @@ -1198,8 +1148,6 @@ out: /****************************************************************************** * * - * Function: zbx_dbsync_compare_host_macros * - * * * Purpose: compares global macros table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -1268,8 +1216,6 @@ int zbx_dbsync_compare_host_macros(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_interface * - * * * Purpose: compares interface table row with cached configuration data * * * * Parameter: interface - [IN] the cached interface data * @@ -1372,8 +1318,6 @@ static int dbsync_compare_interface(const ZBX_DC_INTERFACE *interface, const DB_ /****************************************************************************** * * - * Function: zbx_dbsync_compare_interfaces * - * * * Purpose: compares interfaces table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -1444,8 +1388,6 @@ int zbx_dbsync_compare_interfaces(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_item * - * * * Purpose: compares items table row with cached configuration data * * * * Parameter: item - [IN] the cached item * @@ -1825,8 +1767,6 @@ static int dbsync_compare_item(const ZBX_DC_ITEM *item, const DB_ROW dbrow) /****************************************************************************** * * - * Function: dbsync_item_preproc_row * - * * * Purpose: applies necessary preprocessing before row is compared/used * * * * Parameter: row - [IN] the row to preprocess * @@ -1913,8 +1853,6 @@ static char **dbsync_item_preproc_row(char **row) /****************************************************************************** * * - * Function: zbx_dbsync_compare_items * - * * * Purpose: compares items table with cached configuration data * * * * Return value: SUCCEED - the changeset was successfully calculated * @@ -2006,8 +1944,6 @@ static int dbsync_compare_template_item(const ZBX_DC_TEMPLATE_ITEM *item, const /****************************************************************************** * * - * Function: zbx_dbsync_compare_template_items * - * * * Purpose: compares items that belong to templates with configuration cache * * * * Return value: SUCCEED - the changeset was successfully calculated * @@ -2089,8 +2025,6 @@ static int dbsync_compare_prototype_item(const ZBX_DC_PROTOTYPE_ITEM *item, cons /****************************************************************************** * * - * Function: zbx_dbsync_compare_prototype_items * - * * * Purpose: compares lld item prototypes with configuration cache * * * * Return value: SUCCEED - the changeset was successfully calculated * @@ -2161,8 +2095,6 @@ int zbx_dbsync_compare_prototype_items(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_trigger * - * * * Purpose: compares triggers table row with cached configuration data * * * * Parameter: trigger - [IN] the cached trigger * @@ -2221,8 +2153,6 @@ static int dbsync_compare_trigger(const ZBX_DC_TRIGGER *trigger, const DB_ROW db /****************************************************************************** * * - * Function: dbsync_trigger_preproc_row * - * * * Purpose: applies necessary preprocessing before row is compared/used * * * * Parameter: row - [IN] the row to preprocess * @@ -2324,8 +2254,6 @@ static char **dbsync_trigger_preproc_row(char **row) /****************************************************************************** * * - * Function: zbx_dbsync_compare_triggers * - * * * Purpose: compares triggers table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -2411,8 +2339,6 @@ int zbx_dbsync_compare_triggers(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: zbx_dbsync_compare_trigger_dependency * - * * * Purpose: compares trigger_depends table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -2500,8 +2426,6 @@ int zbx_dbsync_compare_trigger_dependency(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_function * - * * * Purpose: compares functions table row with cached configuration data * * * * Parameter: function - [IN] the cached function * @@ -2530,8 +2454,6 @@ static int dbsync_compare_function(const ZBX_DC_FUNCTION *function, const DB_ROW /****************************************************************************** * * - * Function: dbsync_function_preproc_row * - * * * Purpose: applies necessary preprocessing before row is compared/used * * * * Parameter: row - [IN] the row to preprocess * @@ -2569,8 +2491,6 @@ static char **dbsync_function_preproc_row(char **row) /****************************************************************************** * * - * Function: zbx_dbsync_compare_functions * - * * * Purpose: compares functions table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -2647,8 +2567,6 @@ int zbx_dbsync_compare_functions(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_expression * - * * * Purpose: compares expressions table row with cached configuration data * * * * Parameter: expression - [IN] the cached expression * @@ -2680,8 +2598,6 @@ static int dbsync_compare_expression(const ZBX_DC_EXPRESSION *expression, const /****************************************************************************** * * - * Function: zbx_dbsync_compare_exprssions * - * * * Purpose: compares expressions, regexps tables with cached configuration * * data * * * @@ -2753,8 +2669,6 @@ int zbx_dbsync_compare_expressions(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_action * - * * * Purpose: compares actions table row with cached configuration data * * * * Parameter: action - [IN] the cached action * @@ -2781,8 +2695,6 @@ static int dbsync_compare_action(const zbx_dc_action_t *action, const DB_ROW dbr /****************************************************************************** * * - * Function: zbx_dbsync_compare_actions * - * * * Purpose: compares actions table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -2852,8 +2764,6 @@ int zbx_dbsync_compare_actions(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_action_op * - * * * Purpose: compares action operation class and flushes update row if * * necessary * * * @@ -2884,8 +2794,6 @@ static void dbsync_compare_action_op(zbx_dbsync_t *sync, zbx_uint64_t actionid, /****************************************************************************** * * - * Function: zbx_dbsync_compare_action_ops * - * * * Purpose: compares actions by operation class * * * * Parameter: sync - [OUT] the changeset * @@ -2953,8 +2861,6 @@ int zbx_dbsync_compare_action_ops(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_action_condition * - * * * Purpose: compares conditions table row with cached configuration data * * * * Parameter: condition - [IN] the cached action condition * @@ -2983,8 +2889,6 @@ static int dbsync_compare_action_condition(const zbx_dc_action_condition_t *cond /****************************************************************************** * * - * Function: zbx_dbsync_compare_action_conditions * - * * * Purpose: compares conditions table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -3057,8 +2961,6 @@ int zbx_dbsync_compare_action_conditions(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_trigger_tag * - * * * Purpose: compares trigger tags table row with cached configuration data * * * * Parameter: tag - [IN] the cached trigger tag * @@ -3084,8 +2986,6 @@ static int dbsync_compare_trigger_tag(const zbx_dc_trigger_tag_t *tag, const DB_ /****************************************************************************** * * - * Function: zbx_dbsync_compare_trigger_tags * - * * * Purpose: compares trigger tags table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -3162,8 +3062,6 @@ int zbx_dbsync_compare_trigger_tags(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_item_tag * - * * * Purpose: compares item tags table row with cached configuration data * * * * Parameter: tag - [IN] the cached item tag * @@ -3189,8 +3087,6 @@ static int dbsync_compare_item_tag(const zbx_dc_item_tag_t *tag, const DB_ROW db /****************************************************************************** * * - * Function: zbx_dbsync_compare_item_tags * - * * * Purpose: compares item tags table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -3266,8 +3162,6 @@ int zbx_dbsync_compare_item_tags(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_host_tag * - * * * Purpose: compares host tags table row with cached configuration data * * * * Parameter: tag - [IN] the cached host tag * @@ -3293,8 +3187,6 @@ static int dbsync_compare_host_tag(const zbx_dc_host_tag_t *tag, const DB_ROW db /****************************************************************************** * * - * Function: zbx_dbsync_compare_host_tags * - * * * Purpose: compares host tags table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -3364,8 +3256,6 @@ int zbx_dbsync_compare_host_tags(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_correlation * - * * * Purpose: compares correlation table row with cached configuration data * * * * Parameter: correlation - [IN] the cached correlation rule * @@ -3391,8 +3281,6 @@ static int dbsync_compare_correlation(const zbx_dc_correlation_t *correlation, c /****************************************************************************** * * - * Function: zbx_dbsync_compare_correlations * - * * * Purpose: compares correlation table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -3464,8 +3352,6 @@ int zbx_dbsync_compare_correlations(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_corr_condition * - * * * Purpose: compares correlation condition tables dbrow with cached * * configuration data * * * @@ -3520,8 +3406,6 @@ static int dbsync_compare_corr_condition(const zbx_dc_corr_condition_t *corr_con /****************************************************************************** * * - * Function: zbx_dbsync_compare_corr_conditions * - * * * Purpose: compares correlation condition tables with cached configuration * * data * * * @@ -3604,8 +3488,6 @@ int zbx_dbsync_compare_corr_conditions(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_corr_operation * - * * * Purpose: compares correlation operation tables dbrow with cached * * configuration data * * * @@ -3629,8 +3511,6 @@ static int dbsync_compare_corr_operation(const zbx_dc_corr_operation_t *corr_ope /****************************************************************************** * * - * Function: zbx_dbsync_compare_corr_operations * - * * * Purpose: compares correlation operation tables with cached configuration * * data * * * @@ -3704,8 +3584,6 @@ int zbx_dbsync_compare_corr_operations(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_host_group * - * * * Purpose: compares host group table row with cached configuration data * * * * Parameter: group - [IN] the cached host group * @@ -3725,8 +3603,6 @@ static int dbsync_compare_host_group(const zbx_dc_hostgroup_t *group, const DB_R /****************************************************************************** * * - * Function: zbx_dbsync_compare_host_groups * - * * * Purpose: compares host groups table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -3789,8 +3665,6 @@ int zbx_dbsync_compare_host_groups(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_item_pp_preproc_row * - * * * Purpose: applies necessary preprocessing before row is compared/used * * * * Parameter: row - [IN] the row to preprocess * @@ -3834,8 +3708,6 @@ static char **dbsync_item_pp_preproc_row(char **row) /****************************************************************************** * * - * Function: dbsync_compare_item_preproc * - * * * Purpose: compares item preproc table row with cached configuration data * * * * Parameter: preproc - [IN] the cached item preprocessing operation * @@ -3870,8 +3742,6 @@ static int dbsync_compare_item_preproc(const zbx_dc_preproc_op_t *preproc, const /****************************************************************************** * * - * Function: zbx_dbsync_compare_item_preprocessing * - * * * Purpose: compares item preproc tables with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -3967,8 +3837,6 @@ int zbx_dbsync_compare_item_preprocs(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_maintenance * - * * * Purpose: compares maintenance table row with cached configuration data * * * * Parameter: maintenance - [IN] the cached maintenance data * @@ -3997,8 +3865,6 @@ static int dbsync_compare_maintenance(const zbx_dc_maintenance_t *maintenance, c /****************************************************************************** * * - * Function: dbsync_compare_itemscript_param * - * * * Purpose: compares item script params table row with cached configuration * * data * * * @@ -4025,8 +3891,6 @@ static int dbsync_compare_itemscript_param(const zbx_dc_scriptitem_param_t *scri /****************************************************************************** * * - * Function: zbx_dbsync_compare_item_script_param * - * * * Purpose: compares item_parameter table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -4109,8 +3973,6 @@ int zbx_dbsync_compare_item_script_param(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: zbx_dbsync_compare_maintenances * - * * * Purpose: compares maintenances table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -4178,8 +4040,6 @@ int zbx_dbsync_compare_maintenances(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_maintenance_tag * - * * * Purpose: compares maintenance_tag table row with cached configuration data * * * * Parameter: maintenance_tag - [IN] the cached maintenance tag * @@ -4205,8 +4065,6 @@ static int dbsync_compare_maintenance_tag(const zbx_dc_maintenance_tag_t *mainte /****************************************************************************** * * - * Function: zbx_dbsync_compare_maintenance_tags * - * * * Purpose: compares maintenances table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -4275,8 +4133,6 @@ int zbx_dbsync_compare_maintenance_tags(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: dbsync_compare_maintenance_period * - * * * Purpose: compares maintenance_period table row with cached configuration * * dat * * * @@ -4318,8 +4174,6 @@ static int dbsync_compare_maintenance_period(const zbx_dc_maintenance_period_t * /****************************************************************************** * * - * Function: zbx_dbsync_compare_maintenance_periods * - * * * Purpose: compares timeperiods table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -4390,8 +4244,6 @@ int zbx_dbsync_compare_maintenance_periods(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: zbx_dbsync_compare_maintenance_groups * - * * * Purpose: compares maintenances_groups table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -4467,8 +4319,6 @@ int zbx_dbsync_compare_maintenance_groups(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: zbx_dbsync_compare_maintenance_hosts * - * * * Purpose: compares maintenances_hosts table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * @@ -4544,8 +4394,6 @@ int zbx_dbsync_compare_maintenance_hosts(zbx_dbsync_t *sync) /****************************************************************************** * * - * Function: zbx_dbsync_compare_host_group_hosts * - * * * Purpose: compares hosts_groups table with cached configuration data * * * * Parameter: sync - [OUT] the changeset * diff --git a/src/libs/zbxdbcache/dbsync.h b/src/libs/zbxdbcache/dbsync.h index 54898b37697..91fa9948804 100644 --- a/src/libs/zbxdbcache/dbsync.h +++ b/src/libs/zbxdbcache/dbsync.h @@ -49,8 +49,6 @@ /****************************************************************************** * * - * Function: zbx_dbsync_preproc_row_func_t * - * * * Purpose: applies necessary preprocessing before row is compared/used * * * * Parameter: row - [IN] the row to preprocess * diff --git a/src/libs/zbxdbcache/valuecache.c b/src/libs/zbxdbcache/valuecache.c index 9750205928f..5bb34ee05d7 100644 --- a/src/libs/zbxdbcache/valuecache.c +++ b/src/libs/zbxdbcache/valuecache.c @@ -293,8 +293,6 @@ static void vch_item_clean_cache(zbx_vc_item_t *item); /********************************************************************************* * * - * Function: vc_db_read_values_by_time * - * * * Purpose: reads item history data from database * * * * Parameters: itemid - [IN] the itemid * @@ -322,8 +320,6 @@ static int vc_db_read_values_by_time(zbx_uint64_t itemid, int value_type, zbx_ve /************************************************************************************ * * - * Function: vc_db_read_values_by_time_and_count * - * * * Purpose: reads item history data from database * * * * Parameters: itemid - [IN] the itemid * @@ -442,8 +438,6 @@ static int vc_db_read_values_by_time_and_count(zbx_uint64_t itemid, int value_ty /****************************************************************************** * * - * Function: vc_db_get_values * - * * * Purpose: get item history data for the specified time period directly from * * database * * * @@ -561,8 +555,6 @@ static int vc_strpool_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: vc_item_weight_compare_func * - * * * Purpose: compares two item weight data structures by their 'weight' * * * * Parameters: d1 - [IN] the first item weight data structure * @@ -578,8 +570,6 @@ static int vc_item_weight_compare_func(const zbx_vc_item_weight_t *d1, const zbx /****************************************************************************** * * - * Function: vc_history_logfree * - * * * Purpose: frees history log and all resources allocated for it * * * * Parameters: log - [IN] the history log to free * @@ -594,8 +584,6 @@ static void vc_history_logfree(zbx_log_value_t *log) /****************************************************************************** * * - * Function: vc_history_logdup * - * * * Purpose: duplicates history log by allocating necessary resources and * * copying the target log values. * * * @@ -621,8 +609,6 @@ static zbx_log_value_t *vc_history_logdup(const zbx_log_value_t *log) /****************************************************************************** * * - * Function: vc_history_record_vector_clean * - * * * Purpose: releases resources allocated to store history records * * * * Parameters: vector - [IN] the history record vector * @@ -651,8 +637,6 @@ static void vc_history_record_vector_clean(zbx_vector_history_record_t *vector, /****************************************************************************** * * - * Function: vc_update_statistics * - * * * Purpose: updates cache and item statistics * * * * Parameters: item - [IN] the item (optional) * @@ -693,8 +677,6 @@ static void vc_update_statistics(zbx_vc_item_t *item, int hits, int misses, int /****************************************************************************** * * - * Function: vc_compare_items_by_total_values * - * * * Purpose: is used to sort items by value count in descending order * * * ******************************************************************************/ @@ -710,8 +692,6 @@ static int vc_compare_items_by_total_values(const void *d1, const void *d2) /****************************************************************************** * * - * Function: vc_dump_items_statistics * - * * * Purpose: find out items responsible for low memory * * * ******************************************************************************/ @@ -752,8 +732,6 @@ static void vc_dump_items_statistics(void) /****************************************************************************** * * - * Function: vc_warn_low_memory * - * * * Purpose: logs low memory warning * * * * Comments: The low memory warning is written to log every 5 minutes when * @@ -786,8 +764,6 @@ static void vc_warn_low_memory(void) /****************************************************************************** * * - * Function: vc_release_unused_items * - * * * Purpose: frees space in cache by dropping items not accessed for more than * * 24 hours * * * @@ -825,8 +801,6 @@ static size_t vc_release_unused_items(const zbx_vc_item_t *source_item) /****************************************************************************** * * - * Function: zbx_vc_housekeeping_value_cache * - * * * Purpose: release unused items from value cache * * * * Comments: If unused items are not cleared from value cache periodically * @@ -846,8 +820,6 @@ void zbx_vc_housekeeping_value_cache(void) /****************************************************************************** * * - * Function: vc_release_space * - * * * Purpose: frees space in cache to store the specified number of bytes by * * dropping the least accessed items * * * @@ -917,8 +889,6 @@ static void vc_release_space(zbx_vc_item_t *source_item, size_t space) /****************************************************************************** * * - * Function: vc_history_record_copy * - * * * Purpose: copies history value * * * * Parameters: dst - [OUT] a pointer to the destination value * @@ -949,8 +919,6 @@ static void vc_history_record_copy(zbx_history_record_t *dst, const zbx_history_ /****************************************************************************** * * - * Function: vc_history_record_vector_append * - * * * Purpose: appends the specified value to value vector * * * * Parameters: vector - [IN/OUT] the value vector * @@ -972,8 +940,6 @@ static void vc_history_record_vector_append(zbx_vector_history_record_t *vector, /****************************************************************************** * * - * Function: vc_item_malloc * - * * * Purpose: allocate cache memory to store item's resources * * * * Parameters: item - [IN] the item * @@ -1005,8 +971,6 @@ static void *vc_item_malloc(zbx_vc_item_t *item, size_t size) /****************************************************************************** * * - * Function: vc_item_strdup * - * * * Purpose: copies string to the cache memory * * * * Parameters: item - [IN] the item * @@ -1058,8 +1022,6 @@ static char *vc_item_strdup(zbx_vc_item_t *item, const char *str) /****************************************************************************** * * - * Function: vc_item_strfree * - * * * Purpose: removes string from cache string pool * * * * Parameters: str - [IN] the string to remove * @@ -1093,8 +1055,6 @@ static size_t vc_item_strfree(char *str) /****************************************************************************** * * - * Function: vc_item_logdup * - * * * Purpose: copies log value to the cache memory * * * * Parameters: item - [IN] the item * @@ -1142,8 +1102,6 @@ fail: /****************************************************************************** * * - * Function: vc_item_logfree * - * * * Purpose: removes log resource from cache memory * * * * Parameters: str - [IN] the log to remove * @@ -1172,8 +1130,6 @@ static size_t vc_item_logfree(zbx_log_value_t *log) /****************************************************************************** * * - * Function: vc_item_free_values * - * * * Purpose: frees cache resources of the specified item value range * * * * Parameters: item - [IN] the item * @@ -1209,8 +1165,6 @@ static size_t vc_item_free_values(zbx_vc_item_t *item, zbx_history_record_t *val /****************************************************************************** * * - * Function: vc_remove_item * - * * * Purpose: removes item from cache and frees resources allocated for it * * * * Parameters: item - [IN] the item * @@ -1224,8 +1178,6 @@ static void vc_remove_item(zbx_vc_item_t *item) /****************************************************************************** * * - * Function: vc_remove_item_by_id * - * * * Purpose: removes item from cache and frees resources allocated for it * * * * Parameters: itemid - [IN] the item identifier * @@ -1243,8 +1195,6 @@ static void vc_remove_item_by_id(zbx_uint64_t itemid) } /****************************************************************************** * * - * Function: vc_item_update_db_cached_from * - * * * Purpose: updates the timestamp from which the item is being cached * * * * Parameters: item - [IN] the item * @@ -1301,8 +1251,6 @@ static void vc_item_update_db_cached_from(zbx_vc_item_t *item, int timestamp) /****************************************************************************** * * - * Function: vch_item_update_range * - * * * Purpose: updates item range with current request range * * * * Parameters: item - [IN] the item * @@ -1335,8 +1283,6 @@ static void vch_item_update_range(zbx_vc_item_t *item, int range, int now) /****************************************************************************** * * - * Function: vch_item_chunk_slot_count * - * * * Purpose: calculates optimal number of slots for an item data chunk * * * * Parameters: item - [IN] the item * @@ -1372,8 +1318,6 @@ static int vch_item_chunk_slot_count(zbx_vc_item_t *item, int values_new) /****************************************************************************** * * - * Function: vch_item_add_chunk * - * * * Purpose: adds a new data chunk at the end of item's history data list * * * * Parameters: item - [IN/OUT] the item to add chunk to * @@ -1429,8 +1373,6 @@ static int vch_item_add_chunk(zbx_vc_item_t *item, int nslots, zbx_vc_chunk_t *i /****************************************************************************** * * - * Function: vch_chunk_find_last_value_before * - * * * Purpose: find the index of the last value in chunk with timestamp less or * * equal to the specified timestamp. * * * @@ -1480,8 +1422,6 @@ static int vch_chunk_find_last_value_before(const zbx_vc_chunk_t *chunk, const z /****************************************************************************** * * - * Function: vch_item_get_last_value * - * * * Purpose: gets the chunk and index of the last value with a timestamp less * * or equal to the specified timestamp * * * @@ -1530,8 +1470,6 @@ static int vch_item_get_last_value(const zbx_vc_item_t *item, const zbx_timespec /****************************************************************************** * * - * Function: vch_item_copy_value * - * * * Purpose: copies value in the specified item's chunk slot * * * * Parameters: chunk - [IN/OUT] the target chunk * @@ -1577,8 +1515,6 @@ out: /****************************************************************************** * * - * Function: vch_item_copy_values_at_tail * - * * * Purpose: copies values at the beginning of item tail chunk * * * * Parameters: item - [IN/OUT] the target item * @@ -1642,8 +1578,6 @@ out: /****************************************************************************** * * - * Function: vch_item_free_chunk * - * * * Purpose: frees chunk and all resources allocated to store its values * * * * Parameters: item - [IN] the chunk owner item * @@ -1666,8 +1600,6 @@ static size_t vch_item_free_chunk(zbx_vc_item_t *item, zbx_vc_chunk_t *chunk) /****************************************************************************** * * - * Function: vch_item_remove_chunk * - * * * Purpose: removes item history data chunk * * * * Parameters: item - [IN ] the chunk owner item * @@ -1693,8 +1625,6 @@ static void vch_item_remove_chunk(zbx_vc_item_t *item, zbx_vc_chunk_t *chunk) /****************************************************************************** * * - * Function: vch_item_clean_cache * - * * * Purpose: removes item history data that are outside (older) the maximum * * request range * * * @@ -1756,8 +1686,6 @@ static void vch_item_clean_cache(zbx_vc_item_t *item) /****************************************************************************** * * - * Function: vch_item_remove_values * - * * * Purpose: removes item history data that are older than the specified * * timestamp * * * @@ -1800,8 +1728,6 @@ static void vch_item_remove_values(zbx_vc_item_t *item, int timestamp) /****************************************************************************** * * - * Function: vch_item_add_value_at_head * - * * * Purpose: adds one item history value at the end of current item's history * * data * * * @@ -1912,8 +1838,6 @@ out: /****************************************************************************** * * - * Function: vch_item_add_values_at_tail * - * * * Purpose: adds item history values at the beginning of current item's * * history data * * * @@ -1976,8 +1900,6 @@ out: /****************************************************************************** * * - * Function: vch_item_cache_values_by_time * - * * * Purpose: cache item history data for the specified time period * * * * Parameters: item - [IN] the item * @@ -2062,8 +1984,6 @@ out: /****************************************************************************** * * - * Function: vch_item_cache_values_by_time_and_count * - * * * Purpose: cache the specified number of history data values for time period * * since timestamp * * * @@ -2184,8 +2104,6 @@ out: /****************************************************************************** * * - * Function: vch_item_get_values_by_time * - * * * Purpose: retrieves item history data from cache * * * * Parameters: item - [IN] the item * @@ -2234,8 +2152,6 @@ static void vch_item_get_values_by_time(const zbx_vc_item_t *item, zbx_vector_hi /****************************************************************************** * * - * Function: vch_item_get_values_by_time_and_count * - * * * Purpose: retrieves item history data from cache * * * * Parameters: item - [IN] the item * @@ -2314,8 +2230,6 @@ out: /****************************************************************************** * * - * Function: vch_item_get_value_range * - * * * Purpose: get item values for the specified range * * * * Parameters: item - [IN] the item * @@ -2389,8 +2303,6 @@ out: /****************************************************************************** * * - * Function: vch_item_free_cache * - * * * Purpose: frees resources allocated for item history data * * * * Parameters: item - [IN] the item * @@ -2426,8 +2338,6 @@ static size_t vch_item_free_cache(zbx_vc_item_t *item) /****************************************************************************** * * - * Function: zbx_vc_init * - * * * Purpose: initializes value cache * * * ******************************************************************************/ @@ -2499,8 +2409,6 @@ out: /****************************************************************************** * * - * Function: zbx_vc_destroy * - * * * Purpose: destroys value cache * * * ******************************************************************************/ @@ -2528,8 +2436,6 @@ void zbx_vc_destroy(void) /****************************************************************************** * * - * Function: zbx_vc_reset * - * * * Purpose: resets value cache * * * * Comments: All items and their historical data are removed, * @@ -2569,8 +2475,6 @@ void zbx_vc_reset(void) /****************************************************************************** * * - * Function: zbx_vc_add_values * - * * * Purpose: adds item values to the history and value cache * * * * Parameters: history - [IN] item history values * @@ -2632,8 +2536,6 @@ int zbx_vc_add_values(zbx_vector_ptr_t *history, int *ret_flush) /****************************************************************************** * * - * Function: zbx_vc_get_values * - * * * Purpose: get item history data for the specified time period * * * * Parameters: itemid - [IN] the item id * @@ -2712,8 +2614,6 @@ out: /****************************************************************************** * * - * Function: zbx_vc_get_value * - * * * Purpose: get the last history value with a timestamp less or equal to the * * target timestamp * * * @@ -2754,8 +2654,6 @@ out: /****************************************************************************** * * - * Function: zbx_vc_get_statistics * - * * * Purpose: retrieves usage cache statistics * * * * Parameters: stats - [OUT] the cache usage statistics * @@ -2786,8 +2684,6 @@ int zbx_vc_get_statistics(zbx_vc_stats_t *stats) /****************************************************************************** * * - * Function: zbx_vc_enable * - * * * Purpose: enables value caching for current process * * * ******************************************************************************/ @@ -2799,8 +2695,6 @@ void zbx_vc_enable(void) /****************************************************************************** * * - * Function: zbx_vc_disable * - * * * Purpose: disables value caching for current process * * * ******************************************************************************/ @@ -2811,8 +2705,6 @@ void zbx_vc_disable(void) /****************************************************************************** * * - * Function: zbx_hc_get_diag_stats * - * * * Purpose: get value cache diagnostic statistics * * * ******************************************************************************/ @@ -2844,8 +2736,6 @@ void zbx_vc_get_diag_stats(zbx_uint64_t *items_num, zbx_uint64_t *values_num, in /****************************************************************************** * * - * Function: zbx_hc_get_mem_stats * - * * * Purpose: get value cache shared memory statistics * * * ******************************************************************************/ @@ -2864,8 +2754,6 @@ void zbx_vc_get_mem_stats(zbx_mem_stats_t *mem) /****************************************************************************** * * - * Function: zbx_vc_get_item_stats * - * * * Purpose: get statistics of cached items * * * ******************************************************************************/ @@ -2897,8 +2785,6 @@ void zbx_vc_get_item_stats(zbx_vector_ptr_t *stats) /****************************************************************************** * * - * Function: zbx_vc_flush_stats * - * * * Purpose: flush locally cached statistics * * * ******************************************************************************/ diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c index a0246dd1623..b49c5a57d9f 100644 --- a/src/libs/zbxdbhigh/db.c +++ b/src/libs/zbxdbhigh/db.c @@ -157,8 +157,6 @@ void zbx_db_validate_config(void) /****************************************************************************** * * - * Function: DBinit_autoincrement_options * - * * * Purpose: specify the autoincrement options when connecting to the database * * * ******************************************************************************/ @@ -169,8 +167,6 @@ void DBinit_autoincrement_options(void) /****************************************************************************** * * - * Function: DBconnect * - * * * Purpose: connect to the database * * * * Parameters: flag - ZBX_DB_CONNECT_ONCE (try once and return the result), * @@ -218,8 +214,6 @@ int DBconnect(int flag) /****************************************************************************** * * - * Function: DBinit * - * * * Author: Alexander Vladishev * * * ******************************************************************************/ @@ -235,8 +229,6 @@ void DBdeinit(void) /****************************************************************************** * * - * Function: DBtxn_operation * - * * * Purpose: helper function to loop transaction operation while DB is down * * * * Author: Eugene Grigorjev, Vladimir Levijev * @@ -264,8 +256,6 @@ static void DBtxn_operation(int (*txn_operation)(void)) /****************************************************************************** * * - * Function: DBbegin * - * * * Purpose: start a transaction * * * * Author: Eugene Grigorjev, Vladimir Levijev * @@ -280,8 +270,6 @@ void DBbegin(void) /****************************************************************************** * * - * Function: DBcommit * - * * * Purpose: commit a transaction * * * * Author: Eugene Grigorjev, Vladimir Levijev * @@ -302,8 +290,6 @@ int DBcommit(void) /****************************************************************************** * * - * Function: DBrollback * - * * * Purpose: rollback a transaction * * * * Author: Eugene Grigorjev, Vladimir Levijev * @@ -324,8 +310,6 @@ void DBrollback(void) /****************************************************************************** * * - * Function: DBend * - * * * Purpose: commit or rollback a transaction depending on a parameter value * * * * Comments: do nothing if DB does not support transactions * @@ -344,8 +328,6 @@ int DBend(int ret) #ifdef HAVE_ORACLE /****************************************************************************** * * - * Function: DBstatement_prepare * - * * * Purpose: prepares a SQL statement for execution * * * * Comments: retry until DB is up * @@ -374,8 +356,6 @@ void DBstatement_prepare(const char *sql) /****************************************************************************** * * - * Function: __zbx_DBexecute * - * * * Purpose: execute a non-select statement * * * * Comments: retry until DB is up * @@ -410,8 +390,6 @@ int DBexecute(const char *fmt, ...) /****************************************************************************** * * - * Function: __zbx_DBexecute_once * - * * * Purpose: execute a non-select statement * * * * Comments: don't retry if DB is down * @@ -433,8 +411,6 @@ int DBexecute_once(const char *fmt, ...) /****************************************************************************** * * - * Function: DBis_null * - * * * Purpose: check if numeric field value is null * * * * Parameters: field - [IN] field value to be checked * @@ -459,8 +435,6 @@ DB_ROW DBfetch(DB_RESULT result) /****************************************************************************** * * - * Function: DBselect_once * - * * * Purpose: execute a select statement * * * ******************************************************************************/ @@ -480,8 +454,6 @@ DB_RESULT DBselect_once(const char *fmt, ...) /****************************************************************************** * * - * Function: DBselect * - * * * Purpose: execute a select statement * * * * Comments: retry until DB is up * @@ -516,8 +488,6 @@ DB_RESULT DBselect(const char *fmt, ...) /****************************************************************************** * * - * Function: DBselectN * - * * * Purpose: execute a select statement and get the first N entries * * * * Comments: retry until DB is up * @@ -632,8 +602,6 @@ static size_t get_string_field_size(unsigned char type) /****************************************************************************** * * - * Function: DBdyn_escape_string_len * - * * ******************************************************************************/ char *DBdyn_escape_string_len(const char *src, size_t length) { @@ -642,8 +610,6 @@ char *DBdyn_escape_string_len(const char *src, size_t length) /****************************************************************************** * * - * Function: DBdyn_escape_string * - * * ******************************************************************************/ char *DBdyn_escape_string(const char *src) { @@ -652,8 +618,6 @@ char *DBdyn_escape_string(const char *src) /****************************************************************************** * * - * Function: DBdyn_escape_field_len * - * * ******************************************************************************/ static char *DBdyn_escape_field_len(const ZBX_FIELD *field, const char *src, zbx_escape_sequence_t flag) { @@ -675,8 +639,6 @@ static char *DBdyn_escape_field_len(const ZBX_FIELD *field, const char *src, zbx /****************************************************************************** * * - * Function: DBdyn_escape_field * - * * ******************************************************************************/ char *DBdyn_escape_field(const char *table_name, const char *field_name, const char *src) { @@ -694,8 +656,6 @@ char *DBdyn_escape_field(const char *table_name, const char *field_name, const c /****************************************************************************** * * - * Function: DBdyn_escape_like_pattern * - * * ******************************************************************************/ char *DBdyn_escape_like_pattern(const char *src) { @@ -730,8 +690,6 @@ const ZBX_FIELD *DBget_field(const ZBX_TABLE *table, const char *fieldname) /****************************************************************************** * * - * Function: DBget_nextid * - * * * Purpose: gets a new identifier(s) for a specified table * * * * Parameters: tablename - [IN] the name of a table * @@ -865,8 +823,6 @@ zbx_uint64_t DBget_maxid_num(const char *tablename, int num) /****************************************************************************** * * - * Function: DBextract_version_info * - * * * Purpose: connects to DB and tries to detect DB version * * * ******************************************************************************/ @@ -879,8 +835,6 @@ void DBextract_version_info(struct zbx_db_version_info_t *version_info) /****************************************************************************** * * - * Function: DBflush_version_requirements * - * * * Purpose: writes a json entry in DB with the result for the front-end * * * * Parameters: version - [IN] entry of DB versions * @@ -898,8 +852,6 @@ void DBflush_version_requirements(const char *version) /****************************************************************************** * * - * Function: DBcheck_capabilities * - * * * Purpose: checks DBMS for optional features and exit if is not suitable * * * * Parameters: db_version - [IN] version of DB * @@ -976,8 +928,6 @@ out: /****************************************************************************** * * - * Function: DBadd_condition_alloc_btw * - * * * Purpose: Takes an initial part of SQL query and appends a generated * * WHERE condition. The WHERE condition is generated from the given * * list of values as a mix of <fieldname> BETWEEN <id1> AND <idN>" * @@ -1060,8 +1010,6 @@ static void DBadd_condition_alloc_btw(char **sql, size_t *sql_alloc, size_t *sql /****************************************************************************** * * - * Function: DBadd_condition_alloc * - * * * Purpose: Takes an initial part of SQL query and appends a generated * * WHERE condition. The WHERE condition is generated from the given * * list of values as a mix of <fieldname> BETWEEN <id1> AND <idN>" * @@ -1205,8 +1153,6 @@ void DBadd_condition_alloc(char **sql, size_t *sql_alloc, size_t *sql_offset, co /****************************************************************************** * * - * Function: DBadd_str_condition_alloc * - * * * Purpose: This function is similar to DBadd_condition_alloc(), except it is * * designed for generating WHERE conditions for strings. Hence, this * * function is simpler, because only IN condition is possible. * @@ -1313,8 +1259,6 @@ static char buf_string[640]; /****************************************************************************** * * - * Function: zbx_host_string * - * * * Return value: <host> or "???" if host not found * * * * Author: Alexander Vladishev * @@ -1343,8 +1287,6 @@ const char *zbx_host_string(zbx_uint64_t hostid) /****************************************************************************** * * - * Function: zbx_host_key_string * - * * * Return value: <host>:<key> or "???" if item not found * * * * Author: Alexander Vladishev * @@ -1374,8 +1316,6 @@ const char *zbx_host_key_string(zbx_uint64_t itemid) /****************************************************************************** * * - * Function: zbx_check_user_permissions * - * * * Purpose: check if user has access rights to information - full name, * * alias, Email, SMS, etc * * * @@ -1443,8 +1383,6 @@ out: /****************************************************************************** * * - * Function: zbx_user_string * - * * * Return value: "Name Surname (Alias)" or "unknown" if user not found * * * * Author: Alexander Vladishev * @@ -1469,8 +1407,6 @@ const char *zbx_user_string(zbx_uint64_t userid) /****************************************************************************** * * - * Function: DBget_user_names * - * * * Purpose: get user username, name and surname * * * * Parameters: userid - [IN] user id * @@ -1511,8 +1447,6 @@ out: /****************************************************************************** * * - * Function: DBsql_id_cmp * - * * * Purpose: construct where condition * * * * Return value: "=<id>" if id not equal zero, * @@ -1538,8 +1472,6 @@ const char *DBsql_id_cmp(zbx_uint64_t id) /****************************************************************************** * * - * Function: DBregister_host * - * * * Purpose: register unknown host and generate event * * * * Parameters: host - host name * @@ -1883,8 +1815,6 @@ void DBregister_host_clean(zbx_vector_ptr_t *autoreg_hosts) /****************************************************************************** * * - * Function: DBproxy_register_host * - * * * Purpose: register unknown host * * * * Parameters: host - host name * @@ -1917,8 +1847,6 @@ void DBproxy_register_host(const char *host, const char *ip, const char *dns, un /****************************************************************************** * * - * Function: DBexecute_overflowed_sql * - * * * Purpose: execute a set of SQL statements IF it is big enough * * * * Author: Dmitry Borovikov * @@ -1966,8 +1894,6 @@ int DBexecute_overflowed_sql(char **sql, size_t *sql_alloc, size_t *sql_offset) /****************************************************************************** * * - * Function: DBget_unique_hostname_by_sample * - * * * Purpose: construct a unique host name by the given sample * * * * Parameters: host_name_sample - a host name to start constructing from * @@ -2068,8 +1994,6 @@ clean: /****************************************************************************** * * - * Function: DBsql_id_ins * - * * * Purpose: construct insert statement * * * * Return value: "<id>" if id not equal zero, * @@ -2096,8 +2020,6 @@ const char *DBsql_id_ins(zbx_uint64_t id) /****************************************************************************** * * - * Function: DBget_inventory_field * - * * * Purpose: get corresponding host_inventory field name * * * * Parameters: inventory_link - [IN] field link 1..HOST_INVENTORY_FIELD_COUNT * @@ -2351,8 +2273,6 @@ int DBpk_exists(const char *table_name) /****************************************************************************** * * - * Function: DBselect_uint64 * - * * * Parameters: sql - [IN] sql statement * * ids - [OUT] sorted list of selected uint64 values * * * @@ -2681,8 +2601,6 @@ out: #ifdef HAVE_ORACLE /****************************************************************************** * * - * Function: zbx_db_format_values * - * * * Purpose: format bulk operation (insert, update) value list * * * * Parameters: fields - [IN] the field list * @@ -2740,8 +2658,6 @@ static char *zbx_db_format_values(ZBX_FIELD **fields, const zbx_db_value_t *valu /****************************************************************************** * * - * Function: zbx_db_insert_clean * - * * * Purpose: releases resources allocated by bulk insert operations * * * * Parameters: self - [IN] the bulk insert data * @@ -2780,8 +2696,6 @@ void zbx_db_insert_clean(zbx_db_insert_t *self) /****************************************************************************** * * - * Function: zbx_db_insert_prepare_dyn * - * * * Purpose: prepare for database bulk insert operation * * * * Parameters: self - [IN] the bulk insert data * @@ -2826,8 +2740,6 @@ void zbx_db_insert_prepare_dyn(zbx_db_insert_t *self, const ZBX_TABLE *table, co /****************************************************************************** * * - * Function: zbx_db_insert_prepare * - * * * Purpose: prepare for database bulk insert operation * * * * Parameters: self - [IN] the bulk insert data * @@ -2879,8 +2791,6 @@ void zbx_db_insert_prepare(zbx_db_insert_t *self, const char *table, ...) /****************************************************************************** * * - * Function: zbx_db_insert_add_values_dyn * - * * * Purpose: adds row values for database bulk insert operation * * * * Parameters: self - [IN] the bulk insert data * @@ -2933,8 +2843,6 @@ void zbx_db_insert_add_values_dyn(zbx_db_insert_t *self, const zbx_db_value_t ** /****************************************************************************** * * - * Function: zbx_db_insert_add_values * - * * * Purpose: adds row values for database bulk insert operation * * * * Parameters: self - [IN] the bulk insert data * @@ -3001,8 +2909,6 @@ void zbx_db_insert_add_values(zbx_db_insert_t *self, ...) /****************************************************************************** * * - * Function: zbx_db_insert_execute * - * * * Purpose: executes the prepared database bulk insert operation * * * * Parameters: self - [IN] the bulk insert data * @@ -3250,8 +3156,6 @@ out: /****************************************************************************** * * - * Function: zbx_db_insert_autoincrement * - * * * Purpose: executes the prepared database bulk insert operation * * * * Parameters: self - [IN] the bulk insert data * @@ -3278,8 +3182,6 @@ void zbx_db_insert_autoincrement(zbx_db_insert_t *self, const char *field_name) /****************************************************************************** * * - * Function: zbx_db_get_database_type * - * * * Purpose: determine is it a server or a proxy database * * * * Return value: ZBX_DB_SERVER - server database * @@ -3338,8 +3240,6 @@ out: /****************************************************************************** * * - * Function: DBlock_record * - * * * Purpose: locks a record in a table by its primary key and an optional * * constraint field * * * @@ -3389,8 +3289,6 @@ int DBlock_record(const char *table, zbx_uint64_t id, const char *add_field, zbx /****************************************************************************** * * - * Function: DBlock_records * - * * * Purpose: locks a records in a table by its primary key * * * * Parameters: table - [IN] the target table * @@ -3438,8 +3336,6 @@ int DBlock_records(const char *table, const zbx_vector_uint64_t *ids) /****************************************************************************** * * - * Function: DBlock_ids * - * * * Purpose: locks a records in a table by field name * * * * Parameters: table - [IN] the target table * @@ -3487,8 +3383,6 @@ int DBlock_ids(const char *table_name, const char *field_name, zbx_vector_uint64 /****************************************************************************** * * - * Function: zbx_sql_add_interface_availability * - * * * Purpose: adds interface availability update to sql statement * * * * Parameters: ia [IN] the interface availability data * @@ -3544,8 +3438,6 @@ static int zbx_sql_add_interface_availability(const zbx_interface_availability_t /****************************************************************************** * * - * Function: zbx_db_update_interface_availabilities * - * * * Purpose: sync interface availabilities updates into database * * * * Parameters: interface_availabilities [IN] the interface availability data * @@ -3593,8 +3485,6 @@ void zbx_db_update_interface_availabilities(const zbx_vector_availability_ptr_t /****************************************************************************** * * - * Function: DBget_user_by_active_session * - * * * Purpose: validate that session is active and get associated user data * * * * Parameters: sessionid - [IN] the session id to validate * @@ -3647,8 +3537,6 @@ out: /****************************************************************************** * * - * Function: DBget_user_by_auth_token * - * * * Purpose: validate that token is not expired and is active and then get * * associated user data * * * @@ -3718,8 +3606,6 @@ void zbx_user_free(zbx_user_t *user) /****************************************************************************** * * - * Function: zbx_db_mock_field_init * - * * * Purpose: initializes mock field * * * * Parameters: field - [OUT] the field data * @@ -3750,8 +3636,6 @@ void zbx_db_mock_field_init(zbx_db_mock_field_t *field, int field_type, int fiel /****************************************************************************** * * - * Function: zbx_db_mock_field_append * - * * * Purpose: 'appends' text to the field, if successful the character/byte * * limits are updated * * * @@ -3792,8 +3676,6 @@ int zbx_db_mock_field_append(zbx_db_mock_field_t *field, const char *text) /****************************************************************************** * * - * Function: zbx_db_check_instanceid * - * * * Purpose: checks instanceid value in config table and generates new * * instance id if its empty * * * @@ -3841,8 +3723,6 @@ int zbx_db_check_instanceid(void) #if defined(HAVE_POSTGRESQL) /****************************************************************************** * * - * Function: zbx_db_get_schema_esc * - * * * Purpose: returns escaped DB schema name * * * ******************************************************************************/ diff --git a/src/libs/zbxdbhigh/discovery.c b/src/libs/zbxdbhigh/discovery.c index 712efdbf6f1..7ecce9dc7bf 100644 --- a/src/libs/zbxdbhigh/discovery.c +++ b/src/libs/zbxdbhigh/discovery.c @@ -68,8 +68,6 @@ static DB_RESULT discovery_get_dhost_by_ip_port(zbx_uint64_t druleid, const char /****************************************************************************** * * - * Function: discovery_separate_host * - * * * Purpose: separate multiple-IP hosts * * * * Parameters: host ip address * @@ -123,8 +121,6 @@ static void discovery_separate_host(const DB_DRULE *drule, DB_DHOST *dhost, cons /****************************************************************************** * * - * Function: discovery_register_host * - * * * Purpose: register host if one does not exist * * * * Parameters: host ip address * @@ -195,8 +191,6 @@ static void discovery_register_host(const DB_DRULE *drule, zbx_uint64_t dcheckid /****************************************************************************** * * - * Function: discovery_register_service * - * * * Purpose: register service if one does not exist * * * * Parameters: host ip address * @@ -287,8 +281,6 @@ static void discovery_register_service(zbx_uint64_t dcheckid, DB_DHOST *dhost, D /****************************************************************************** * * - * Function: discovery_update_dservice * - * * * Purpose: update discovered service details * * * ******************************************************************************/ @@ -307,8 +299,6 @@ static void discovery_update_dservice(zbx_uint64_t dserviceid, int status, int l /****************************************************************************** * * - * Function: discovery_update_dservice_value * - * * * Purpose: update discovered service details * * * ******************************************************************************/ @@ -325,8 +315,6 @@ static void discovery_update_dservice_value(zbx_uint64_t dserviceid, const char /****************************************************************************** * * - * Function: discovery_update_dhost * - * * * Purpose: update discovered host details * * * ******************************************************************************/ @@ -338,8 +326,6 @@ static void discovery_update_dhost(const DB_DHOST *dhost) /****************************************************************************** * * - * Function: discovery_update_service_status * - * * * Purpose: process and update the new service status * * * ******************************************************************************/ @@ -401,8 +387,6 @@ static void discovery_update_service_status(DB_DHOST *dhost, const DB_DSERVICE * /****************************************************************************** * * - * Function: discovery_update_host_status * - * * * Purpose: update new host status * * * ******************************************************************************/ @@ -448,8 +432,6 @@ static void discovery_update_host_status(DB_DHOST *dhost, int status, int now) /****************************************************************************** * * - * Function: discovery_update_host * - * * * Purpose: process new host status * * * * Parameters: host - host info * @@ -467,8 +449,6 @@ void discovery_update_host(DB_DHOST *dhost, int status, int now) /****************************************************************************** * * - * Function: discovery_update_service * - * * * Purpose: process new service status * * * * Parameters: service - service info * diff --git a/src/libs/zbxdbhigh/event.c b/src/libs/zbxdbhigh/event.c index 800f5e74f0b..d6a9034c867 100644 --- a/src/libs/zbxdbhigh/event.c +++ b/src/libs/zbxdbhigh/event.c @@ -24,8 +24,6 @@ /****************************************************************************** * * - * Function: zbx_db_get_events_by_eventids * - * * * Purpose: get events and flags that indicate what was filled in DB_EVENT * * structure * * * @@ -217,8 +215,6 @@ void zbx_db_get_events_by_eventids(zbx_vector_uint64_t *eventids, zbx_vector_ptr /****************************************************************************** * * - * Function: zbx_db_free_event * - * * * Purpose: free the event with it's resources * * * * Parameters: event - [IN] event data * @@ -242,8 +238,6 @@ void zbx_db_free_event(DB_EVENT *event) /****************************************************************************** * * - * Function: get_db_eventid_r_eventid_pairs * - * * * Purpose: get recovery event IDs by event IDs then map them together also * * additional create a separate array of recovery event IDs * * * diff --git a/src/libs/zbxdbhigh/export.c b/src/libs/zbxdbhigh/export.c index 95a85f5ea39..14461082512 100644 --- a/src/libs/zbxdbhigh/export.c +++ b/src/libs/zbxdbhigh/export.c @@ -45,8 +45,6 @@ static char *export_dir; /****************************************************************************** * * - * Function: zbx_validate_export_type * - * * * Purpose: validate export type * * * * Parameters: export_type - [in] list of export types * @@ -114,8 +112,6 @@ int zbx_validate_export_type(char *export_type, uint32_t *export_mask) /****************************************************************************** * * - * Function: zbx_is_export_enabled * - * * * Purpose: checks if export is enabled for given type(s) * * * * Parameters: flag - ZBX_FLAG_EXPTYPE_EVENTS events are enabled * diff --git a/src/libs/zbxdbhigh/graph_linking.c b/src/libs/zbxdbhigh/graph_linking.c index 13875d137a1..9799f3114b4 100644 --- a/src/libs/zbxdbhigh/graph_linking.c +++ b/src/libs/zbxdbhigh/graph_linking.c @@ -867,8 +867,6 @@ static void prepare_graph_for_insert(graphs_items_entry_t *graphs_items_template /************************************************************************************ * * - * Function: process_template_graph * - * * * Description: 1) gets a template graph and host graph and compares them * * 2) if they are the same (they have same names and all of * * their items keys are the same) and checks which fields * @@ -946,8 +944,6 @@ static int process_template_graph(zbx_uint64_t host_graphid, zbx_hashset_t *host /************************************************************************************ * * - * Function: process_graphs * - * * * Description: 1) gets a list graph from the templates * * 2) gets a list of graphs_items for that graph * * 3) gets all the current host graphs (with names that match any of * @@ -1464,8 +1460,6 @@ static int execute_graphs_inserts(zbx_vector_graphs_copies_t *graphs_copies_inse /****************************************************************************** * * - * Function: DBcopy_template_graphs * - * * * Purpose: copy graphs from template to host * * * * Parameters: hostid - [IN] host identifier from database * diff --git a/src/libs/zbxdbhigh/host.c b/src/libs/zbxdbhigh/host.c index 50e9263b920..b41964b9b8c 100644 --- a/src/libs/zbxdbhigh/host.c +++ b/src/libs/zbxdbhigh/host.c @@ -59,8 +59,6 @@ static int zbx_ids_names_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: DBselect_ids_names * - * * * Parameters: sql - [IN] sql statement * * ids - [OUT] sorted list of selected uint64 values * * names - [OUT] list of names of the requested resource, order * @@ -171,8 +169,6 @@ static char *get_template_names(const zbx_vector_uint64_t *templateids) /****************************************************************************** * * - * Function: DBget_profiles_by_source_idxs_values * - * * * Description: gets a vector of profile identifiers used with the specified * * source, indexes and value identifiers * * * @@ -211,8 +207,6 @@ static void DBget_profiles_by_source_idxs_values(zbx_vector_uint64_t *profileids /****************************************************************************** * * - * Function: DBget_sysmapelements_by_element_type_ids * - * * * Description: gets a vector of sysmap element identifiers used with the * * specified element type and identifiers * * * @@ -244,8 +238,6 @@ static void DBget_sysmapelements_by_element_type_ids(zbx_vector_uint64_t *seleme /****************************************************************************** * * - * Function: validate_linked_templates * - * * * Description: Check collisions between linked templates * * * * Parameters: templateids - [IN] array of template IDs * @@ -448,8 +440,6 @@ out: /****************************************************************************** * * - * Function: validate_inventory_links * - * * * Description: Check collisions in item inventory links * * * * Parameters: hostid - [IN] host identifier from database * @@ -539,8 +529,6 @@ out: /****************************************************************************** * * - * Function: validate_httptests * - * * * Description: checking collisions on linking of web scenarios * * * * Parameters: hostid - [IN] host identifier from database * @@ -642,8 +630,6 @@ static void zbx_graph_valid_free(zbx_template_graph_valid_t *graph) /****************************************************************************** * * - * Function: validate_host * - * * * Description: Check collisions between host and linked template * * * * Parameters: hostid - [IN] host identifier from database * @@ -900,8 +886,6 @@ out: /****************************************************************************** * * - * Function: DBdelete_action_conditions * - * * * Purpose: delete action conditions by condition type and id * * * * Author: Alexander Vladishev * @@ -972,8 +956,6 @@ static void DBdelete_action_conditions(int conditiontype, zbx_uint64_t elementid /****************************************************************************** * * - * Function: DBadd_to_housekeeper * - * * * Purpose: adds table and field with specific id to housekeeper list * * * * Parameters: ids - [IN] identifiers for data removal * @@ -1016,8 +998,6 @@ out: /****************************************************************************** * * - * Function: DBdelete_triggers * - * * * Purpose: delete trigger from database * * * * Parameters: triggerids - [IN] trigger identifiers from database * @@ -1073,8 +1053,6 @@ void DBdelete_triggers(zbx_vector_uint64_t *triggerids) /****************************************************************************** * * - * Function: DBdelete_trigger_hierarchy * - * * * Purpose: delete parent triggers and auto-created children from database * * * * Parameters: triggerids - [IN] trigger identifiers from database * @@ -1115,8 +1093,6 @@ out: /****************************************************************************** * * - * Function: DBdelete_triggers_by_itemids * - * * * Purpose: delete triggers by itemid * * * * Parameters: itemids - [IN] item identifiers from database * @@ -1154,8 +1130,6 @@ out: /****************************************************************************** * * - * Function: DBdelete_graphs * - * * * Purpose: delete graph from database * * * * Parameters: graphids - [IN] array of graph id's from database * @@ -1207,8 +1181,6 @@ out: /****************************************************************************** * * - * Function: DBdelete_graph_hierarchy * - * * * Purpose: delete parent graphs and auto-created children from database * * * * Parameters: graphids - [IN] array of graph id's from database * @@ -1249,8 +1221,6 @@ out: /****************************************************************************** * * - * Function: DBdelete_graphs_by_itemids * - * * * Parameters: itemids - [IN] item identifiers from database * * * * Author: Alexander Vladishev * @@ -1314,8 +1284,6 @@ out: /****************************************************************************** * * - * Function: DBdelete_items * - * * * Purpose: delete items from database * * * * Parameters: itemids - [IN] array of item identifiers from database * @@ -1417,8 +1385,6 @@ out: /****************************************************************************** * * - * Function: DBdelete_httptests * - * * * Purpose: delete web tests from database * * * * Parameters: httptestids - [IN] array of httptest id's from database * @@ -1478,8 +1444,6 @@ out: /****************************************************************************** * * - * Function: DBgroup_prototypes_delete * - * * * Parameters: del_group_prototypeids - [IN] list of group_prototypeids which * * will be deleted * * * @@ -1521,8 +1485,6 @@ static void DBgroup_prototypes_delete(const zbx_vector_uint64_t *del_group_proto /****************************************************************************** * * - * Function: DBdelete_host_prototypes * - * * * Purpose: deletes host prototypes from database * * * * Parameters: host_prototype_ids - [IN] list of host prototype ids * @@ -1594,8 +1556,6 @@ out: /****************************************************************************** * * - * Function: DBdelete_template_httptests * - * * * Purpose: delete template web scenatios from host * * * * Parameters: hostid - [IN] host identifier from database * @@ -1635,8 +1595,6 @@ clean: /****************************************************************************** * * - * Function: DBdelete_template_graphs * - * * * Purpose: delete template graphs from host * * * * Parameters: hostid - [IN] host identifier from database * @@ -1680,8 +1638,6 @@ static void DBdelete_template_graphs(zbx_uint64_t hostid, const zbx_vector_uint6 /****************************************************************************** * * - * Function: DBdelete_template_triggers * - * * * Purpose: delete template triggers from host * * * * Parameters: hostid - [IN] host identifier from database * @@ -1724,8 +1680,6 @@ static void DBdelete_template_triggers(zbx_uint64_t hostid, const zbx_vector_uin /****************************************************************************** * * - * Function: DBdelete_template_host_prototypes * - * * * Purpose: delete template host prototypes from host * * * * Parameters: hostid - [IN] host identifier from database * @@ -1770,8 +1724,6 @@ clean: /****************************************************************************** * * - * Function: DBdelete_template_items * - * * * Purpose: delete template items from host * * * * Parameters: hostid - [IN] host identifier from database * @@ -1814,8 +1766,6 @@ clean: /****************************************************************************** * * - * Function: get_templates_by_hostid * - * * * Description: Retrieve already linked templates for specified host * * * * Parameters: hostid - [IN] host identifier from database * @@ -1848,8 +1798,6 @@ static void get_templates_by_hostid(zbx_uint64_t hostid, zbx_vector_uint64_t *te /****************************************************************************** * * - * Function: DBdelete_template_elements * - * * * Parameters: hostid - [IN] host identifier from database * * hostname - [IN] name of the host * * del_templateids - [IN] array of template IDs * @@ -2201,8 +2149,6 @@ static void DBhost_prototypes_clean(zbx_vector_ptr_t *host_prototypes) /****************************************************************************** * * - * Function: DBis_regular_host * - * * * Comments: auxiliary function for DBcopy_template_host_prototypes() * * * ******************************************************************************/ @@ -2226,8 +2172,6 @@ static int DBis_regular_host(zbx_uint64_t hostid) /****************************************************************************** * * - * Function: DBhost_prototypes_make * - * * * Comments: auxiliary function for DBcopy_template_host_prototypes() * * * ******************************************************************************/ @@ -2394,8 +2338,6 @@ static void DBhost_prototypes_make(zbx_uint64_t hostid, zbx_vector_uint64_t *tem /****************************************************************************** * * - * Function: DBhost_prototypes_templates_make * - * * * Parameters: host_prototypes - [IN/OUT] list of host prototypes * * should be sorted by templateid * * del_hosttemplateids - [OUT] list of hosttemplateids which * @@ -2528,8 +2470,6 @@ static void DBhost_prototypes_templates_make(zbx_vector_ptr_t *host_prototypes, /****************************************************************************** * * - * Function: DBhost_prototypes_groups_make * - * * * Parameters: host_prototypes - [IN/OUT] list of host prototypes * * should be sorted by templateid * * del_group_prototypeids - [OUT] sorted list of * @@ -2677,8 +2617,6 @@ static void DBhost_prototypes_groups_make(zbx_vector_ptr_t *host_prototypes, /****************************************************************************** * * - * Function: DBhost_prototypes_macro_make * - * * * Purpose: validate hostmacros value changes * * * * Parameters: hostmacros - [IN/OUT] list of hostmacros * @@ -2733,8 +2671,6 @@ static int DBhost_prototypes_macro_make(zbx_vector_macros_t *hostmacros, zbx_uin /****************************************************************************** * * - * Function: DBhost_prototypes_interface_make * - * * * Purpose: fill empty value in interfaces with input parameters * * * * Parameters: interfaces - [IN/OUT] list of host interfaces * @@ -2897,8 +2833,6 @@ static int DBhost_prototypes_interface_make(zbx_vector_interfaces_t *interfaces, /****************************************************************************** * * - * Function: DBhost_prototypes_macros_make * - * * * Parameters: host_prototypes - [IN/OUT] list of host prototypes * * should be sorted by templateid * * del_macroids - [OUT] sorted list of host macroids which * @@ -3046,8 +2980,6 @@ static void DBhost_prototypes_macros_make(zbx_vector_ptr_t *host_prototypes, zbx /****************************************************************************** * * - * Function: DBhost_prototypes_tags_make * - * * * Parameters: host_prototypes - [IN/OUT] list of host prototypes * * should be sorted by templateid * * del_tagids - [OUT] list of host tagids which * @@ -3197,10 +3129,6 @@ static void DBhost_prototypes_tags_make(zbx_vector_ptr_t *host_prototypes, zbx_v /****************************************************************************** * * - * Function: DBhost_prototypes_save * - * * - * Function: DBhost_prototypes_interfaces_make * - * * * Purpose: prepare interfaces to be added, updated or removed from DB * * Parameters: host_prototypes - [IN/OUT] list of host prototypes * * should be sorted by templateid * @@ -3446,8 +3374,6 @@ static void DBhost_prototypes_interfaces_make(zbx_vector_ptr_t *host_prototypes, /****************************************************************************** * * - * Function: DBhost_prototypes_interface_snmp_prepare_sql * - * * * Purpose: prepare sql for update record of interface_snmp table * * * * Parameters: hostid - [IN] host identifier * @@ -3572,8 +3498,6 @@ static void DBhost_prototypes_interface_snmp_prepare_sql(zbx_uint64_t hostid, co /****************************************************************************** * * - * Function: DBhost_prototypes_save * - * * * Purpose: auxiliary function for DBcopy_template_host_prototypes() * * * * Parameters: host_prototypes - [IN] vector of host prototypes * @@ -4320,8 +4244,6 @@ static void DBhost_prototypes_save(const zbx_vector_ptr_t *host_prototypes, /****************************************************************************** * * - * Function: DBcopy_template_host_prototypes * - * * * Purpose: copy host prototypes from templates and create links between * * them and discovery rules * * * @@ -4521,8 +4443,6 @@ httpfield_t; /****************************************************************************** * * - * Function: DBget_httptests * - * * ******************************************************************************/ static void DBget_httptests(const zbx_uint64_t hostid, const zbx_vector_uint64_t *templateids, zbx_vector_ptr_t *httptests) @@ -5070,8 +4990,6 @@ static void DBget_httptests(const zbx_uint64_t hostid, const zbx_vector_uint64_t /****************************************************************************** * * - * Function: DBsave_httptests * - * * ******************************************************************************/ static void DBsave_httptests(zbx_uint64_t hostid, const zbx_vector_ptr_t *httptests) { @@ -5615,8 +5533,6 @@ static void DBsave_httptests(zbx_uint64_t hostid, const zbx_vector_ptr_t *httpte /****************************************************************************** * * - * Function: clean_httptests * - * * ******************************************************************************/ static void clean_httptests(zbx_vector_ptr_t *httptests) { @@ -5721,8 +5637,6 @@ static void clean_httptests(zbx_vector_ptr_t *httptests) /****************************************************************************** * * - * Function: DBcopy_template_httptests * - * * * Purpose: copy web scenarios from template to host * * * * Parameters: hostid - [IN] host identifier from database * @@ -5748,8 +5662,6 @@ static void DBcopy_template_httptests(zbx_uint64_t hostid, const zbx_vector_uint /****************************************************************************** * * - * Function: DBcopy_template_elements * - * * * Purpose: copy elements from specified template * * * * Parameters: hostid - [IN] host identifier from database * @@ -5846,8 +5758,6 @@ clean: /****************************************************************************** * * - * Function: DBdelete_hosts * - * * * Purpose: delete hosts from database with all elements * * * * Parameters: hostids - [IN] host identifiers from database * @@ -5938,8 +5848,6 @@ out: /****************************************************************************** * * - * Function: DBdelete_hosts_with_prototypes * - * * * Purpose: delete hosts from database, check if there are any host * * prototypes and delete them first * * * @@ -5982,8 +5890,6 @@ clean: /****************************************************************************** * * - * Function: DBadd_interface * - * * * Purpose: add new interface to specified host * * * * Parameters: hostid - [IN] host identifier from database * @@ -6129,8 +6035,6 @@ out: /****************************************************************************** * * - * Function: DBadd_interface_snmp * - * * * Purpose: add new or update interface options to specified interface * * * * Parameters: interfaceid - [IN] interface id from database * @@ -6272,8 +6176,6 @@ out: /****************************************************************************** * * - * Function: DBdelete_groups_validate * - * * * Purpose: removes the groupids from the list which cannot be deleted * * (host or template can remain without groups or it's an internal * * group or it's used by a host prototype) * @@ -6401,8 +6303,6 @@ static void DBdelete_groups_validate(zbx_vector_uint64_t *groupids) /****************************************************************************** * * - * Function: DBdelete_groups * - * * * Purpose: delete host groups from database * * * * Parameters: groupids - [IN] array of group identifiers from database * @@ -6459,8 +6359,6 @@ out: /****************************************************************************** * * - * Function: DBadd_host_inventory * - * * * Purpose: adds host inventory to the host * * * * Parameters: hostid - [IN] host identifier * @@ -6480,8 +6378,6 @@ void DBadd_host_inventory(zbx_uint64_t hostid, int inventory_mode) /****************************************************************************** * * - * Function: DBset_host_inventory * - * * * Purpose: sets host inventory mode for the specified host * * * * Parameters: hostid - [IN] host identifier * diff --git a/src/libs/zbxdbhigh/item.c b/src/libs/zbxdbhigh/item.c index 909a88e898d..de00601daa7 100644 --- a/src/libs/zbxdbhigh/item.c +++ b/src/libs/zbxdbhigh/item.c @@ -23,8 +23,6 @@ /****************************************************************************** * * - * Function: zbx_db_save_item_changes * - * * * Purpose: save item state, error, mtime, lastlogsize changes to * * database * * * diff --git a/src/libs/zbxdbhigh/lld_macro.c b/src/libs/zbxdbhigh/lld_macro.c index 5624cb5658e..7533c18f459 100644 --- a/src/libs/zbxdbhigh/lld_macro.c +++ b/src/libs/zbxdbhigh/lld_macro.c @@ -24,8 +24,6 @@ /****************************************************************************** * * - * Function: lld_macro_paths_compare * - * * * Purpose: sorting function to sort LLD macros by unique name * * * ******************************************************************************/ @@ -39,8 +37,6 @@ int zbx_lld_macro_paths_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: lld_macro_paths_get * - * * * Purpose: retrieve list of LLD macros * * * * Parameters: lld_ruleid - [IN] LLD id * @@ -93,8 +89,6 @@ int zbx_lld_macro_paths_get(zbx_uint64_t lld_ruleid, zbx_vector_ptr_t *lld_macro /****************************************************************************** * * - * Function: lld_macro_path_free * - * * * Purpose: release resources allocated by lld macro path * * * * Parameters: lld_macro_path - [IN] json path to extract from lld_row * @@ -109,8 +103,6 @@ void zbx_lld_macro_path_free(zbx_lld_macro_path_t *lld_macro_path) /****************************************************************************** * * - * Function: zbx_lld_macro_value_by_name * - * * * Purpose: get value of LLD macro using json path if available or by * * searching for such key in key value pairs of array entry * * * diff --git a/src/libs/zbxdbhigh/lld_override.c b/src/libs/zbxdbhigh/lld_override.c index 52f07c519dc..21e211ae280 100644 --- a/src/libs/zbxdbhigh/lld_override.c +++ b/src/libs/zbxdbhigh/lld_override.c @@ -38,8 +38,6 @@ void zbx_lld_override_operation_free(zbx_lld_override_operation_t *override_oper /****************************************************************************** * * - * Function: lld_override_operations_load_tags * - * * * Purpose: load tag override operations from database * * * * Parameters: overrideids - [IN] the lld overrideids, sorted * @@ -101,8 +99,6 @@ static void lld_override_operations_load_tags(const zbx_vector_uint64_t *overrid /****************************************************************************** * * - * Function: lld_override_operations_load_templates * - * * * Purpose: load template lld override operations from database * * * * Parameters: overrideids - [IN] the lld overrideids, sorted * @@ -162,8 +158,6 @@ static void lld_override_operations_load_templates(const zbx_vector_uint64_t *ov /****************************************************************************** * * - * Function: zbx_load_lld_override_operations * - * * * Purpose: load lld override operations from database * * * * Parameters: overrideids - [IN] the lld overrideids, sorted * diff --git a/src/libs/zbxdbhigh/maintenance.c b/src/libs/zbxdbhigh/maintenance.c index 0ad1237e103..e9d240ac677 100644 --- a/src/libs/zbxdbhigh/maintenance.c +++ b/src/libs/zbxdbhigh/maintenance.c @@ -22,8 +22,6 @@ /****************************************************************************** * * - * Function: zbx_db_lock_maintenanceids * - * * * Purpose: lock maintenances in database * * * * Parameters: maintenanceids - [IN/OUT] a vector of unique maintenance ids * diff --git a/src/libs/zbxdbhigh/proxy.c b/src/libs/zbxdbhigh/proxy.c index 59588f5ab11..4a9ca4cf241 100644 --- a/src/libs/zbxdbhigh/proxy.c +++ b/src/libs/zbxdbhigh/proxy.c @@ -135,8 +135,6 @@ zbx_keys_path_t; /****************************************************************************** * * - * Function: zbx_proxy_check_permissions * - * * * Purpose: check proxy connection permissions (encryption configuration and * * if peer proxy address is allowed) * * * @@ -230,8 +228,6 @@ int zbx_proxy_check_permissions(const DC_PROXY *proxy, const zbx_socket_t *sock, /****************************************************************************** * * - * Function: zbx_host_check_permissions * - * * * Purpose: checks host connection permissions (encryption configuration) * * * * Parameters: * @@ -317,8 +313,6 @@ static int zbx_host_check_permissions(const DC_HOST *host, const zbx_socket_t *s /****************************************************************************** * * - * Function: get_active_proxy_from_request * - * * * Purpose: * * Extract a proxy name from JSON and find the proxy ID in configuration * * cache, and check access rights. The proxy must be configured in active * @@ -357,8 +351,6 @@ int get_active_proxy_from_request(struct zbx_json_parse *jp, DC_PROXY *proxy, ch /****************************************************************************** * * - * Function: check_access_passive_proxy * - * * * Purpose: * * Check access rights to a passive proxy for the given connection and * * send a response if denied. * @@ -438,8 +430,6 @@ int check_access_passive_proxy(zbx_socket_t *sock, int send_response, const char /****************************************************************************** * * - * Function: proxyconfig_add_row * - * * * Purpose: add database row to the proxy config json data * * * * Parameters: j - [OUT] the output json * @@ -486,8 +476,6 @@ zbx_proxy_item_config_t; /****************************************************************************** * * - * Function: get_proxyconfig_table_items * - * * * Purpose: prepare items table proxy configuration data * * * ******************************************************************************/ @@ -654,8 +642,6 @@ skip_data: /****************************************************************************** * * - * Function: get_proxyconfig_table_items * - * * * Purpose: prepare items table proxy configuration data * * * ******************************************************************************/ @@ -774,8 +760,6 @@ static void key_path_free(void *data) /****************************************************************************** * * - * Function: get_proxyconfig_table * - * * * Purpose: prepare proxy configuration data * * * ******************************************************************************/ @@ -1098,8 +1082,6 @@ static void get_macro_secrets(const zbx_vector_ptr_t *keys_paths, struct zbx_jso /****************************************************************************** * * - * Function: get_proxyconfig_data * - * * * Purpose: prepare proxy configuration data * * * ******************************************************************************/ @@ -1192,8 +1174,6 @@ out: /****************************************************************************** * * - * Function: remember_record * - * * * Purpose: A record is stored as a sequence of fields and flag bytes for * * handling NULL values. A field is stored as a null-terminated * * string to preserve field boundaries. If a field value can be NULL * @@ -1252,8 +1232,6 @@ static int id_offset_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: find_field_by_name * - * * * Purpose: find a number of the field * * * ******************************************************************************/ @@ -1272,8 +1250,6 @@ static int find_field_by_name(const ZBX_FIELD **fields, int fields_count, const /****************************************************************************** * * - * Function: compare_nth_field * - * * * Purpose: This function compares a value from JSON record with the value * * of the n-th field of DB record. For description how DB record is * * stored in memory see comments in function remember_record(). * @@ -1353,8 +1329,6 @@ static int compare_nth_field(const ZBX_FIELD **fields, const char *rec_data, int /****************************************************************************** * * - * Function: process_proxyconfig_table * - * * * Purpose: update configuration table * * * * Parameters: ... * @@ -1981,8 +1955,6 @@ out: /****************************************************************************** * * - * Function: process_proxyconfig * - * * * Purpose: update configuration * * * ******************************************************************************/ @@ -2100,8 +2072,6 @@ int process_proxyconfig(struct zbx_json_parse *jp_data, struct zbx_json_parse *j /****************************************************************************** * * - * Function: get_interface_availability_data * - * * * Return value: SUCCEED - processed successfully * * FAIL - no interface availability has been changed * * * @@ -2148,8 +2118,6 @@ out: /****************************************************************************** * * - * Function: process_interfaces_availability_contents * - * * * Purpose: parses interfaces availability data contents and processes it * * * * Return value: SUCCEED - processed successfully * @@ -2233,8 +2201,6 @@ out: /****************************************************************************** * * - * Function: proxy_get_lastid * - * * ******************************************************************************/ static void proxy_get_lastid(const char *table_name, const char *lastidfield, zbx_uint64_t *lastid) { @@ -2257,8 +2223,6 @@ static void proxy_get_lastid(const char *table_name, const char *lastidfield, zb /****************************************************************************** * * - * Function: proxy_set_lastid * - * * ******************************************************************************/ static void proxy_set_lastid(const char *table_name, const char *lastidfield, const zbx_uint64_t lastid) { @@ -2326,8 +2290,6 @@ int proxy_get_delay(const zbx_uint64_t lastid) /****************************************************************************** * * - * Function: proxy_get_history_data_simple * - * * * Purpose: Get history data from the database. * * * ******************************************************************************/ @@ -2436,8 +2398,6 @@ zbx_history_data_t; /****************************************************************************** * * - * Function: proxy_get_history_data * - * * * Purpose: read proxy history data from the database * * * * Parameters: lastid - [IN] the id of last processed proxy * @@ -2580,8 +2540,6 @@ try_again: /****************************************************************************** * * - * Function: proxy_add_hist_data * - * * * Purpose: add history records to output json * * * * Parameters: j - [IN] the json output buffer * @@ -2888,8 +2846,6 @@ void calc_timestamp(const char *line, int *timestamp, const char *format) /****************************************************************************** * * - * Function: process_item_value * - * * * Purpose: processes item value depending on proxy/flags settings * * * * Parameters: item - [IN] the item to process * @@ -2927,8 +2883,6 @@ static void process_item_value(const DC_ITEM *item, AGENT_RESULT *result, zbx_ti /****************************************************************************** * * - * Function: process_history_data_value * - * * * Purpose: process single value from incoming history data * * * * Parameters: item - [IN] the item to process * @@ -3027,8 +2981,6 @@ static int process_history_data_value(DC_ITEM *item, zbx_agent_value_t *value, i /****************************************************************************** * * - * Function: process_history_data * - * * * Purpose: process new item values * * * * Parameters: items - [IN] the items to process * @@ -3099,8 +3051,6 @@ int process_history_data(DC_ITEM *items, zbx_agent_value_t *values, int *errcode /****************************************************************************** * * - * Function: zbx_agent_values_clean * - * * * Purpose: frees resources allocated to store agent values * * * * Parameters: values - [IN] the values to clean * @@ -3120,8 +3070,6 @@ static void zbx_agent_values_clean(zbx_agent_value_t *values, size_t values_num) /****************************************************************************** * * - * Function: log_client_timediff * - * * * Purpose: calculates difference between server and client (proxy, active * * agent or sender) time and log it * * * @@ -3174,8 +3122,6 @@ static void log_client_timediff(int level, struct zbx_json_parse *jp, const zbx_ /****************************************************************************** * * - * Function: parse_history_data_row_value * - * * * Purpose: parses agent value from history data json row * * * * Parameters: jp_row - [IN] JSON with history data row * @@ -3274,8 +3220,6 @@ out: /****************************************************************************** * * - * Function: parse_history_data_row_itemid * - * * * Purpose: parses item identifier from history data json row * * * * Parameters: jp_row - [IN] JSON with history data row * @@ -3299,8 +3243,6 @@ static int parse_history_data_row_itemid(const struct zbx_json_parse *jp_row, zb } /****************************************************************************** * * - * Function: parse_history_data_row_hostkey * - * * * Purpose: parses host,key pair from history data json row * * * * Parameters: jp_row - [IN] JSON with history data row * @@ -3334,8 +3276,6 @@ static int parse_history_data_row_hostkey(const struct zbx_json_parse *jp_row, z /****************************************************************************** * * - * Function: parse_history_data * - * * * Purpose: parses up to ZBX_HISTORY_VALUES_MAX item values and host,key * * pairs from history data json * * * @@ -3405,8 +3345,6 @@ out: /****************************************************************************** * * - * Function: parse_history_data_by_itemids * - * * * Purpose: parses up to ZBX_HISTORY_VALUES_MAX item values and item * * identifiers from history data json * * * @@ -3482,8 +3420,6 @@ out: /****************************************************************************** * * - * Function: proxy_item_validator * - * * * Purpose: validates item received from proxy * * * * Parameters: item - [IN/OUT] the item data * @@ -3515,8 +3451,6 @@ static int proxy_item_validator(DC_ITEM *item, zbx_socket_t *sock, void *args, c /****************************************************************************** * * - * Function: process_history_data_by_itemids * - * * * Purpose: parses history data array and process the data * * * * Parameters: proxy - [IN] the proxy * @@ -3623,8 +3557,6 @@ static int process_history_data_by_itemids(zbx_socket_t *sock, zbx_client_item_v /****************************************************************************** * * - * Function: agent_item_validator * - * * * Purpose: validates item received from active agent * * * * Parameters: item - [IN] the item data * @@ -3657,8 +3589,6 @@ static int agent_item_validator(DC_ITEM *item, zbx_socket_t *sock, void *args, c /****************************************************************************** * * - * Function: sender_item_validator * - * * * Purpose: validates item received from sender * * * * Parameters: item - [IN] the item data * @@ -3827,8 +3757,6 @@ static void process_history_data_by_keys(zbx_socket_t *sock, zbx_client_item_val /****************************************************************************** * * - * Function: process_client_history_data * - * * * Purpose: process history data sent by proxy/agent/sender * * * * Parameters: sock - [IN] the connection socket * @@ -3918,8 +3846,6 @@ out: /****************************************************************************** * * - * Function: process_agent_history_data * - * * * Purpose: process history data received from Zabbix active agent * * * * Parameters: sock - [IN] the connection socket * @@ -3941,8 +3867,6 @@ int process_agent_history_data(zbx_socket_t *sock, struct zbx_json_parse *jp, zb /****************************************************************************** * * - * Function: process_sender_history_data * - * * * Purpose: process history data received from Zabbix sender * * * * Parameters: sock - [IN] the connection socket * @@ -3979,8 +3903,6 @@ static void zbx_drule_free(zbx_drule_t *drule) /****************************************************************************** * * - * Function: process_services * - * * * Purpose: process services discovered on IP address * * * * Parameters: drule_ptr - [IN] discovery rule structure * @@ -4154,8 +4076,6 @@ fail: /****************************************************************************** * * - * Function: process_discovery_data_contents * - * * * Purpose: parse discovery data contents and process it * * * * Parameters: jp_data - [IN] JSON with discovery data * @@ -4341,8 +4261,6 @@ json_parse_return: /****************************************************************************** * * - * Function: process_autoregistration_contents * - * * * Purpose: parse autoregistration data contents and process it * * * * Parameters: jp_data - [IN] JSON with autoregistration data * @@ -4493,8 +4411,6 @@ static int process_autoregistration_contents(struct zbx_json_parse *jp_data, zbx /****************************************************************************** * * - * Function: proxy_get_history_count * - * * * Purpose: get the number of values waiting to be sent to the sever * * * * Return value: the number of history values * @@ -4525,8 +4441,6 @@ int proxy_get_history_count(void) /****************************************************************************** * * - * Function: zbx_get_proxy_protocol_version * - * * * Purpose: extracts protocol version from json data * * * * Parameters: * @@ -4553,8 +4467,6 @@ int zbx_get_proxy_protocol_version(struct zbx_json_parse *jp) /****************************************************************************** * * - * Function: process_tasks_contents * - * * * Purpose: parse tasks contents and saves the received tasks * * * * Parameters: jp_tasks - [IN] JSON with tasks data * @@ -4578,8 +4490,6 @@ static void process_tasks_contents(struct zbx_json_parse *jp_tasks) /****************************************************************************** * * - * Function: zbx_strcatnl_alloc * - * * * Purpose: appends text to the string on a new line * * * ******************************************************************************/ @@ -4593,8 +4503,6 @@ static void zbx_strcatnl_alloc(char **info, size_t *info_alloc, size_t *info_off /****************************************************************************** * * - * Function: check_proxy_nodata * - * * * Purpose: detect lost connection with proxy and calculate suppression * * window if possible * * * @@ -4629,8 +4537,6 @@ static void check_proxy_nodata(zbx_timespec_t *ts, unsigned char proxy_status, z /****************************************************************************** * * - * Function: check_proxy_nodata_empty * - * * * Purpose: detect lack of data during lost connectivity * * * * Parameters: ts - [IN] timestamp when the proxy connection was * @@ -4661,8 +4567,6 @@ static void check_proxy_nodata_empty(zbx_timespec_t *ts, unsigned char proxy_sta /****************************************************************************** * * - * Function: process_proxy_data * - * * * Purpose: process 'proxy data' request * * * * Parameters: proxy - [IN] the source proxy * @@ -4800,8 +4704,6 @@ out: /****************************************************************************** * * - * Function: zbx_db_flush_proxy_lastaccess * - * * * Purpose: flushes lastaccess changes for proxies every * * ZBX_PROXY_LASTACCESS_UPDATE_FREQUENCY seconds * * * @@ -4852,8 +4754,6 @@ static void zbx_db_flush_proxy_lastaccess(void) /****************************************************************************** * * - * Function: zbx_update_proxy_data * - * * * Purpose: updates proxy runtime properties in cache and database. * * * * Parameters: proxy - [IN/OUT] the proxy * @@ -4898,8 +4798,6 @@ void zbx_update_proxy_data(DC_PROXY *proxy, int version, int lastaccess, int com } /****************************************************************************** * * - * Function: zbx_update_proxy_lasterror * - * * * Purpose: flushes last_version_error_time changes runtime * * variable for proxies structures * * * @@ -4917,8 +4815,6 @@ static void zbx_update_proxy_lasterror(DC_PROXY *proxy) } /****************************************************************************** * * - * Function: zbx_check_protocol_version * - * * * Purpose: check server and proxy versions and compatibility rules * * * * Parameters: * diff --git a/src/libs/zbxdbhigh/template_item.c b/src/libs/zbxdbhigh/template_item.c index c0feae4a752..77fff9056e7 100644 --- a/src/libs/zbxdbhigh/template_item.c +++ b/src/libs/zbxdbhigh/template_item.c @@ -188,8 +188,6 @@ static void DBget_interfaces_by_hostid(zbx_uint64_t hostid, zbx_uint64_t *interf /****************************************************************************** * * - * Function: get_template_items * - * * * Purpose: read template items from database * * * * Parameters: hostid - [IN] host id * @@ -525,8 +523,6 @@ static void get_template_items(zbx_uint64_t hostid, const zbx_vector_uint64_t *t /****************************************************************************** * * - * Function: get_template_lld_rule_map * - * * * Purpose: reads template lld rule conditions and host lld_rule identifiers * * from database * * * @@ -672,8 +668,6 @@ static void get_template_lld_rule_map(const zbx_vector_ptr_t *items, zbx_vector_ /****************************************************************************** * * - * Function: calculate_template_lld_rule_conditionids * - * * * Purpose: calculate identifiers for new item conditions * * * * Parameters: rules - [IN] the lld rule mapping * @@ -735,8 +729,6 @@ static void update_template_lld_formula(char **formula, zbx_uint64_t id_proto, z /****************************************************************************** * * - * Function: update_template_lld_rule_formulas * - * * * Purpose: translate template item condition identifiers in expression type * * discovery rule formulas to refer the host item condition * * identifiers instead. * @@ -794,8 +786,6 @@ static void update_template_lld_rule_formulas(zbx_vector_ptr_t *items, zbx_vecto /****************************************************************************** * * - * Function: save_template_item * - * * * Purpose: save (insert or update) template item * * * * Parameters: hostid - [IN] parent host id * @@ -977,8 +967,6 @@ dependent: /****************************************************************************** * * - * Function: save_template_items * - * * * Purpose: saves template items to the target host in database * * * * Parameters: hostid - [IN] the target host * @@ -1065,8 +1053,6 @@ static void save_template_items(zbx_uint64_t hostid, zbx_vector_ptr_t *items) /****************************************************************************** * * - * Function: save_template_lld_rules * - * * * Purpose: saves template lld rule item conditions to the target host in * * database * * * @@ -1249,8 +1235,6 @@ static void save_template_lld_rules(zbx_vector_ptr_t *items, zbx_vector_ptr_t *r /****************************************************************************** * * - * Function: save_template_discovery_prototypes * - * * * Purpose: saves host item prototypes in database * * * * Parameters: hostid - [IN] the target host * @@ -1406,8 +1390,6 @@ static void zbx_lld_macros_free(zbx_template_lld_macro_t *macro) /****************************************************************************** * * - * Function: free_template_item * - * * * Purpose: frees template item * * * * Parameters: item - [IN] the template item * @@ -1476,8 +1458,6 @@ static void free_template_item(zbx_template_item_t *item) /****************************************************************************** * * - * Function: free_lld_rule_condition * - * * * Purpose: frees lld rule condition * * * * Parameters: item - [IN] the lld rule condition * @@ -1496,8 +1476,6 @@ static void free_lld_rule_condition(zbx_lld_rule_condition_t *condition) /****************************************************************************** * * - * Function: free_lld_rule_map * - * * * Purpose: frees lld rule mapping * * * * Parameters: item - [IN] the lld rule mapping * @@ -1531,8 +1509,6 @@ static int template_item_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: copy_template_items_preproc * - * * * Purpose: copy template item preprocessing options * * * * Parameters: items - [IN] vector of new/updated items * @@ -1713,8 +1689,6 @@ static void copy_template_items_preproc(const zbx_vector_ptr_t *items) /****************************************************************************** * * - * Function: copy_template_item_tags * - * * * Purpose: copy template item tags * * * * Parameters: items - [IN] vector of new/updated items * @@ -1865,8 +1839,6 @@ static void copy_template_item_tags(const zbx_vector_ptr_t *items) /****************************************************************************** * * - * Function: copy_template_item_script_params * - * * * Purpose: copy template item script parameters * * * * Parameters: items - [IN] vector of new/updated items * @@ -2020,8 +1992,6 @@ static void copy_template_item_script_params(const zbx_vector_ptr_t *items) /****************************************************************************** * * - * Function: copy_template_lld_macro_paths * - * * * Purpose: copy template discovery item lld macro paths * * * * Parameters: items - [IN] vector of new/updated items * @@ -2630,8 +2600,6 @@ static void copy_template_lld_overrides(const zbx_vector_uint64_t *templateids, /****************************************************************************** * * - * Function: compare_template_items * - * * * Purpose: compare templateid of two template items * * * * Parameters: d1 - [IN] first template item * @@ -2650,8 +2618,6 @@ static int compare_template_items(const void *d1, const void *d2) /****************************************************************************** * * - * Function: link_template_dependent_items * - * * * Purpose: create dependent item index in master item data * * * * Parameters: items - [IN/OUT] the template items * @@ -2727,8 +2693,6 @@ static int template_lld_macro_sort_by_macro(const void *d1, const void *d2) } /****************************************************************************** * * - * Function: link_template_items_preproc * - * * * Purpose: create item_preproc vectors in item data * * * * Parameters: templateids - [IN] vector of template IDs * @@ -2907,8 +2871,6 @@ static void link_template_items_preproc(const zbx_vector_uint64_t *templateids, /****************************************************************************** * * - * Function: link_template_items_tag * - * * * Purpose: create item_tags vectors in item data * * * * Parameters: templateids - [IN] vector of template IDs * @@ -3070,8 +3032,6 @@ static void link_template_items_tag(const zbx_vector_uint64_t *templateids, zbx_ /****************************************************************************** * * - * Function: link_template_items_param * - * * * Purpose: create item_params vectors in item data * * * * Parameters: templateids - [IN] vector of template IDs * @@ -3248,8 +3208,6 @@ static void link_template_items_param(const zbx_vector_uint64_t *templateids, zb /****************************************************************************** * * - * Function: link_template_lld_macro_paths * - * * * Purpose: create lld_macro vectors in item data * * * * Parameters: templateids - [IN] vector of template IDs * @@ -3411,8 +3369,6 @@ static void link_template_lld_macro_paths(const zbx_vector_uint64_t *templateids } /****************************************************************************** * * - * Function: prepare_lld_items * - * * * Purpose: prepare lld items by indexing them and scanning for already * * existing items * * * @@ -3445,8 +3401,6 @@ static void prepare_lld_items(const zbx_vector_ptr_t *items, zbx_vector_uint64_t /****************************************************************************** * * - * Function: DBcopy_template_items * - * * * Purpose: copy template items to host * * * * Parameters: hostid - [IN] host id * diff --git a/src/libs/zbxdbhigh/trigger.c b/src/libs/zbxdbhigh/trigger.c index 00de66a938c..1828f7fc1c4 100644 --- a/src/libs/zbxdbhigh/trigger.c +++ b/src/libs/zbxdbhigh/trigger.c @@ -34,8 +34,6 @@ /****************************************************************************** * * - * Function: zbx_process_trigger * - * * * Purpose: 1) calculate changeset of trigger fields to be updated * * 2) generate events * * * @@ -145,8 +143,6 @@ out: /****************************************************************************** * * - * Function: zbx_db_save_trigger_changes * - * * * Purpose: save the trigger changes to database * * * * Parameters: trigger_diff - [IN] the trigger changeset * @@ -218,8 +214,6 @@ void zbx_db_save_trigger_changes(const zbx_vector_ptr_t *trigger_diff) /****************************************************************************** * * - * Function: zbx_trigger_diff_free * - * * * Purpose: frees trigger changeset * * * ******************************************************************************/ @@ -246,8 +240,6 @@ static int zbx_trigger_topoindex_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: zbx_process_triggers * - * * * Purpose: process triggers - calculates property changeset and generates * * events * * * @@ -280,8 +272,6 @@ out: /****************************************************************************** * * - * Function: zbx_append_trigger_diff * - * * * Purpose: Adds a new trigger diff to trigger changeset vector * * * ******************************************************************************/ @@ -327,8 +317,6 @@ zbx_trigger_cache_state_t; /****************************************************************************** * * - * Function: db_trigger_get_cache * - * * * Purpose: get trigger cache with the requested data cached * * * * Parameters: trigger - [IN] the trigger * @@ -403,8 +391,6 @@ static zbx_trigger_cache_t *db_trigger_get_cache(const DB_TRIGGER *trigger, zbx_ /****************************************************************************** * * - * Function: trigger_cache_free * - * * * Purpose: free trigger cache * * * * Parameters: cache - [IN] the trigger cache * @@ -426,8 +412,6 @@ static void trigger_cache_free(zbx_trigger_cache_t *cache) /****************************************************************************** * * - * Function: zbx_db_trigger_get_all_functionids * - * * * Purpose: get functionids from trigger expression and recovery expression * * * * Parameters: trigger - [IN] the trigger * @@ -452,8 +436,6 @@ void zbx_db_trigger_get_all_functionids(const DB_TRIGGER *trigger, zbx_vector_ui /****************************************************************************** * * - * Function: zbx_db_trigger_get_functionids * - * * * Purpose: get functionids from trigger expression * * * * Parameters: trigger - [IN] the trigger * @@ -474,8 +456,6 @@ void zbx_db_trigger_get_functionids(const DB_TRIGGER *trigger, zbx_vector_uint64 } /****************************************************************************** * * - * Function: zbx_db_trigger_get_constant * - * * * Purpose: get trigger expression constant at the specified location * * * * Parameters: trigger - [IN] the trigger * @@ -503,8 +483,6 @@ int zbx_db_trigger_get_constant(const DB_TRIGGER *trigger, int index, char **out /****************************************************************************** * * - * Function: zbx_db_trigger_get_itemid * - * * * Purpose: get the Nth function item from trigger expression * * * * Parameters: trigger - [IN] the trigger * @@ -567,8 +545,6 @@ int zbx_db_trigger_get_itemid(const DB_TRIGGER *trigger, int index, zbx_uint64_t /****************************************************************************** * * - * Function: zbx_db_trigger_get_itemids * - * * * Purpose: get unique itemids of trigger functions in the order at they are * * written in expression * * * @@ -636,8 +612,6 @@ void zbx_db_trigger_get_itemids(const DB_TRIGGER *trigger, zbx_vector_uint64_t * /****************************************************************************** * * - * Function: zbx_db_trigger_get_all_hostids * - * * * Purpose: get hostids from trigger expression and recovery expression * * * * Parameters: trigger - [IN] the trigger * @@ -662,8 +636,6 @@ int zbx_db_trigger_get_all_hostids(const DB_TRIGGER *trigger, const zbx_vector_u /****************************************************************************** * * - * Function: zbx_db_trigger_clean * - * * * Purpose: frees resources allocated to store trigger data * * * * Parameters: trigger - * @@ -685,8 +657,6 @@ void zbx_db_trigger_clean(DB_TRIGGER *trigger) /****************************************************************************** * * - * Function: db_trigger_get_expression * - * * * Purpose: get original trigger expression/recovery expression with expanded * * functions * * * @@ -780,8 +750,6 @@ static void db_trigger_get_expression(const zbx_eval_context_t *ctx, char **expr /****************************************************************************** * * - * Function: zbx_db_trigger_get_expression * - * * * Purpose: get original trigger expression with expanded functions * * * * Parameters: trigger - [IN] the trigger * @@ -800,8 +768,6 @@ void zbx_db_trigger_get_expression(const DB_TRIGGER *trigger, char **expression) /****************************************************************************** * * - * Function: zbx_db_trigger_get_recovery_expression * - * * * Purpose: get original trigger recovery expression with expanded functions * * * * Parameters: trigger - [IN] the trigger * diff --git a/src/libs/zbxdbhigh/trigger_dep_linking.c b/src/libs/zbxdbhigh/trigger_dep_linking.c index 6a3e679b0af..80b07f20421 100644 --- a/src/libs/zbxdbhigh/trigger_dep_linking.c +++ b/src/libs/zbxdbhigh/trigger_dep_linking.c @@ -110,8 +110,6 @@ static void zbx_triggers_dep_entries_clean(zbx_hashset_t *h) /********************************************************************************* * * - * Function: DBresolve_template_trigger_dependencies * - * * * Purpose: resolves trigger dependencies for the specified triggers based on * * host and linked templates * * * @@ -270,8 +268,6 @@ clean: /********************************************************************************************************** * * - * Function: prepare_trigger_dependencies_updates_and_deletes * - * * * Purpose: takes a list of pending trigger dependencies (links) and excludes entries that are * * already present on the target host to generate a new list (links_processed). Also, prepare * * the list of the trigger dependencies (trigger_dep_ids_del) that need to be deleted on the * @@ -521,8 +517,6 @@ clean: /******************************************************************************** * * - * Function: DBsync_template_dependencies_for_triggers * - * * * Purpose: update trigger dependencies for specified host * * * * Parameters: hostid - [IN] host identifier from database * diff --git a/src/libs/zbxdbhigh/trigger_linking.c b/src/libs/zbxdbhigh/trigger_linking.c index fe64c7e4f1a..c00e8a6e7ee 100644 --- a/src/libs/zbxdbhigh/trigger_linking.c +++ b/src/libs/zbxdbhigh/trigger_linking.c @@ -290,8 +290,6 @@ static void trigger_tag_insert_temp_free(zbx_trigger_tag_insert_temp_t *trigger_ /******************************************************************************** * * - * Function: DBcopy_template_trigger_tags * - * * * Purpose: copies tags from template triggers to created/linked triggers * * * * Parameters: new_triggerids - the created trigger ids * @@ -1364,8 +1362,6 @@ static void trigger_copies_free(zbx_trigger_copy_t *trigger_copy) /******************************************************************************** * * - * Function: DBcopy_template_triggers * - * * * Purpose: Copy template triggers to host * * * * Parameters: hostid - [IN] host identifier from database * diff --git a/src/libs/zbxdbupgrade/dbupgrade.c b/src/libs/zbxdbupgrade/dbupgrade.c index 8c8f77ee255..f5fccf95126 100644 --- a/src/libs/zbxdbupgrade/dbupgrade.c +++ b/src/libs/zbxdbupgrade/dbupgrade.c @@ -136,8 +136,6 @@ zbx_oracle_column_type_t; /****************************************************************************** * * - * Function: zbx_oracle_column_type * - * * * Purpose: determine whether column type is character or numeric * * * * Parameters: field_type - [IN] column type in Zabbix definitions * diff --git a/src/libs/zbxdbupgrade/dbupgrade_2010.c b/src/libs/zbxdbupgrade/dbupgrade_2010.c index 92de56972b3..cd765e97cc8 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_2010.c +++ b/src/libs/zbxdbupgrade/dbupgrade_2010.c @@ -44,8 +44,6 @@ static int DBmodify_proxy_table_id_field(const char *table_name) /********************************************************************************* * * - * Function: parse_db_monitor_item_params * - * * * Purpose: parse database monitor item params string "user=<user> password= * * <passsword> DSN=<dsn> sql=<sql>" into parameter values. * * * @@ -1669,8 +1667,6 @@ static int DBpatch_2010194(void) /****************************************************************************** * * - * Function: DBpatch_2010195_replace_key_param_cb * - * * * Comments: auxiliary function for DBpatch_2010195() * * * ******************************************************************************/ diff --git a/src/libs/zbxdbupgrade/dbupgrade_2030.c b/src/libs/zbxdbupgrade/dbupgrade_2030.c index 3dd0ab17f1f..2dc32098f97 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_2030.c +++ b/src/libs/zbxdbupgrade/dbupgrade_2030.c @@ -971,8 +971,6 @@ static int DBpatch_2030094(void) /****************************************************************************** * * - * Function: parse_function * - * * * Purpose: return function and function parameters * * func(param,...) * * * diff --git a/src/libs/zbxdbupgrade/dbupgrade_3010.c b/src/libs/zbxdbupgrade/dbupgrade_3010.c index 52107c91e78..6d6ef2e23f7 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_3010.c +++ b/src/libs/zbxdbupgrade/dbupgrade_3010.c @@ -242,8 +242,6 @@ static int DBpatch_3010021_trigger_events_compare_func(const void *d1, const voi /****************************************************************************** * * - * Function: DBpatch_3010021_update_event_recovery * - * * * Purpose: set events.r_eventid field with corresponding recovery event id * * * * Parameters: events - [IN/OUT] unrecovered events indexed by triggerid * @@ -446,8 +444,6 @@ out: /****************************************************************************** * * - * Function: DBpatch_3010024_validate_action * - * * * Purpose: checks if the action must be disabled or its operations converted * * to recovery operations * * * @@ -676,8 +672,6 @@ static int DBpatch_3010025(void) /****************************************************************************** * * - * Function: DBpatch_3010026_get_conditionids * - * * * Purpose: get success condition identifiers * * * * Parameters: actionid - [IN] the action identifier * @@ -757,8 +751,6 @@ static void DBpatch_3010026_get_conditionids(zbx_uint64_t actionid, const char * /****************************************************************************** * * - * Function: DBpatch_3010026_expression_skip_whitespace * - * * * Purpose: skips whitespace characters * * * * Parameters: expression - [IN] the expression to process * @@ -777,8 +769,6 @@ static size_t DBpatch_3010026_expression_skip_whitespace(const char *expression, /****************************************************************************** * * - * Function: DBpatch_3010026_expression_get_token * - * * * Purpose: gets the next expression token starting with offset * * * * Parameters: expression - [IN] the expression to process * @@ -841,8 +831,6 @@ static int DBpatch_3010026_expression_get_token(const char *expression, int offs /****************************************************************************** * * - * Function: DBpatch_3010026_expression_validate_value * - * * * Purpose: checks if the value does not match any filter value * * * * Parameters: expression - [IN] the expression to process * @@ -869,8 +857,6 @@ static int DBpatch_3010026_expression_validate_value(const char *expression, zbx /****************************************************************************** * * - * Function: DBpatch_3010026_expression_cut_substring * - * * * Purpose: cuts substring from the expression * * * * Parameters: expression - [IN] the expression to process * @@ -885,8 +871,6 @@ static void DBpatch_3010026_expression_cut_substring(char *expression, zbx_strlo /****************************************************************************** * * - * Function: DBpatch_3010026_expression_move_location * - * * * Purpose: location by the specified offset * * * * Parameters: location - [IN] the location to adjust * @@ -901,8 +885,6 @@ static void DBpatch_3010026_expression_move_location(zbx_strloc_t *location, int /****************************************************************************** * * - * Function: DBpatch_3010026_expression_remove_values_impl * - * * * Purpose: removes values specified in filter from the location * * * * Parameters: expression - [IN] the expression to process * @@ -1014,8 +996,6 @@ static int DBpatch_3010026_expression_remove_values_impl(char *expression, zbx_s /****************************************************************************** * * - * Function: DBpatch_3010026_expression_remove_values * - * * * Purpose: removes values specified in filter from the location * * * * Parameters: expression - [IN] the expression to process * diff --git a/src/libs/zbxdbupgrade/dbupgrade_4050.c b/src/libs/zbxdbupgrade/dbupgrade_4050.c index 69db06f7a54..b332bf197ac 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_4050.c +++ b/src/libs/zbxdbupgrade/dbupgrade_4050.c @@ -813,8 +813,6 @@ static int db_snmp_new_if_find(const dbu_snmp_if_t *snmp, const zbx_vector_dbu_s /****************************************************************************** * * - * Function: DBpatch_load_data * - * * * Purpose: loading a set of unique combination of snmp data within a single * * interface and associated interface data * * * @@ -1141,8 +1139,6 @@ static int DBpatch_items_type_update(void) /****************************************************************************** * * - * Function: DBpatch_4050046 * - * * * Purpose: migration snmp data from 'items' table to 'interface_snmp' new * * table linked with 'interface' table, except interface links for * * discovered hosts and parent host interface * @@ -1252,8 +1248,6 @@ static void db_if_link(zbx_uint64_t if_slave, zbx_uint64_t if_master, zbx_vector /****************************************************************************** * * - * Function: DBpatch_if_load_data * - * * * Purpose: loading all unlinked interfaces, snmp data and hostid of host * * prototype for discovered hosts * * * @@ -1384,8 +1378,6 @@ static int DBpatch_interface_discovery_save(zbx_vector_uint64_pair_t *if_links) /****************************************************************************** * * - * Function: DBpatch_4050047 * - * * * Purpose: recovery links between the interfaceid of discovered host and * * parent interfaceid from parent host * * * diff --git a/src/libs/zbxdbupgrade/dbupgrade_5030.c b/src/libs/zbxdbupgrade/dbupgrade_5030.c index e8158aef797..8ad0f24f0d1 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_5030.c +++ b/src/libs/zbxdbupgrade/dbupgrade_5030.c @@ -1067,8 +1067,6 @@ static int DBpatch_5030065(void) /****************************************************************************** * * - * Function: DBpatch_5030066 (part of ZBXNEXT-6368) * - * * * Purpose: set value for 'scripts' table column 'scope' for existing global * * scripts * * * @@ -1120,8 +1118,6 @@ static char *zbx_rename_host_macros(const char *command) /****************************************************************************** * * - * Function: DBpatch_5030067 (part of ZBXNEXT-6368) * - * * * Purpose: rename some {HOST.*} macros to {HOST.TARGET.*} in existing global * * scripts which are used in actions * * * @@ -1171,8 +1167,6 @@ static int DBpatch_5030067(void) /****************************************************************************** * * - * Function: zbx_split_name (part of ZBXNEXT-6368) * - * * * Purpose: helper function to split script name into menu_path and name * * * * Parameters: * @@ -1201,8 +1195,6 @@ static void zbx_split_name(const char *name, char **menu_path, const char **name /****************************************************************************** * * - * Function: zbx_make_script_name_unique (part of ZBXNEXT-6368) * - * * * Purpose: helper function to assist in making unique script names * * * * Parameters: * @@ -1264,8 +1256,6 @@ static int zbx_make_script_name_unique(const char *name, int *suffix, char **uni /****************************************************************************** * * - * Function: DBpatch_5030068 (part of ZBXNEXT-6368) * - * * * Purpose: split script name between 'menu_path' and 'name' columns for * * existing global scripts * * * @@ -1359,8 +1349,6 @@ ZBX_VECTOR_IMPL(opcommands, zbx_opcommand_rec_t) /****************************************************************************** * * - * Function: zbx_pack_record (part of ZBXNEXT-6368) * - * * * Purpose: helper function, packs parts of remote command into one memory * * chunk for efficient storing and comparing * * * @@ -1400,8 +1388,6 @@ static size_t zbx_pack_record(const zbx_opcommand_parts_t *parts, char **packed_ /****************************************************************************** * * - * Function: zbx_check_duplicate (part of ZBXNEXT-6368) * - * * * Purpose: checking if this remote command is a new one or a duplicate one * * and storing the assigned new global script id * * * @@ -1451,8 +1437,6 @@ static int zbx_check_duplicate(zbx_vector_opcommands_t *opcommands, /****************************************************************************** * * - * Function: DBpatch_5030069 (part of ZBXNEXT-6368) * - * * * Purpose: migrate remote commands from table 'opcommand' to table 'scripts' * * and convert them into global scripts * * * @@ -4530,8 +4514,6 @@ static void dbpatch_trigger_clear(zbx_dbpatch_trigger_t *trigger) /****************************************************************************** * * - * Function: dbpatch_update_expression * - * * * Purpose: replace {functionid} occurrences in expression with the specified * * replacement string * * * @@ -4585,8 +4567,6 @@ static int dbpatch_update_expression(char **expression, zbx_uint64_t functionid, /****************************************************************************** * * - * Function: dbpatch_update_trigger * - * * * Purpose: replace {functionid} occurrences in trigger expression and * * recovery expression with the specified replacement string * * * @@ -4608,8 +4588,6 @@ static void dbpatch_update_trigger(zbx_dbpatch_trigger_t *trigger, zbx_uint64_t /****************************************************************************** * * - * Function: dbpatch_find_function * - * * * Purpose: check if the expression contains specified functionid * * * ******************************************************************************/ @@ -4646,8 +4624,6 @@ static int dbpatch_find_function(const char *expression, zbx_uint64_t functionid /****************************************************************************** * * - * Function: dbpatch_get_function_location * - * * * Purpose: return function location mask (expression | recovery expression) * * * ******************************************************************************/ @@ -4669,8 +4645,6 @@ static unsigned char dbpatch_get_function_location(const zbx_dbpatch_trigger_t * /****************************************************************************** * * - * Function: dbpatch_convert_trigger * - * * * Purpose: convert trigger and its functions to use new expression syntax * * * * Parameters: trigger - [IN/OUT] the trigger data/updates * @@ -4992,8 +4966,6 @@ static int DBpatch_5030166(void) /****************************************************************************** * * - * Function: dbpatch_convert_expression_macro * - * * * Purpose: convert simple macros in expression macro {? } to function calls * * using new expression syntax * * * diff --git a/src/libs/zbxdbupgrade/dbupgrade_5050.c b/src/libs/zbxdbupgrade/dbupgrade_5050.c index d7b9aa959b6..fcf618cee10 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_5050.c +++ b/src/libs/zbxdbupgrade/dbupgrade_5050.c @@ -659,8 +659,6 @@ static int DBpatch_5050067(void) /****************************************************************************** * * - * Function: DBpatch_5050068_calc_services_write_value * - * * * Purpose: calculate services.write value for the specified role * * * * Parameters: roleid - [IN] the role identifier * diff --git a/src/libs/zbxdbupgrade/dbupgrade_macros.c b/src/libs/zbxdbupgrade/dbupgrade_macros.c index ce9b16c7f3b..9de45f1c53d 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_macros.c +++ b/src/libs/zbxdbupgrade/dbupgrade_macros.c @@ -48,8 +48,6 @@ ZBX_VECTOR_IMPL(strloc, zbx_strloc_t) /****************************************************************************** * * - * Function: str_rename_macro * - * * * Purpose: rename macros in the string * * * * Parameters: in - [IN] the input string * @@ -103,8 +101,6 @@ static int str_rename_macro(const char *in, const char *oldmacro, const char *ne /****************************************************************************** * * - * Function: db_rename_macro * - * * * Purpose: rename macro in the specified database fields * * * * Parameters: result - [IN] database query with fields to replace. First * @@ -358,8 +354,6 @@ static void dbpatch_update_func_bitand(zbx_dbpatch_function_t *function, const z /****************************************************************************** * * - * Function: dbpatch_strcpy_alloc_quoted * - * * * Purpose: quote and text to a buffer * * * * Parameters: str - [OUT] the output buffer * @@ -384,8 +378,6 @@ void dbpatch_strcpy_alloc_quoted(char **str, size_t *str_alloc, size_t *str_offs /****************************************************************************** * * - * Function: dbpatch_is_composite_constant * - * * * Purpose: check for composite (consisting of macro(s) + text) constant * * * * Parameters: str - [IN] the text to check * @@ -412,8 +404,6 @@ int dbpatch_is_composite_constant(const char *str) /****************************************************************************** * * - * Function: dbpatch_convert_params * - * * * Purpose: convert function parameters into new syntax * * * * Parameters: out - [OUT] the converted parameter string * @@ -577,8 +567,6 @@ void dbpatch_convert_params(char **out, const char *parameter, const zbx_vector_ /****************************************************************************** * * - * Function: dbpatch_parse_function_params * - * * * Purpose: parse function parameter string into parameter location vector * * * ******************************************************************************/ @@ -614,8 +602,6 @@ static void dbpatch_parse_function_params(const char *parameter, zbx_vector_strl /****************************************************************************** * * - * Function: dbpatch_convert_function * - * * * Purpose: convert function to new parameter syntax/order * * * * Parameters: function - [IN/OUT] the function to convert * @@ -838,8 +824,6 @@ void dbpatch_convert_function(zbx_dbpatch_function_t *function, char **replace, /****************************************************************************** * * - * Function: dbpatch_replace_functionids * - * * * Purpose: replace functionids {<index in functions vector>} in expression * * with their string format * * * @@ -900,8 +884,6 @@ static void dbpatch_replace_functionids(char **expression, const zbx_vector_ptr_ /****************************************************************************** * * - * Function: dbpatch_convert_simple_macro * - * * * Purpose: convert simple macro {host.key:func(params)} to the new syntax * * func(/host/key,params) * * * diff --git a/src/libs/zbxdiag/diag.c b/src/libs/zbxdiag/diag.c index a3e4997e0eb..97b4234e0ea 100644 --- a/src/libs/zbxdiag/diag.c +++ b/src/libs/zbxdiag/diag.c @@ -33,8 +33,6 @@ void diag_map_free(zbx_diag_map_t *map) /****************************************************************************** * * - * Function: diag_parse_request * - * * * Purpose: parse diagnostic section request having json format * * {"stats":[<field1>,<field2>,...], "top":{<field1>:<limit1>,...}} * * * @@ -133,8 +131,6 @@ out: /****************************************************************************** * * - * Function: diag_add_mem_stats * - * * * Purpose: add memory statistics to the json data * * * * Parameters: json - [IN/OUT] the json to update * @@ -185,8 +181,6 @@ void diag_add_mem_stats(struct zbx_json *json, const char *name, const zbx_mem_s /****************************************************************************** * * - * Function: diag_compare_pair_second_desc * - * * * Purpose: compare uint64 pairs by second value for descending sorting * * * ******************************************************************************/ @@ -204,8 +198,6 @@ static int diag_compare_pair_second_desc(const void *d1, const void *d2) /****************************************************************************** * * - * Function: diag_historycahe_add_items * - * * * Purpose: add history cache items diagnostic statistics to json * * * ******************************************************************************/ @@ -229,8 +221,6 @@ static void diag_historycache_add_items(struct zbx_json *json, const char *field /****************************************************************************** * * - * Function: diag_add_historycache_info * - * * * Purpose: add requested history cache diagnostic information to json data * * * * Parameters: jp - [IN] the request * @@ -349,8 +339,6 @@ int diag_add_historycache_info(const struct zbx_json_parse *jp, struct zbx_json /****************************************************************************** * * - * Function: diag_add_preproc_items * - * * * Purpose: add item top list to output json * * * * Parameters: json - [OUT] the output json * @@ -380,8 +368,6 @@ static void diag_add_preproc_items(struct zbx_json *json, const char *field, con /****************************************************************************** * * - * Function: diag_add_preproc_info * - * * * Purpose: add requested preprocessing diagnostic information to json data * * * * Parameters: jp - [IN] the request * @@ -503,8 +489,6 @@ static void zbx_json_addhex(struct zbx_json *j, const char *name, zbx_uint64_t v /****************************************************************************** * * - * Function: diag_add_locks_info * - * * * Purpose: add requested locks diagnostic information to json data * * * * Parameters: json - [IN/OUT] the json to update * @@ -547,8 +531,6 @@ void diag_add_locks_info(struct zbx_json *json) /****************************************************************************** * * - * Function: zbx_diag_get_info * - * * * Purpose: get diagnostic information * * * * Parameters: jp - [IN] the request * @@ -592,8 +574,6 @@ out: /****************************************************************************** * * - * Function: diag_add_section_request * - * * * Purpose: add default diagnostic section request * * * * Parameters: j - [OUT] the request json * @@ -624,8 +604,6 @@ static void diag_add_section_request(struct zbx_json *j, const char *section, .. /****************************************************************************** * * - * Function: diag_prepare_default_request * - * * * Purpose: prepare default diagnostic request for all sections * * * ******************************************************************************/ @@ -652,8 +630,6 @@ static void diag_prepare_default_request(struct zbx_json *j, unsigned int flags) /****************************************************************************** * * - * Function: diag_get_simple_values * - * * * Purpose: extract simple values in format <key1>:<value1> <key2>:<value2>...* * from the specified json location * * * @@ -688,8 +664,6 @@ static void diag_get_simple_values(const struct zbx_json_parse *jp, char **msg) /****************************************************************************** * * - * Function: diag_log_memory_info * - * * * Purpose: log shared memory information * * * * Parameters: jp - [IN] the section json * @@ -744,8 +718,6 @@ static void diag_log_memory_info(struct zbx_json_parse *jp, const char *field, c /****************************************************************************** * * - * Function: diag_log_top_view * - * * * Purpose: log top view * * * * Parameters: jp - [IN] the section json * @@ -785,8 +757,6 @@ static void diag_log_top_view(struct zbx_json_parse *jp, const char *field, cons /****************************************************************************** * * - * Function: diag_log_history_cache * - * * * Purpose: log history cache diagnostic information * * * ******************************************************************************/ @@ -810,8 +780,6 @@ static void diag_log_history_cache(struct zbx_json_parse *jp, char **out, size_t /****************************************************************************** * * - * Function: diag_log_value_cache * - * * * Purpose: log value cache diagnostic information * * * ******************************************************************************/ @@ -835,8 +803,6 @@ static void diag_log_value_cache(struct zbx_json_parse *jp, char **out, size_t * /****************************************************************************** * * - * Function: diag_log_preprocessing * - * * * Purpose: log preprocessing diagnostic information * * * ******************************************************************************/ @@ -858,8 +824,6 @@ static void diag_log_preprocessing(struct zbx_json_parse *jp, char **out, size_t /****************************************************************************** * * - * Function: diag_log_lld * - * * * Purpose: log LLD diagnostic information * * * ******************************************************************************/ @@ -881,8 +845,6 @@ static void diag_log_lld(struct zbx_json_parse *jp, char **out, size_t *out_allo /****************************************************************************** * * - * Function: diag_log_alerting * - * * * Purpose: log alerting diagnostic information * * * ******************************************************************************/ @@ -904,8 +866,6 @@ static void diag_log_alerting(struct zbx_json_parse *jp, char **out, size_t *out /****************************************************************************** * * - * Function: zbx_diag_log_info * - * * * Purpose: log diagnostic information * * * * Parameters: flags - [IN] flags describing section to log * diff --git a/src/libs/zbxdiag/diag_proxy.c b/src/libs/zbxdiag/diag_proxy.c index 9db17aa6543..f01bf97a60d 100644 --- a/src/libs/zbxdiag/diag_proxy.c +++ b/src/libs/zbxdiag/diag_proxy.c @@ -24,8 +24,6 @@ /****************************************************************************** * * - * Function: diag_add_section_info * - * * * Purpose: add requested section diagnostic information * * * * Parameters: section - [IN] the section name * diff --git a/src/libs/zbxdiag/diag_server.c b/src/libs/zbxdiag/diag_server.c index 9b2b04e46e2..f250162d530 100644 --- a/src/libs/zbxdiag/diag_server.c +++ b/src/libs/zbxdiag/diag_server.c @@ -29,8 +29,6 @@ /****************************************************************************** * * - * Function: diag_historycache_item_compare_values * - * * * Purpose: sort itemid,values_num pair by values_num in descending order * * * ******************************************************************************/ @@ -44,8 +42,6 @@ static int diag_valuecache_item_compare_values(const void *d1, const void *d2) /****************************************************************************** * * - * Function: diag_valuecache_item_compare_hourly * - * * * Purpose: sort itemid,values_num pair by hourly_num in descending order * * * ******************************************************************************/ @@ -59,8 +55,6 @@ static int diag_valuecache_item_compare_hourly(const void *d1, const void *d2) /****************************************************************************** * * - * Function: diag_valuecache_add_items * - * * * Purpose: add valuecache items diagnostic statistics to json * * * ******************************************************************************/ @@ -84,8 +78,6 @@ static void diag_valuecache_add_items(struct zbx_json *json, const char *field, /****************************************************************************** * * - * Function: diag_add_valuecache_info * - * * * Purpose: add requested value cache diagnostic information to json data * * * * Parameters: jp - [IN] the request * @@ -203,8 +195,6 @@ out: /****************************************************************************** * * - * Function: diag_add_lld_items * - * * * Purpose: add lld item top list to output json * * * ******************************************************************************/ @@ -227,8 +217,6 @@ static void diag_add_lld_items(struct zbx_json *json, const char *field, const z /****************************************************************************** * * - * Function: diag_add_lld_info * - * * * Purpose: add requested lld manager diagnostic information to json data * * * * Parameters: jp - [IN] the request * @@ -325,8 +313,6 @@ out: /****************************************************************************** * * - * Function: diag_add_alerting_mediatypes * - * * * Purpose: add mediatype top list to output json * * * * Parameters: json - [OUT] the output json * @@ -355,8 +341,6 @@ static void diag_add_alerting_mediatypes(struct zbx_json *json, const char *fiel /****************************************************************************** * * - * Function: diag_add_alerting_sources * - * * * Purpose: add alert source top list to output json * * * * Parameters: json - [OUT] the output json * @@ -388,8 +372,6 @@ static void diag_add_alerting_sources(struct zbx_json *json, const char *field, /****************************************************************************** * * - * Function: diag_add_alerting_info * - * * * Purpose: add requested alert manager diagnostic information to json data * * * * Parameters: jp - [IN] the request * @@ -504,8 +486,6 @@ out: /****************************************************************************** * * - * Function: diag_add_section_info * - * * * Purpose: add requested section diagnostic information * * * * Parameters: section - [IN] the section name * diff --git a/src/libs/zbxembed/console.c b/src/libs/zbxembed/console.c index 5a1e2fdd2ef..aef2bb821c1 100644 --- a/src/libs/zbxembed/console.c +++ b/src/libs/zbxembed/console.c @@ -27,8 +27,6 @@ /****************************************************************************** * * - * Function: es_console_dtor * - * * * Purpose: console destructor * * * ******************************************************************************/ @@ -41,8 +39,6 @@ static duk_ret_t es_console_dtor(duk_context *ctx) /****************************************************************************** * * - * Function: es_console_ctor * - * * * Purpose: console constructor * * * ******************************************************************************/ @@ -61,8 +57,6 @@ static duk_ret_t es_console_ctor(duk_context *ctx) /****************************************************************************** * * - * Function: es_log_message * - * * * Purpose: Write message to centralized Zabbix log * * * ******************************************************************************/ @@ -121,8 +115,6 @@ out: /****************************************************************************** * * - * Function: es_console_log * - * * * Purpose: console.log method * * * ******************************************************************************/ @@ -133,8 +125,6 @@ static duk_ret_t es_console_log(duk_context *ctx) /****************************************************************************** * * - * Function: es_console_warn * - * * * Purpose: console.warn method * * * ******************************************************************************/ @@ -145,8 +135,6 @@ static duk_ret_t es_console_warn(duk_context *ctx) /****************************************************************************** * * - * Function: es_console_error * - * * * Purpose: console.error method * * * ******************************************************************************/ diff --git a/src/libs/zbxembed/embed.c b/src/libs/zbxembed/embed.c index 8d7f682542e..55793aebee5 100644 --- a/src/libs/zbxembed/embed.c +++ b/src/libs/zbxembed/embed.c @@ -40,8 +40,6 @@ /****************************************************************************** * * - * Function: es_handle_error * - * * * Purpose: fatal error handler * * * ******************************************************************************/ @@ -123,8 +121,6 @@ static void es_free(void *udata, void *ptr) /****************************************************************************** * * - * Function: zbx_es_check_timeout * - * * * Purpose: timeout checking callback * * * ******************************************************************************/ @@ -140,8 +136,6 @@ int zbx_es_check_timeout(void *udata) /****************************************************************************** * * - * Function: zbx_es_init * - * * * Purpose: initializes embedded scripting engine * * * ******************************************************************************/ @@ -152,8 +146,6 @@ void zbx_es_init(zbx_es_t *es) /****************************************************************************** * * - * Function: zbx_es_destroy * - * * * Purpose: destroys embedded scripting engine * * * ******************************************************************************/ @@ -169,8 +161,6 @@ void zbx_es_destroy(zbx_es_t *es) /****************************************************************************** * * - * Function: zbx_es_init_env * - * * * Purpose: initializes embedded scripting engine environment * * * * Parameters: es - [IN] the embedded scripting engine * @@ -249,8 +239,6 @@ out: /****************************************************************************** * * - * Function: zbx_es_destroy_env * - * * * Purpose: destroys initialized embedded scripting engine environment * * * * Parameters: es - [IN] the embedded scripting engine * @@ -288,8 +276,6 @@ out: /****************************************************************************** * * - * Function: zbx_es_ready * - * * * Purpose: checks if the scripting engine environment is initialized * * * * Parameters: es - [IN] the embedded scripting engine * @@ -305,8 +291,6 @@ int zbx_es_is_env_initialized(zbx_es_t *es) /****************************************************************************** * * - * Function: zbx_es_fatal_error * - * * * Purpose: checks if fatal error has occurred * * * * Comments: Fatal error may put the scripting engine in unknown state, it's * @@ -330,8 +314,6 @@ int zbx_es_fatal_error(zbx_es_t *es) /****************************************************************************** * * - * Function: zbx_es_compile * - * * * Purpose: compiles script into bytecode * * * * Parameters: es - [IN] the embedded scripting engine * @@ -414,8 +396,6 @@ out: /****************************************************************************** * * - * Function: zbx_es_execute * - * * * Purpose: executes script * * * * Parameters: es - [IN] the embedded scripting engine * @@ -553,8 +533,6 @@ out: /****************************************************************************** * * - * Function: zbx_es_set_timeout * - * * * Purpose: sets script execution timeout * * * * Parameters: es - [IN] the embedded scripting engine * @@ -594,8 +572,6 @@ void zbx_es_debug_disable(zbx_es_t *es) /****************************************************************************** * * - * Function: zbx_es_execute_command * - * * * Purpose: executes command (script in form of a text) * * * * Parameters: command - [IN] the command in form of a text * diff --git a/src/libs/zbxembed/global.c b/src/libs/zbxembed/global.c index 58649e18e0f..097fc6c65f2 100644 --- a/src/libs/zbxembed/global.c +++ b/src/libs/zbxembed/global.c @@ -27,8 +27,6 @@ /****************************************************************************** * * - * Function: es_btoa * - * * * Purpose: encodes parameter to base64 string * * * * Parameters: ctx - [IN] pointer to duk_context * @@ -54,8 +52,6 @@ static duk_ret_t es_btoa(duk_context *ctx) /****************************************************************************** * * - * Function: es_atob * - * * * Purpose: decodes base64 string * * * * Parameters: ctx - [IN] pointer to duk_context * @@ -84,8 +80,6 @@ static duk_ret_t es_atob(duk_context *ctx) /****************************************************************************** * * - * Function: es_md5 * - * * * Purpose: compute a md5 checksum * * * * Parameters: ctx - [IN] pointer to duk_context * @@ -128,8 +122,6 @@ static duk_ret_t es_md5(duk_context *ctx) /****************************************************************************** * * - * Function: es_sha256 * - * * * Purpose: compute a sha256 checksum * * * * Parameters: ctx - [IN] pointer to duk_context * @@ -167,8 +159,6 @@ static duk_ret_t es_sha256(duk_context *ctx) /****************************************************************************** * * - * Function: es_init_global_functions * - * * * Purpose: initializes additional global functions * * * * Parameters: es - [IN] the embedded scripting engine * diff --git a/src/libs/zbxembed/httprequest.c b/src/libs/zbxembed/httprequest.c index 22111dfb07d..9286e8f56b5 100644 --- a/src/libs/zbxembed/httprequest.c +++ b/src/libs/zbxembed/httprequest.c @@ -89,8 +89,6 @@ static size_t curl_header_cb(void *ptr, size_t size, size_t nmemb, void *userdat /****************************************************************************** * * - * Function: es_httprequest * - * * * Purpose: return backing C structure embedded in CurlHttpRequest object * * * ******************************************************************************/ @@ -108,8 +106,6 @@ static zbx_es_httprequest_t *es_httprequest(duk_context *ctx) /****************************************************************************** * * - * Function: es_httprequest_dtor * - * * * Purpose: CurlHttpRequest destructor * * * ******************************************************************************/ @@ -138,8 +134,6 @@ static duk_ret_t es_httprequest_dtor(duk_context *ctx) /****************************************************************************** * * - * Function: es_httprequest_ctor * - * * * Purpose: CurlHttpRequest constructor * * * ******************************************************************************/ @@ -204,8 +198,6 @@ out: /****************************************************************************** * * - * Function: es_httprequest_add_header * - * * * Purpose: CurlHttpRequest.SetHeader method * * * ******************************************************************************/ @@ -239,8 +231,6 @@ out: /****************************************************************************** * * - * Function: es_httprequest_clear_header * - * * * Purpose: CurlHttpRequest.ClearHeader method * * * ******************************************************************************/ @@ -260,8 +250,6 @@ static duk_ret_t es_httprequest_clear_header(duk_context *ctx) /****************************************************************************** * * - * Function: es_httprequest_query * - * * * Purpose: CurlHttpRequest HTTP request implementation * * * * Parameters: ctx - [IN] the scripting engine context * @@ -346,8 +334,6 @@ out: /****************************************************************************** * * - * Function: es_httprequest_get * - * * * Purpose: HttpRequest.Get / CurlHttpRequest.Get method * * * ******************************************************************************/ @@ -358,8 +344,6 @@ static duk_ret_t es_httprequest_get(duk_context *ctx) /****************************************************************************** * * - * Function: es_httprequest_put * - * * * Purpose: HttpRequest.Put / CurlHttpRequest.Put method * * * ******************************************************************************/ @@ -370,8 +354,6 @@ static duk_ret_t es_httprequest_put(duk_context *ctx) /****************************************************************************** * * - * Function: es_httprequest_post * - * * * Purpose: HttpRequest.Post / CurlHttpRequest.Post method * * * ******************************************************************************/ @@ -382,8 +364,6 @@ static duk_ret_t es_httprequest_post(duk_context *ctx) /****************************************************************************** * * - * Function: es_httprequest_delete * - * * * Purpose: HttpRequest.Delete / CurlHttpRequest.Delete method * * * ******************************************************************************/ @@ -394,8 +374,6 @@ static duk_ret_t es_httprequest_delete(duk_context *ctx) /****************************************************************************** * * - * Function: es_httprequest_head * - * * * Purpose: HttpRequest.head method * * * ******************************************************************************/ @@ -406,8 +384,6 @@ static duk_ret_t es_httprequest_head(duk_context *ctx) /****************************************************************************** * * - * Function: es_httprequest_patch * - * * * Purpose: HttpRequest.patch method * * * ******************************************************************************/ @@ -418,8 +394,6 @@ static duk_ret_t es_httprequest_patch(duk_context *ctx) /****************************************************************************** * * - * Function: es_httprequest_options * - * * * Purpose: HttpRequest.options method * * * ******************************************************************************/ @@ -430,8 +404,6 @@ static duk_ret_t es_httprequest_options(duk_context *ctx) /****************************************************************************** * * - * Function: es_httprequest_trace * - * * * Purpose: HttpRequest.trace method * * * ******************************************************************************/ @@ -442,8 +414,6 @@ static duk_ret_t es_httprequest_trace(duk_context *ctx) /****************************************************************************** * * - * Function: es_httprequest_connect * - * * * Purpose: HttpRequest.connect method * * * ******************************************************************************/ @@ -454,8 +424,6 @@ static duk_ret_t es_httprequest_connect(duk_context *ctx) /****************************************************************************** * * - * Function: es_httprequest_customrequest * - * * * Purpose: HttpRequest.customRequest method * * * ******************************************************************************/ @@ -474,8 +442,6 @@ static duk_ret_t es_httprequest_customrequest(duk_context *ctx) /****************************************************************************** * * - * Function: es_httprequest_set_proxy * - * * * Purpose: CurlHttpRequest.SetProxy method * * * ******************************************************************************/ @@ -498,8 +464,6 @@ out: /****************************************************************************** * * - * Function: es_httprequest_status * - * * * Purpose: CurlHttpRequest.Status method * * * ******************************************************************************/ @@ -522,8 +486,6 @@ static duk_ret_t es_httprequest_status(duk_context *ctx) /****************************************************************************** * * - * Function: parse_header * - * * * Purpose: retrieves value of a header * * * * Parameters: header - [IN] the http header to extract value from * @@ -548,8 +510,6 @@ static int parse_header(char *header, char **value_out) /****************************************************************************** * * - * Function: es_obj_put_http_header * - * * * Purpose: puts http header <field>: <value> as object property/value * * * * Parameters: ctx - [IN] the duktape context * @@ -572,8 +532,6 @@ static void es_put_header(duk_context *ctx, int idx, char *header) /****************************************************************************** * * - * Function: get_headers_as_strings * - * * * Purpose: retrieve headers from request in form of strings * * * * Parameters: ctx - [IN] the duktape context * @@ -616,8 +574,6 @@ static void cached_headers_free(zbx_cached_header_t *header) /****************************************************************************** * * - * Function: get_headers_as_arrays * - * * * Purpose: retrieve headers from request in form of arrays * * * * Parameters: ctx - [IN] the duktape context * @@ -699,8 +655,6 @@ out: /****************************************************************************** * * - * Function: es_httprequest_get_headers * - * * * Purpose: HttpRequest.getHeaders / CurlHttpRequest.GetHeaders method * * * ******************************************************************************/ @@ -726,8 +680,6 @@ static duk_ret_t es_httprequest_get_headers(duk_context *ctx) /****************************************************************************** * * - * Function: es_httprequest_set_httpauth * - * * * Purpose: CurlHttpRequest.SetHttpAuth method * * * ******************************************************************************/ diff --git a/src/libs/zbxembed/xml.c b/src/libs/zbxembed/xml.c index 55a604b3da8..322b01ce1e2 100644 --- a/src/libs/zbxembed/xml.c +++ b/src/libs/zbxembed/xml.c @@ -25,8 +25,6 @@ /****************************************************************************** * * - * Function: es_xml_ctor * - * * * Purpose: XML constructor * * * ******************************************************************************/ @@ -44,8 +42,6 @@ static duk_ret_t es_xml_ctor(duk_context *ctx) /****************************************************************************** * * - * Function: es_xml_query * - * * * Purpose: XML.query method * * * ******************************************************************************/ @@ -75,8 +71,6 @@ out: /****************************************************************************** * * - * Function: es_xml_from_json * - * * * Purpose: XML.fromJson method * * * ******************************************************************************/ @@ -103,8 +97,6 @@ out: /****************************************************************************** * * - * Function: es_xml_to_json * - * * * Purpose: XML.toJson method * * * ******************************************************************************/ @@ -156,8 +148,6 @@ static int es_xml_create_object(duk_context *ctx) /****************************************************************************** * * - * Function: zbx_es_init_xml * - * * * Purpose: init XML object * * * ******************************************************************************/ diff --git a/src/libs/zbxembed/zabbix.c b/src/libs/zbxembed/zabbix.c index ceadfd8d213..a6fca933635 100644 --- a/src/libs/zbxembed/zabbix.c +++ b/src/libs/zbxembed/zabbix.c @@ -27,8 +27,6 @@ /****************************************************************************** * * - * Function: es_zabbix_dtor * - * * * Purpose: Zabbix destructor * * * ******************************************************************************/ @@ -41,8 +39,6 @@ static duk_ret_t es_zabbix_dtor(duk_context *ctx) /****************************************************************************** * * - * Function: es_zabbix_ctor * - * * * Purpose: Zabbix constructor * * * ******************************************************************************/ @@ -61,8 +57,6 @@ static duk_ret_t es_zabbix_ctor(duk_context *ctx) /****************************************************************************** * * - * Function: es_zabbix_status * - * * * Purpose: Zabbix.Status method * * * ******************************************************************************/ diff --git a/src/libs/zbxeval/calc.c b/src/libs/zbxeval/calc.c index faee357fe28..207bc24d477 100644 --- a/src/libs/zbxeval/calc.c +++ b/src/libs/zbxeval/calc.c @@ -42,8 +42,6 @@ static int zbx_is_normal_double(double dbl) /****************************************************************************** * * - * Function: calc_arithmetic_mean * - * * * Purpose: calculate arithmetic mean (i.e. average) * * * * Parameters: v - [IN] non-empty vector with input data * @@ -64,8 +62,6 @@ static double calc_arithmetic_mean(const zbx_vector_dbl_t *v) /****************************************************************************** * * - * Function: zbx_eval_calc_kurtosis * - * * * Purpose: evaluate function 'kurtosis' * * * * Parameters: values - [IN] non-empty vector with input data * @@ -123,8 +119,6 @@ err: /****************************************************************************** * * - * Function: find_median * - * * * Purpose: find median (helper function) * * * * Parameters: v - [IN/OUT] non-empty vector with input data. * @@ -145,8 +139,6 @@ static double find_median(zbx_vector_dbl_t *v) /****************************************************************************** * * - * Function: zbx_eval_calc_mad * - * * * Purpose: calculate 'median absolute deviation' * * * * Parameters: values - [IN] non-empty vector with input data. * @@ -192,8 +184,6 @@ err: /****************************************************************************** * * - * Function: zbx_eval_calc_skewness * - * * * Purpose: evaluate 'skewness' function * * * * Parameters: values - [IN] non-empty vector with input data * @@ -245,8 +235,6 @@ err: /****************************************************************************** * * - * Function: zbx_eval_calc_stddevpop * - * * * Purpose: evaluate function 'stdevpop' (population standard deviation) * * * * Parameters: values - [IN] non-empty vector with input data * @@ -297,8 +285,6 @@ err: /****************************************************************************** * * - * Function: zbx_eval_calc_stddevsamp * - * * * Purpose: evaluate function 'stddevsamp' (sample standard deviation) * * * * Parameters: values - [IN] vector with input data with at least 2 elements * @@ -355,8 +341,6 @@ err: /****************************************************************************** * * - * Function: zbx_eval_calc_sumofsquares * - * * * Purpose: calculate sum of squares * * * * Parameters: values - [IN] non-empty vector with input data * @@ -388,8 +372,6 @@ int zbx_eval_calc_sumofsquares(zbx_vector_dbl_t *values, double *result, char ** /****************************************************************************** * * - * Function: zbx_eval_calc_varpop * - * * * Purpose: evaluate function 'varpop' (population variance) * * * * Parameters: values - [IN] non-empty vector with input data * @@ -439,8 +421,6 @@ err: /****************************************************************************** * * - * Function: zbx_eval_calc_varsamp * - * * * Purpose: evaluate function 'varsamp' (sample variance) * * * * Parameters: values - [IN] non-empty vector with input data * @@ -537,8 +517,6 @@ static void ensure_histogram_monotonic(zbx_vector_histogram_t *h) /****************************************************************************** * * - * Function: zbx_eval_calc_histogram_quantile * - * * * Purpose: calculate histogram quantile base on vector, where odd position * * is bucket upper bound ('le') and even position is 'rate' value * * * @@ -660,8 +638,6 @@ err: /****************************************************************************** * * - * Function: zbx_eval_calc_avg * - * * * Purpose: evaluate function avg * * * * Parameters: values - [IN] non-empty vector with input data * @@ -687,8 +663,6 @@ int zbx_eval_calc_avg(zbx_vector_dbl_t *values, double *result, char **error) /****************************************************************************** * * - * Function: zbx_eval_calc_min * - * * * Purpose: evaluate function min * * * * Parameters: values - [IN] non-empty vector with input data * @@ -725,8 +699,6 @@ int zbx_eval_calc_min(zbx_vector_dbl_t *values, double *result, char **error) /****************************************************************************** * * - * Function: zbx_eval_calc_max * - * * * Purpose: evaluate function max * * * * Parameters: values - [IN] non-empty vector with input data * @@ -763,8 +735,6 @@ int zbx_eval_calc_max(zbx_vector_dbl_t *values, double *result, char **error) /****************************************************************************** * * - * Function: zbx_eval_calc_sum * - * * * Purpose: evaluate function sum * * * * Parameters: values - [IN] non-empty vector with input data * diff --git a/src/libs/zbxeval/execute.c b/src/libs/zbxeval/execute.c index 4fad1a013ce..fe72f4bca5b 100644 --- a/src/libs/zbxeval/execute.c +++ b/src/libs/zbxeval/execute.c @@ -48,8 +48,6 @@ zbx_function_trim_optype_t; /****************************************************************************** * * - * Function: variant_convert_suffixed_num * - * * * Purpose: convert variant string value containing suffixed number to * * floating point variant value * * * @@ -83,8 +81,6 @@ static int variant_convert_suffixed_num(zbx_variant_t *value, const zbx_variant_ /****************************************************************************** * * - * Function: eval_execute_op_unary * - * * * Purpose: evaluate unary operator * * * * Parameters: ctx - [IN] the evaluation context * @@ -151,8 +147,6 @@ static int eval_execute_op_unary(const zbx_eval_context_t *ctx, const zbx_eval_t /****************************************************************************** * * - * Function: eval_execute_op_logic_err * - * * * Purpose: evaluate logical or/and operator with one operand being error * * * * Parameters: token - [IN] the operator token * @@ -200,8 +194,6 @@ static int eval_execute_op_logic_err(const zbx_eval_token_t *token, const zbx_va /****************************************************************************** * * - * Function: eval_variant_compare * - * * * Purpose: compare two variant values supporting suffixed numbers * * * * Return value: <0 - the first value is less than the second * @@ -233,8 +225,6 @@ static int eval_variant_compare(const zbx_variant_t *left, const zbx_variant_t * /****************************************************************************** * * - * Function: eval_execute_op_binary * - * * * Purpose: evaluate binary operator * * * * Parameters: ctx - [IN] the evaluation context * @@ -408,8 +398,6 @@ finish: /****************************************************************************** * * - * Function: eval_suffixed_number_parse * - * * * Purpose: check if the value is suffixed number and return the suffix if * * exists * * * @@ -441,8 +429,6 @@ int eval_suffixed_number_parse(const char *value, char *suffix) /****************************************************************************** * * - * Function: eval_execute_push_value * - * * * Purpose: push value in output stack * * * * Parameters: ctx - [IN] the evaluation context * @@ -527,8 +513,6 @@ static int eval_execute_push_value(const zbx_eval_context_t *ctx, const zbx_eval /****************************************************************************** * * - * Function: eval_execute_push_null * - * * * Purpose: push null value in output stack * * * * Parameters: output - [IN/OUT] the output value stack * @@ -544,8 +528,6 @@ static void eval_execute_push_null(zbx_vector_var_t *output) /****************************************************************************** * * - * Function: eval_compare_token * - * * * Purpose: check if expression fragment matches the specified text * * * * Parameters: ctx - [IN] the evaluation context * @@ -571,8 +553,6 @@ int eval_compare_token(const zbx_eval_context_t *ctx, const zbx_strloc_t *loc, c /****************************************************************************** * * - * Function: eval_function_return * - * * * Purpose: handle function return * * * * Parameters: args_num - [IN] the number of function arguments * @@ -597,8 +577,6 @@ static void eval_function_return(zbx_uint32_t args_num, zbx_variant_t *value, zb /****************************************************************************** * * - * Function: eval_validate_function_args * - * * * Purpose: validate function arguments * * * * Parameters: ctx - [IN] the evaluation context * @@ -661,8 +639,6 @@ static const char *eval_type_desc(unsigned char type) /****************************************************************************** * * - * Function: eval_convert_function_arg * - * * * Purpose: convert function argument to the specified type * * * * Parameters: ctx - [IN] the evaluation context * @@ -698,8 +674,6 @@ static int eval_convert_function_arg(const zbx_eval_context_t *ctx, const zbx_ev /****************************************************************************** * * - * Function: eval_prepare_math_function_args * - * * * Purpose: validate and prepare (convert to floating values) math function * * arguments * * * @@ -767,8 +741,6 @@ static int eval_prepare_math_function_args(const zbx_eval_context_t *ctx, const /****************************************************************************** * * - * Function: eval_execute_function_min * - * * * Purpose: evaluate min() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -823,8 +795,6 @@ static int eval_execute_function_min(const zbx_eval_context_t *ctx, const zbx_ev /****************************************************************************** * * - * Function: eval_execute_function_max * - * * * Purpose: evaluate max() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -879,8 +849,6 @@ static int eval_execute_function_max(const zbx_eval_context_t *ctx, const zbx_ev /****************************************************************************** * * - * Function: eval_execute_function_sum * - * * * Purpose: evaluate sum() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -925,8 +893,6 @@ static int eval_execute_function_sum(const zbx_eval_context_t *ctx, const zbx_ev /****************************************************************************** * * - * Function: eval_execute_function_avg * - * * * Purpose: evaluate avg() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -975,8 +941,6 @@ static int eval_execute_function_avg(const zbx_eval_context_t *ctx, const zbx_ev /****************************************************************************** * * - * Function: eval_execute_function_abs * - * * * Purpose: evaluate abs() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -1013,8 +977,6 @@ static int eval_execute_function_abs(const zbx_eval_context_t *ctx, const zbx_ev /****************************************************************************** * * - * Function: eval_execute_function_length * - * * * Purpose: evaluate length() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -1055,8 +1017,6 @@ static int eval_execute_function_length(const zbx_eval_context_t *ctx, const zbx /****************************************************************************** * * - * Function: eval_execute_function_date * - * * * Purpose: evaluate date() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -1097,8 +1057,6 @@ static int eval_execute_function_date(const zbx_eval_context_t *ctx, const zbx_e /****************************************************************************** * * - * Function: eval_execute_function_time * - * * * Purpose: evaluate time() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -1138,8 +1096,6 @@ static int eval_execute_function_time(const zbx_eval_context_t *ctx, const zbx_e } /****************************************************************************** * * - * Function: eval_execute_function_now * - * * * Purpose: evaluate now() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -1170,8 +1126,6 @@ static int eval_execute_function_now(const zbx_eval_context_t *ctx, const zbx_ev } /****************************************************************************** * * - * Function: eval_execute_function_dayofweek * - * * * Purpose: evaluate dayofweek() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -1212,8 +1166,6 @@ static int eval_execute_function_dayofweek(const zbx_eval_context_t *ctx, const /****************************************************************************** * * - * Function: eval_execute_function_dayofmonth * - * * * Purpose: evaluate dayofmonth() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -1254,8 +1206,6 @@ static int eval_execute_function_dayofmonth(const zbx_eval_context_t *ctx, const /****************************************************************************** * * - * Function: eval_execute_function_bitwise * - * * * Purpose: evaluate bitand(), bitor(), bitxor(), bitlshift(), * * bitrshift() functions * * * @@ -1319,8 +1269,6 @@ static int eval_execute_function_bitwise(const zbx_eval_context_t *ctx, const zb /****************************************************************************** * * - * Function: eval_execute_function_bitnot * - * * * Purpose: evaluate bitnot() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -1361,8 +1309,6 @@ static int eval_execute_function_bitnot(const zbx_eval_context_t *ctx, const zbx /****************************************************************************** * * - * Function: eval_execute_function_left * - * * * Purpose: evaluate left() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -1447,8 +1393,6 @@ static int eval_validate_statistical_function_args(const zbx_eval_context_t *ctx /****************************************************************************** * * - * Function: eval_execute_statistical_function * - * * * Purpose: common operations for aggregate function calculation * * * * Parameters: ctx - [IN] the evaluation context * @@ -1485,8 +1429,6 @@ static int eval_execute_statistical_function(const zbx_eval_context_t *ctx, cons /****************************************************************************** * * - * Function: eval_execute_function_right * - * * * Purpose: evaluate right() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -1545,8 +1487,6 @@ static int eval_execute_function_right(const zbx_eval_context_t *ctx, const zbx_ /****************************************************************************** * * - * Function: eval_execute_function_mid * - * * * Purpose: evaluate mid() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -1615,8 +1555,6 @@ static int eval_execute_function_mid(const zbx_eval_context_t *ctx, const zbx_ev /****************************************************************************** * * - * Function: eval_execute_function_trim * - * * * Purpose: evaluate trim(), rtrim(), ltrim() functions * * * * Parameters: ctx - [IN] the evaluation context * @@ -1688,8 +1626,6 @@ static int eval_execute_function_trim(const zbx_eval_context_t *ctx, const zbx_e /****************************************************************************** * * - * Function: eval_execute_function_concat * - * * * Purpose: evaluate concat() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -1736,8 +1672,6 @@ static int eval_execute_function_concat(const zbx_eval_context_t *ctx, const zbx /****************************************************************************** * * - * Function: eval_execute_function_insert * - * * * Purpose: evaluate insert() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -1812,8 +1746,6 @@ static int eval_execute_function_insert(const zbx_eval_context_t *ctx, const zbx /****************************************************************************** * * - * Function: eval_execute_function_replace * - * * * Purpose: evaluate replace() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -1879,8 +1811,6 @@ static int eval_execute_function_replace(const zbx_eval_context_t *ctx, const zb /****************************************************************************** * * - * Function: eval_execute_function_repeat * - * * * Purpose: evaluate repeat() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -1943,8 +1873,6 @@ static int eval_execute_function_repeat(const zbx_eval_context_t *ctx, const zbx /****************************************************************************** * * - * Function: eval_execute_function_bytelength * - * * * Purpose: evaluate bytelength() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -2004,8 +1932,6 @@ static int eval_execute_function_bytelength(const zbx_eval_context_t *ctx, const /****************************************************************************** * * - * Function: eval_execute_function_bitlength * - * * * Purpose: evaluate bitlength() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -2064,8 +1990,6 @@ static int eval_execute_function_bitlength(const zbx_eval_context_t *ctx, const /****************************************************************************** * * - * Function: eval_execute_function_char * - * * * Purpose: evaluate char() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -2113,8 +2037,6 @@ static int eval_execute_function_char(const zbx_eval_context_t *ctx, const zbx_e /****************************************************************************** * * - * Function: eval_execute_function_ascii * - * * * Purpose: evaluate ascii() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -2158,8 +2080,6 @@ static int eval_execute_function_ascii(const zbx_eval_context_t *ctx, const zbx_ /****************************************************************************** * * - * Function: eval_execute_function_between * - * * * Purpose: evaluate between() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -2203,8 +2123,6 @@ static int eval_execute_function_between(const zbx_eval_context_t *ctx, const zb /****************************************************************************** * * - * Function: eval_execute_function_in * - * * * Purpose: evaluate in() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -2295,8 +2213,6 @@ out: /****************************************************************************** * * - * Function: eval_execute_function_histogram_quantile * - * * * Purpose: evaluate histogram_quantile() function * * * * Parameters: ctx - [IN] the evaluation context * @@ -2425,8 +2341,6 @@ static int eval_execute_function_histogram_quantile(const zbx_eval_context_t *ct /****************************************************************************** * * - * Function: eval_execute_cb_function * - * * * Purpose: evaluate function by calling custom callback (if configured) * * * * Parameters: ctx - [IN] the evaluation context * @@ -2497,8 +2411,6 @@ static double eval_math_func_signum(double x) /****************************************************************************** * * - * Function: eval_execute_math_function_single_param * - * * * Purpose: evaluate mathematical function by calling passed function * * with 1 double argument * * * @@ -2580,8 +2492,6 @@ static double eval_math_func_truncate(double n, double decimal_points) /****************************************************************************** * * - * Function: eval_execute_math_function_double_param * - * * * Purpose: evaluate mathematical function by calling passed function * * with 2 double arguments * * * @@ -2650,8 +2560,6 @@ static int eval_execute_math_function_double_param(const zbx_eval_context_t *ctx /****************************************************************************** * * - * Function: eval_execute_math_function_return_value * - * * * Purpose: evaluate mathematical function that returns constant value * * * * Parameters: ctx - [IN] the evaluation context * @@ -2727,8 +2635,6 @@ static int eval_execute_function_count(const zbx_eval_context_t *ctx, const zbx_ /****************************************************************************** * * - * Function: eval_execute_common_function * - * * * Purpose: evaluate common function * * * * Parameters: ctx - [IN] the evaluation context * @@ -2902,8 +2808,6 @@ static int eval_execute_common_function(const zbx_eval_context_t *ctx, const zbx /****************************************************************************** * * - * Function: eval_execute_history_function * - * * * Purpose: evaluate history function * * * * Parameters: ctx - [IN] the evaluation context * @@ -2934,8 +2838,6 @@ static int eval_execute_history_function(const zbx_eval_context_t *ctx, const zb /****************************************************************************** * * - * Function: eval_throw_exception * - * * * Purpose: throw exception by returning the specified error * * * * Parameters: output - [IN/OUT] the output value stack * @@ -2960,8 +2862,6 @@ static void eval_throw_exception(zbx_vector_var_t *output, char **error) /****************************************************************************** * * - * Function: eval_execute * - * * * Purpose: evaluate pre-parsed expression * * * * Parameters: ctx - [IN] the evaluation context * @@ -3082,8 +2982,6 @@ out: /****************************************************************************** * * - * Function: eval_init_execute_context * - * * * Purpose: initialize execution context * * * * Parameters: ctx - [IN] the evaluation context * @@ -3109,8 +3007,6 @@ static void eval_init_execute_context(zbx_eval_context_t *ctx, const zbx_timespe /****************************************************************************** * * - * Function: zbx_eval_execute * - * * * Purpose: evaluate parsed expression * * * * Parameters: ctx - [IN] the evaluation context * @@ -3131,8 +3027,6 @@ int zbx_eval_execute(zbx_eval_context_t *ctx, const zbx_timespec_t *ts, zbx_vari /****************************************************************************** * * - * Function: zbx_eval_execute_ext * - * * * Purpose: evaluate parsed expression with callback for custom function * * processing * * * diff --git a/src/libs/zbxeval/misc.c b/src/libs/zbxeval/misc.c index a49c2b1a764..279495a4377 100644 --- a/src/libs/zbxeval/misc.c +++ b/src/libs/zbxeval/misc.c @@ -31,8 +31,6 @@ /****************************************************************************** * * - * Function: reserve_buffer * - * * * Purpose: reserve number of bytes in the specified buffer, reallocating if * * necessary * * * @@ -145,8 +143,6 @@ static zbx_uint32_t deserialize_variant(const unsigned char *ptr, zbx_variant_t /****************************************************************************** * * - * Function: zbx_eval_serialize * - * * * Purpose: serialize evaluation context into buffer * * * * Parameters: ctx - [IN] the evaluation context * @@ -209,8 +205,6 @@ size_t zbx_eval_serialize(const zbx_eval_context_t *ctx, zbx_mem_malloc_func_t m /****************************************************************************** * * - * Function: zbx_eval_deserialize * - * * * Purpose: deserialize evaluation context from buffer * * * * Parameters: ctx - [OUT] the evaluation context * @@ -262,8 +256,6 @@ static int compare_tokens_by_loc(const void *d1, const void *d2) /****************************************************************************** * * - * Function: eval_token_print_alloc * - * * * Purpose: print token into string quoting/escaping if necessary * * * * Parameters: ctx - [IN] the evaluation context * @@ -349,8 +341,6 @@ static void eval_token_print_alloc(const zbx_eval_context_t *ctx, char **str, si /****************************************************************************** * * - * Function: zbx_eval_compose_expression * - * * * Purpose: compose expression by replacing processed tokens (with values) in * * the original expression * * * @@ -406,8 +396,6 @@ void zbx_eval_compose_expression(const zbx_eval_context_t *ctx, char **expressio /****************************************************************************** * * - * Function: eval_has_usermacro * - * * * Purpose: check if string has possible user macro * * * * Parameters: str - [IN] the string to check * @@ -440,8 +428,6 @@ static int eval_has_usermacro(const char *str, size_t len) /****************************************************************************** * * - * Function: eval_query_expand_user_macros * - * * * Purpose: expand user macros in item query * * * * Parameters: itemquery - [IN] the evaluation context * @@ -541,8 +527,6 @@ out: /****************************************************************************** * * - * Function: zbx_eval_expand_user_macros * - * * * Purpose: expand user macros in parsed expression * * * * Parameters: ctx - [IN] the evaluation context * @@ -612,8 +596,6 @@ int zbx_eval_expand_user_macros(const zbx_eval_context_t *ctx, zbx_uint64_t *hos /****************************************************************************** * * - * Function: zbx_eval_set_exception * - * * * Purpose: set eval context to exception that will be returned when executed * * * * Parameters: ctx - [IN] the evaluation context * @@ -639,8 +621,6 @@ void zbx_eval_set_exception(zbx_eval_context_t *ctx, char *message) /****************************************************************************** * * - * Function: expression_extract_functionid * - * * * Purpose: extract functionid from token * * * * Parameters: expression - [IN] the original expression * @@ -681,8 +661,6 @@ static int expression_extract_functionid(const char *expression, zbx_eval_token_ /****************************************************************************** * * - * Function: zbx_eval_deserialize_dyn * - * * * Purpose: deserialize expression and extract specified tokens into values * * * * Parameters: data - [IN] the serialized expression * @@ -738,8 +716,6 @@ zbx_eval_context_t *zbx_eval_deserialize_dyn(const unsigned char *data, const ch /****************************************************************************** * * - * Function: zbx_eval_get_functionids * - * * * Purpose: get functionids from parsed expression * * * * Parameters: ctx - [IN] the evaluation context * @@ -762,8 +738,6 @@ void zbx_eval_get_functionids(zbx_eval_context_t *ctx, zbx_vector_uint64_t *func /****************************************************************************** * * - * Function: zbx_eval_get_functionids_ordered * - * * * Purpose: get functionids from parsed expression in the order they are * * written * * * @@ -800,8 +774,6 @@ void zbx_eval_get_functionids_ordered(zbx_eval_context_t *ctx, zbx_vector_uint64 /****************************************************************************** * * - * Function: zbx_eval_check_timer_functions * - * * * Purpose: check if expression contains timer function calls (date, time, * * now, dayofweek, dayofmonth) * * * @@ -839,8 +811,6 @@ int zbx_eval_check_timer_functions(const zbx_eval_context_t *ctx) /****************************************************************************** * * - * Function: zbx_get_serialized_expression_functionids * - * * * Purpose: extract functionids from serialized expression * * * * Parameters: expression - [IN] the original expression * @@ -901,8 +871,6 @@ void zbx_get_serialized_expression_functionids(const char *expression, const uns /****************************************************************************** * * - * Function: zbx_eval_get_constant * - * * * Purpose: the Nth constant in expression * * * * Parameters: ctx - [IN] the evaluation context * @@ -939,8 +907,6 @@ void zbx_eval_get_constant(const zbx_eval_context_t *ctx, int index, char **valu /****************************************************************************** * * - * Function: zbx_eval_replace_functionid * - * * * Purpose: replace functionid in parsed expression with new functionid macro * * * * Parameters: ctx - [IN] the evaluation context * @@ -986,8 +952,6 @@ void zbx_eval_replace_functionid(zbx_eval_context_t *ctx, zbx_uint64_t old_funct /****************************************************************************** * * - * Function: zbx_eval_validate_replaced_functionids * - * * * Purpose: validate parsed expression to check if all functionids were * * replaced * * * @@ -1019,8 +983,6 @@ int zbx_eval_validate_replaced_functionids(zbx_eval_context_t *ctx, char **error /****************************************************************************** * * - * Function: zbx_eval_copy * - * * * Purpose: copy parsed expression * * * * Parameters: dst - [OUT] the destination evaluation context * @@ -1047,8 +1009,6 @@ void zbx_eval_copy(zbx_eval_context_t *dst, const zbx_eval_context_t *src, const /****************************************************************************** * * - * Function: zbx_eval_format_function_error * - * * * Purpose: format function evaluation error message * * * * Parameters: function - [IN] the function name * @@ -1084,8 +1044,6 @@ char *zbx_eval_format_function_error(const char *function, const char *host, con /****************************************************************************** * * - * Function: zbx_eval_extract_history_queries * - * * * Purpose: copy history query into vector and replace it with vector index * * * * Parameters: ctx - [IN] the evaluation context * diff --git a/src/libs/zbxeval/parse.c b/src/libs/zbxeval/parse.c index 05e2f70f754..2a6b457c485 100644 --- a/src/libs/zbxeval/parse.c +++ b/src/libs/zbxeval/parse.c @@ -36,8 +36,6 @@ static int is_whitespace(char c) /****************************************************************************** * * - * Function: eval_get_whitespace_len * - * * * Purpose: find the number of following whitespace characters * * * * Parameters: ctx - [IN] the evaluation context * @@ -58,8 +56,6 @@ static size_t eval_get_whitespace_len(zbx_eval_context_t *ctx, size_t pos) /****************************************************************************** * * - * Function: eval_update_const_variable * - * * * Purpose: update constant variable index in the trigger expression * * * * Parameters: ctx - [IN] the evaluation context * @@ -89,8 +85,6 @@ static void eval_update_const_variable(zbx_eval_context_t *ctx, zbx_eval_token_t /****************************************************************************** * * - * Function: eval_is_compound_number_char * - * * * Purpose: check if the character can be a part of a compound number * * following a macro * * * @@ -115,8 +109,6 @@ static int eval_is_compound_number_char(char c, int pos) /****************************************************************************** * * - * Function: eval_parse_functionid * - * * * Purpose: parse functionid token ({<functionid>}) * * * * Parameters: ctx - [IN] the evaluation context * @@ -144,8 +136,6 @@ static int eval_parse_functionid(zbx_eval_context_t *ctx, size_t pos, zbx_eval_t /****************************************************************************** * * - * Function: eval_parse_macro * - * * * Purpose: parse macro * * * * Parameters: ctx - [IN] the evaluation context * @@ -184,8 +174,6 @@ static int eval_parse_macro(zbx_eval_context_t *ctx, int pos, zbx_token_t *tok) /****************************************************************************** * * - * Function: eval_parse_number * - * * * Purpose: parse numeric value * * * * Parameters: ctx - [IN] the evaluation context * @@ -221,8 +209,6 @@ static int eval_parse_number(zbx_eval_context_t *ctx, size_t pos, size_t *pos_r) /****************************************************************************** * * - * Function: eval_parse_constant * - * * * Purpose: parse constant value * * * * Parameters: ctx - [IN] the evaluation context * @@ -326,8 +312,6 @@ out: /****************************************************************************** * * - * Function: eval_parse_character_token * - * * * Purpose: parse single character token * * * * Parameters: pos - [IN] the starting position * @@ -344,8 +328,6 @@ static void eval_parse_character_token(size_t pos, zbx_token_type_t type, zbx_ev /****************************************************************************** * * - * Function: eval_parse_less_character_token * - * * * Purpose: parse token starting with '<' * * * * Parameters: ctx - [IN] the evaluation context * @@ -386,8 +368,6 @@ static int eval_parse_less_character_token(zbx_eval_context_t *ctx, size_t pos, /****************************************************************************** * * - * Function: eval_parse_greater_character_token * - * * * Purpose: parse token starting with '>' * * * * Parameters: ctx - [IN] the evaluation context * @@ -411,8 +391,6 @@ static void eval_parse_greater_character_token(zbx_eval_context_t *ctx, size_t p /****************************************************************************** * * - * Function: eval_parse_string_token * - * * * Purpose: parse string variable token * * * * Parameters: ctx - [IN] the evaluation context * @@ -459,8 +437,6 @@ static int eval_parse_string_token(zbx_eval_context_t *ctx, size_t pos, zbx_eval /****************************************************************************** * * - * Function: eval_parse_number_token * - * * * Purpose: parse numeric variable token * * * * Parameters: ctx - [IN] the evaluation context * @@ -502,8 +478,6 @@ static int eval_parse_number_token(zbx_eval_context_t *ctx, size_t pos, zbx_eval /****************************************************************************** * * - * Function: eval_parse_logic_token * - * * * Purpose: parse logical operation token * * * * Parameters: ctx - [IN] the evaluation context * @@ -548,8 +522,6 @@ static int eval_parse_logic_token(zbx_eval_context_t *ctx, size_t pos, zbx_eval_ /****************************************************************************** * * - * Function: eval_parse_function_token * - * * * Purpose: parse function token * * * * Parameters: ctx - [IN] the evaluation context * @@ -583,8 +555,6 @@ static int eval_parse_function_token(zbx_eval_context_t *ctx, size_t pos, zbx_ev /****************************************************************************** * * - * Function: eval_parse_query_filter * - * * * Purpose: parse item query filter (?[group="xyz"]) * * * * Parameters: ptr - [IN] - the filter to parse * @@ -629,8 +599,6 @@ static int eval_parse_query_filter(const char **ptr) /****************************************************************************** * * - * Function: eval_parse_query * - * * * Purpose: parse item query /host/key?[filter] into host, key and filter * * components * * * @@ -714,8 +682,6 @@ size_t eval_parse_query(const char *str, const char **phost, const char **pkey, /****************************************************************************** * * - * Function: eval_parse_query_token * - * * * Purpose: parse history query token * * * * Parameters: ctx - [IN] the evaluation context * @@ -749,8 +715,6 @@ static int eval_parse_query_token(zbx_eval_context_t *ctx, size_t pos, zbx_eval_ /****************************************************************************** * * - * Function: eval_parse_time_token * - * * * Purpose: parse time period token * * * * Parameters: ctx - [IN] the evaluation context * @@ -798,8 +762,6 @@ static int eval_parse_period_token(zbx_eval_context_t *ctx, size_t pos, zbx_eval /****************************************************************************** * * - * Function: eval_parse_property_token * - * * * Purpose: parse property token * * * * Parameters: ctx - [IN] the evaluation context * @@ -835,8 +797,6 @@ static int eval_parse_property_token(zbx_eval_context_t *ctx, size_t pos, zbx_ev /****************************************************************************** * * - * Function: eval_parse_token * - * * * Purpose: parse token * * * * Parameters: ctx - [IN] the evaluation context * @@ -1036,8 +996,6 @@ static int eval_parse_token(zbx_eval_context_t *ctx, size_t pos, zbx_eval_token_ /****************************************************************************** * * - * Function: eval_append_operator * - * * * Purpose: add operator/function token to evaluation stack * * * * Parameters: ctx - [IN] the evaluation context * @@ -1124,8 +1082,6 @@ static int eval_append_operator(zbx_eval_context_t *ctx, zbx_eval_token_t *token /****************************************************************************** * * - * Function: eval_append_operand * - * * * Purpose: add operand token to evaluation stack * * * * Parameters: ctx - [IN] the evaluation context * @@ -1184,8 +1140,6 @@ static int eval_append_operand(zbx_eval_context_t *ctx, zbx_eval_token_t *token, /****************************************************************************** * * - * Function: eval_append_arg_null * - * * * Purpose: add null argument token to evaluation stack * * * * Parameters: ctx - [IN] the evaluation context * @@ -1200,8 +1154,6 @@ static void eval_append_arg_null(zbx_eval_context_t *ctx) /****************************************************************************** * * - * Function: eval_clear * - * * * Purpose: free resources allocated by evaluation context * * * * Parameters: ctx - [IN] the evaluation context * @@ -1222,8 +1174,6 @@ static void eval_clear(zbx_eval_context_t *ctx) /****************************************************************************** * * - * Function: eval_parse_expression * - * * * Purpose: parse expression into tokens in postfix notation order * * * * Parameters: ctx - [OUT] the evaluation context * @@ -1481,8 +1431,6 @@ out: /****************************************************************************** * * - * Function: zbx_eval_parse_expression * - * * * Purpose: parse expression into tokens in postfix notation order * * * * Parameters: ctx - [OUT] the evaluation context * @@ -1501,8 +1449,6 @@ int zbx_eval_parse_expression(zbx_eval_context_t *ctx, const char *expression, z /****************************************************************************** * * - * Function: zbx_eval_init * - * * * Purpose: initialize context so it can be cleared without parsing * * * * Parameters: ctx - [IN] the evaluation context * @@ -1515,8 +1461,6 @@ void zbx_eval_init(zbx_eval_context_t *ctx) /****************************************************************************** * * - * Function: zbx_eval_clear * - * * * Purpose: free resources allocated by evaluation context * * * * Parameters: ctx - [IN] the evaluation context * @@ -1529,8 +1473,6 @@ void zbx_eval_clear(zbx_eval_context_t *ctx) /****************************************************************************** * * - * Function: zbx_eval_status * - * * * Purpose: return evaluation context status * * * * Parameters: ctx - [IN] the evaluation context * diff --git a/src/libs/zbxeval/query.c b/src/libs/zbxeval/query.c index 928f7b05de8..a4d223adbb3 100644 --- a/src/libs/zbxeval/query.c +++ b/src/libs/zbxeval/query.c @@ -29,8 +29,6 @@ /****************************************************************************** * * - * Function: zbx_eval_parse_query * - * * * Purpose: parse item query /host/key?[filter] into host, key and filter * * components * * * @@ -67,8 +65,6 @@ size_t zbx_eval_parse_query(const char *str, size_t len, zbx_item_query_t *query /****************************************************************************** * * - * Function: zbx_eval_clear_filter * - * * * Purpose: frees resources allocated by item reference * * * ******************************************************************************/ @@ -81,8 +77,6 @@ void zbx_eval_clear_query(zbx_item_query_t *query) /****************************************************************************** * * - * Function: zbx_eval_prepare_filter * - * * * Purpose: prepare filter expression by converting property comparisons * * prop =/<> "value" to prop("value")/not prop("value") function * * calls. * @@ -136,8 +130,6 @@ void zbx_eval_prepare_filter(zbx_eval_context_t *ctx) /****************************************************************************** * * - * Function: eval_filter_apply_op2 * - * * * Purpose: apply binary operation to stack * * * * Parameters: token - [IN] the operation token * @@ -185,8 +177,6 @@ static void eval_filter_apply_op2(zbx_eval_token_t *token, zbx_vector_eval_token /****************************************************************************** * * - * Function: eval_filter_apply_op1 * - * * * Purpose: apply unary operation to stack * * * * Parameters: token - [IN] the operation token * @@ -209,8 +199,6 @@ static void eval_filter_apply_op1(zbx_eval_token_t *token, zbx_vector_eval_token /****************************************************************************** * * - * Function: eval_filter_apply_func * - * * * Purpose: apply function to stack * * * * Parameters: ctx - [IN] the evaluation context * @@ -240,8 +228,6 @@ static void eval_filter_apply_func(zbx_eval_context_t *ctx, zbx_eval_token_t *to /****************************************************************************** * * - * Function: eval_op_str * - * * * Purpose: get operator in text format * * * * Parameters: op - [IN] the operator type * @@ -275,8 +261,6 @@ static const char *eval_op_str(zbx_token_type_t op) /****************************************************************************** * * - * Function: eval_unquote_str * - * * * Purpose: unquote string * * * * Parameters: str - [IN] the string to unquote * @@ -315,8 +299,6 @@ static char *eval_unquote_str(char *str) /****************************************************************************** * * - * Function: eval_generate_filter * - * * * Purpose: generate filter expression from the specified stack * * * * Parameters: ctx - [IN] the evaluation context * @@ -418,8 +400,6 @@ out: /****************************************************************************** * * - * Function: zbx_eval_get_group_filter * - * * * Purpose: generate group SQL filter expression from item filter * * * * Parameters: ctx - [IN] the filter expression evaluation context * diff --git a/src/libs/zbxexec/execute.c b/src/libs/zbxexec/execute.c index d5c1f9fe166..823c84a11f3 100644 --- a/src/libs/zbxexec/execute.c +++ b/src/libs/zbxexec/execute.c @@ -29,8 +29,6 @@ /****************************************************************************** * * - * Function: zbx_get_timediff_ms * - * * * Purpose: considers a difference between times in milliseconds * * * * Parameters: time1 - [IN] first time point * @@ -56,8 +54,6 @@ static int zbx_get_timediff_ms(struct _timeb *time1, struct _timeb *time2) /****************************************************************************** * * - * Function: zbx_read_from_pipe * - * * * Purpose: read data from pipe * * * * Parameters: hRead - [IN] a handle to the device * @@ -121,8 +117,6 @@ static int zbx_read_from_pipe(HANDLE hRead, char **buf, size_t *buf_size, size_t /****************************************************************************** * * - * Function: zbx_popen * - * * * Purpose: this function opens a process by creating a pipe, forking, * * and invoking the shell * * * @@ -244,8 +238,6 @@ static int zbx_popen(pid_t *pid, const char *command, const char *dir) /****************************************************************************** * * - * Function: zbx_waitpid * - * * * Purpose: this function waits for process to change state * * * * Parameters: pid - [IN] child process PID * @@ -308,8 +300,6 @@ exit: /****************************************************************************** * * - * Function: zbx_execute * - * * * Purpose: this function executes a script and returns result from stdout * * * * Parameters: command - [IN] command for execution * @@ -561,8 +551,6 @@ close: /****************************************************************************** * * - * Function: zbx_execute_nowait * - * * * Purpose: this function executes a script in the background and * * suppresses the std output * * * diff --git a/src/libs/zbxha/ha.c b/src/libs/zbxha/ha.c index 759b39fe3ce..3a23cb714fc 100644 --- a/src/libs/zbxha/ha.c +++ b/src/libs/zbxha/ha.c @@ -25,8 +25,6 @@ /****************************************************************************** * * - * Function: zbx_ha_get_nodes * - * * * Purpose: get HA nodes in json format * * * ******************************************************************************/ @@ -62,8 +60,6 @@ int zbx_ha_get_nodes(char **nodes, char **error) /****************************************************************************** * * - * Function: zbx_ha_remove_node * - * * * Purpose: remove HA node * * * * Comments: A new socket is opened to avoid interfering with notification * @@ -91,8 +87,6 @@ int zbx_ha_remove_node(const char *node, char **result, char **error) /****************************************************************************** * * - * Function: zbx_ha_set_failover_delay * - * * * Purpose: set HA failover delay * * * * Comments: A new socket is opened to avoid interfering with notification * @@ -118,8 +112,6 @@ int zbx_ha_set_failover_delay(int delay, char **error) /****************************************************************************** * * - * Function: zbx_ha_get_failover_delay * - * * * Purpose: get HA failover delay * * * * Comments: A new socket is opened to avoid interfering with notification * @@ -144,8 +136,6 @@ int zbx_ha_get_failover_delay(int *delay, char **error) /****************************************************************************** * * - * Function: zbx_ha_change_loglevel * - * * * Purpose: change HA manager log level * * * ******************************************************************************/ @@ -169,8 +159,6 @@ int zbx_ha_change_loglevel(int direction, char **error) /****************************************************************************** * * - * Function: zbx_ha_status_str * - * * * Purpose: get HA status in text format * * * ******************************************************************************/ diff --git a/src/libs/zbxhistory/history.c b/src/libs/zbxhistory/history.c index cae847db188..63a24a65b6c 100644 --- a/src/libs/zbxhistory/history.c +++ b/src/libs/zbxhistory/history.c @@ -34,8 +34,6 @@ zbx_history_iface_t history_ifaces[ITEM_VALUE_TYPE_MAX]; /************************************************************************************ * * - * Function: zbx_history_init * - * * * Purpose: initializes history storage * * * * Comments: History interfaces are created for all values types based on * @@ -67,8 +65,6 @@ int zbx_history_init(char **error) /************************************************************************************ * * - * Function: zbx_history_destroy * - * * * Purpose: destroys history storage * * * * Comments: All interfaces created by zbx_history_init() function are destroyed * @@ -89,8 +85,6 @@ void zbx_history_destroy(void) /************************************************************************************ * * - * Function: zbx_history_add_values * - * * * Purpose: Sends values to the history storage * * * * Parameters: history - [IN] the values to store * @@ -132,8 +126,6 @@ int zbx_history_add_values(const zbx_vector_ptr_t *history, int *ret_flush) /************************************************************************************ * * - * Function: zbx_history_get_values * - * * * Purpose: gets item values from history storage * * * * Parameters: itemid - [IN] the itemid * @@ -184,8 +176,6 @@ int zbx_history_get_values(zbx_uint64_t itemid, int value_type, int start, int c /************************************************************************************ * * - * Function: zbx_history_requires_trends * - * * * Purpose: checks if the value type requires trends data calculations * * * * Parameters: value_type - [IN] the value type * @@ -206,8 +196,6 @@ int zbx_history_requires_trends(int value_type) /****************************************************************************** * * - * Function: history_logfree * - * * * Purpose: frees history log and all resources allocated for it * * * * Parameters: log - [IN] the history log to free * @@ -222,8 +210,6 @@ static void history_logfree(zbx_log_value_t *log) /****************************************************************************** * * - * Function: zbx_history_record_vector_destroy * - * * * Purpose: destroys value vector and frees resources allocated for it * * * * Parameters: vector - [IN] the value vector * @@ -243,8 +229,6 @@ void zbx_history_record_vector_destroy(zbx_vector_history_record_t *vector, int /****************************************************************************** * * - * Function: zbx_history_record_clear * - * * * Purpose: frees resources allocated by a cached value * * * * Parameters: value - [IN] the cached value to clear * @@ -266,8 +250,6 @@ void zbx_history_record_clear(zbx_history_record_t *value, int value_type) /****************************************************************************** * * - * Function: zbx_history_value2str * - * * * Purpose: converts history value to string format * * * * Parameters: buffer - [OUT] the output buffer * @@ -297,8 +279,6 @@ void zbx_history_value2str(char *buffer, size_t size, const history_value_t *val /****************************************************************************** * * - * Function: zbx_history_value2str_dyn * - * * * Purpose: converts history value to string format (with dynamic buffer) * * * * Parameters: value - [IN] the value to convert * @@ -332,8 +312,6 @@ char *zbx_history_value2str_dyn(const history_value_t *value, int value_type) /****************************************************************************** * * - * Function: zbx_history_value_print * - * * * Purpose: converts history value to string format (double type printed in * * human friendly format) * * * @@ -353,8 +331,6 @@ void zbx_history_value_print(char *buffer, size_t size, const history_value_t *v /****************************************************************************** * * - * Function: zbx_history_record_vector_clean * - * * * Purpose: releases resources allocated to store history records * * * * Parameters: vector - [IN] the history record vector * @@ -383,8 +359,6 @@ void zbx_history_record_vector_clean(zbx_vector_history_record_t *vector, int va /****************************************************************************** * * - * Function: zbx_history_record_compare_asc_func * - * * * Purpose: compares two cache values by their timestamps * * * * Parameters: d1 - [IN] the first value * @@ -408,8 +382,6 @@ int zbx_history_record_compare_asc_func(const zbx_history_record_t *d1, const zb /****************************************************************************** * * - * Function: vc_history_record_compare_desc_func * - * * * Purpose: compares two cache values by their timestamps * * * * Parameters: d1 - [IN] the first value * @@ -433,8 +405,6 @@ int zbx_history_record_compare_desc_func(const zbx_history_record_t *d1, const z /****************************************************************************** * * - * Function: zbx_history_value2variant * - * * * Purpose: converts history value to variant value * * * * Parameters: value - [IN] the value to convert * @@ -463,8 +433,6 @@ void zbx_history_value2variant(const history_value_t *value, unsigned char value /****************************************************************************** * * - * Function: zbx_history_check_version * - * * * Purpose: relays the version retrieval logic to the history implementation * * functions * * * diff --git a/src/libs/zbxhistory/history_elastic.c b/src/libs/zbxhistory/history_elastic.c index 1e96fb5bec0..7a5b2377da6 100644 --- a/src/libs/zbxhistory/history_elastic.c +++ b/src/libs/zbxhistory/history_elastic.c @@ -220,8 +220,6 @@ static void elastic_log_error(CURL *handle, CURLcode error, const char *errbuf) /************************************************************************************ * * - * Function: elastic_close * - * * * Purpose: closes connection and releases allocated resources * * * * Parameters: hist - [IN] the history storage interface * @@ -246,8 +244,6 @@ static void elastic_close(zbx_history_iface_t *hist) /****************************************************************************** * * - * Function: elastic_is_error_present * - * * * Purpose: check a error from Elastic json response * * * * Parameters: page - [IN] the buffer with json response * @@ -322,8 +318,6 @@ static int elastic_is_error_present(zbx_httppage_t *page, char **err) /************************************************************************************ * * - * Function: elastic_writer_init * - * * * Purpose: initializes elastic writer for a new batch of history values * * * ************************************************************************************/ @@ -345,8 +339,6 @@ static void elastic_writer_init(void) /************************************************************************************ * * - * Function: elastic_writer_release * - * * * Purpose: releases initialized elastic writer by freeing allocated resources and * * setting its state to uninitialized. * * * @@ -368,8 +360,6 @@ static void elastic_writer_release(void) /************************************************************************************ * * - * Function: elastic_writer_add_iface * - * * * Purpose: adds history storage interface to be flushed later * * * * Parameters: db_insert - [IN] bulk insert data * @@ -429,8 +419,6 @@ out: /************************************************************************************ * * - * Function: elastic_writer_flush * - * * * Purpose: posts historical data to elastic storage * * * ************************************************************************************/ @@ -600,8 +588,6 @@ end: /************************************************************************************ * * - * Function: elastic_destroy * - * * * Purpose: destroys history storage interface * * * * Parameters: hist - [IN] the history storage interface * @@ -619,8 +605,6 @@ static void elastic_destroy(zbx_history_iface_t *hist) /************************************************************************************ * * - * Function: elastic_get_values * - * * * Purpose: gets item history data from history storage * * * * Parameters: hist - [IN] the history storage interface * @@ -867,8 +851,6 @@ out: /************************************************************************************ * * - * Function: elastic_add_values * - * * * Purpose: sends history data to the storage * * * * Parameters: hist - [IN] the history storage interface * @@ -953,8 +935,6 @@ static int elastic_add_values(zbx_history_iface_t *hist, const zbx_vector_ptr_t /************************************************************************************ * * - * Function: elastic_flush * - * * * Purpose: flushes the history data to storage * * * * Parameters: hist - [IN] the history storage interface * @@ -972,8 +952,6 @@ static int elastic_flush(zbx_history_iface_t *hist) /************************************************************************************ * * - * Function: zbx_history_elastic_init * - * * * Purpose: initializes history storage interface * * * * Parameters: hist - [IN] the history storage interface * @@ -1015,8 +993,6 @@ int zbx_history_elastic_init(zbx_history_iface_t *hist, unsigned char value_type /************************************************************************************ * * - * Function: zbx_elastic_version_extract * - * * * Purpose: queries elastic search version and extracts the numeric version from * * the response string * * * diff --git a/src/libs/zbxhistory/history_sql.c b/src/libs/zbxhistory/history_sql.c index 8713b7fa748..1fa3068e25b 100644 --- a/src/libs/zbxhistory/history_sql.c +++ b/src/libs/zbxhistory/history_sql.c @@ -96,8 +96,6 @@ static zbx_vc_history_table_t vc_history_tables[] = { /************************************************************************************ * * - * Function: sql_writer_init * - * * * Purpose: initializes sql writer for a new batch of history values * * * ************************************************************************************/ @@ -113,8 +111,6 @@ static void sql_writer_init(void) /************************************************************************************ * * - * Function: sql_writer_release * - * * * Purpose: releases initialized sql writer by freeing allocated resources and * * setting its state to uninitialized. * * * @@ -138,8 +134,6 @@ static void sql_writer_release(void) /************************************************************************************ * * - * Function: sql_writer_add_dbinsert * - * * * Purpose: adds bulk insert data to be flushed later * * * * Parameters: db_insert - [IN] bulk insert data * @@ -153,8 +147,6 @@ static void sql_writer_add_dbinsert(zbx_db_insert_t *db_insert) /************************************************************************************ * * - * Function: sql_writer_flush * - * * * Purpose: flushes bulk insert data into database * * * ************************************************************************************/ @@ -204,8 +196,6 @@ typedef void (*add_history_func_t)(const zbx_vector_ptr_t *history); /****************************************************************************** * * - * Function: add_history_dbl * - * * ******************************************************************************/ static void add_history_dbl(const zbx_vector_ptr_t *history) { @@ -230,8 +220,6 @@ static void add_history_dbl(const zbx_vector_ptr_t *history) /****************************************************************************** * * - * Function: add_history_uint * - * * ******************************************************************************/ static void add_history_uint(zbx_vector_ptr_t *history) { @@ -256,8 +244,6 @@ static void add_history_uint(zbx_vector_ptr_t *history) /****************************************************************************** * * - * Function: add_history_str * - * * ******************************************************************************/ static void add_history_str(zbx_vector_ptr_t *history) { @@ -282,8 +268,6 @@ static void add_history_str(zbx_vector_ptr_t *history) /****************************************************************************** * * - * Function: add_history_text * - * * ******************************************************************************/ static void add_history_text(zbx_vector_ptr_t *history) { @@ -308,8 +292,6 @@ static void add_history_text(zbx_vector_ptr_t *history) /****************************************************************************** * * - * Function: add_history_log * - * * ******************************************************************************/ static void add_history_log(zbx_vector_ptr_t *history) { @@ -345,8 +327,6 @@ static void add_history_log(zbx_vector_ptr_t *history) /********************************************************************************* * * - * Function: db_read_values_by_time * - * * * Purpose: reads item history data from database * * * * Parameters: itemid - [IN] the itemid * @@ -415,8 +395,6 @@ out: /************************************************************************************ * * - * Function: db_read_values_by_count * - * * * Purpose: reads item history data from database * * * * Parameters: itemid - [IN] the itemid * @@ -521,8 +499,6 @@ out: /************************************************************************************ * * - * Function: db_read_values_by_time_and_count * - * * * Purpose: reads item history data from database * * * * Parameters: itemid - [IN] the itemid * @@ -619,8 +595,6 @@ out: /************************************************************************************ * * - * Function: sql_destroy * - * * * Purpose: destroys history storage interface * * * * Parameters: hist - [IN] the history storage interface * @@ -633,8 +607,6 @@ static void sql_destroy(zbx_history_iface_t *hist) /************************************************************************************ * * - * Function: sql_get_values * - * * * Purpose: gets item history data from history storage * * * * Parameters: hist - [IN] the history storage interface * @@ -665,8 +637,6 @@ static int sql_get_values(zbx_history_iface_t *hist, zbx_uint64_t itemid, int st /************************************************************************************ * * - * Function: sql_add_values * - * * * Purpose: sends history data to the storage * * * * Parameters: hist - [IN] the history storage interface * @@ -696,8 +666,6 @@ static int sql_add_values(zbx_history_iface_t *hist, const zbx_vector_ptr_t *his /************************************************************************************ * * - * Function: sql_flush * - * * * Purpose: flushes the history data to storage * * * * Parameters: hist - [IN] the history storage interface * @@ -715,8 +683,6 @@ static int sql_flush(zbx_history_iface_t *hist) /************************************************************************************ * * - * Function: zbx_history_sql_init * - * * * Purpose: initializes history storage interface * * * * Parameters: hist - [IN] the history storage interface * diff --git a/src/libs/zbxhttp/punycode.c b/src/libs/zbxhttp/punycode.c index 2eac47bba05..ca339c14076 100644 --- a/src/libs/zbxhttp/punycode.c +++ b/src/libs/zbxhttp/punycode.c @@ -23,8 +23,6 @@ /****************************************************************************** * * - * Function: punycode_adapt * - * * * Purpose: after each delta is encoded or decoded, bias should be set for * * the next delta (should be adapted) * * * @@ -52,8 +50,6 @@ static zbx_uint32_t punycode_adapt(zbx_uint32_t delta, int count, int divisor) /****************************************************************************** * * - * Function: punycode_encode_digit * - * * * Purpose: encodes punycode digit into ansi character [a-z0-9] * * * * Parameters: digit - [IN] digit to encode * @@ -74,8 +70,6 @@ static char punycode_encode_digit(int digit) /****************************************************************************** * * - * Function: punycode_encode_codepoints * - * * * Purpose: encodes array of unicode codepoints into into punycode (RFC 3492) * * * * Parameters: codepoints - [IN] codepoints to encode * @@ -181,8 +175,6 @@ out: /****************************************************************************** * * - * Function: punycode_encode_part * - * * * Purpose: encodes unicode domain name part into punycode (RFC 3492) * * domain is being split in parts by punycode_encode by using * * character '.' as part separator * @@ -235,8 +227,6 @@ static int punycode_encode_part(zbx_uint32_t *codepoints, zbx_uint32_t count, ch /****************************************************************************** * * - * Function: zbx_http_punycode_encode * - * * * Purpose: encodes unicode domain names into punycode (RFC 3492) * * * * Parameters: text - [IN] text to encode * @@ -311,8 +301,6 @@ out: /****************************************************************************** * * - * Function: zbx_http_punycode_encode_url * - * * * Purpose: encodes unicode domain name in URL into punycode * * * * Parameters: url - [IN/OUT] URL to encode * diff --git a/src/libs/zbxhttp/urlencode.c b/src/libs/zbxhttp/urlencode.c index e583ad53365..9fabd3f0cdc 100644 --- a/src/libs/zbxhttp/urlencode.c +++ b/src/libs/zbxhttp/urlencode.c @@ -23,8 +23,6 @@ /****************************************************************************** * * - * Function: zbx_http_url_encode * - * * * Purpose: replaces unsafe characters with a '%' followed by two hexadecimal * * digits (the only allowed exception is a space character that can * * be replaced with a plus (+) sign or with %20).to url encode * @@ -63,8 +61,6 @@ void zbx_http_url_encode(const char *source, char **result) /****************************************************************************** * * - * Function: zbx_http_url_decode * - * * * Purpose: replaces URL escape sequences ('+' or '%' followed by two * * hexadecimal digits) with matching characters. * * * diff --git a/src/libs/zbxicmpping/icmpping.c b/src/libs/zbxicmpping/icmpping.c index e69a8bf2daf..9432cecac9b 100644 --- a/src/libs/zbxicmpping/icmpping.c +++ b/src/libs/zbxicmpping/icmpping.c @@ -87,8 +87,6 @@ static void get_source_ip_option(const char *fping, const char **option, unsigne /****************************************************************************** * * - * Function: get_interval_option * - * * * Purpose: detect minimal possible fping packet interval * * * * Parameters: fping - [IN] the location of fping program * @@ -227,8 +225,6 @@ out: #ifdef HAVE_IPV6 /****************************************************************************** * * - * Function: get_ipv6_support * - * * * Purpose: check fping supports IPv6 * * * * Parameters: fping - [IN] the location of fping program * @@ -698,8 +694,6 @@ out: /****************************************************************************** * * - * Function: zbx_ping * - * * * Purpose: ping hosts listed in the host files * * * * hosts_count - [IN] number of target hosts * diff --git a/src/libs/zbxipcservice/ipcservice.c b/src/libs/zbxipcservice/ipcservice.c index e963b359449..e0544ea67f7 100644 --- a/src/libs/zbxipcservice/ipcservice.c +++ b/src/libs/zbxipcservice/ipcservice.c @@ -105,8 +105,6 @@ static const char *ipc_get_path(void) /****************************************************************************** * * - * Function: ipc_make_path * - * * * Purpose: makes socket path from the service name * * * * Parameters: service_name - [IN] the service name * @@ -167,8 +165,6 @@ static const char *ipc_make_path(const char *service_name, char **error) /****************************************************************************** * * - * Function: ipc_write_data * - * * * Purpose: writes data to a socket * * * * Parameters: fd - [IN] the socket file descriptor * @@ -215,8 +211,6 @@ static int ipc_write_data(int fd, const unsigned char *data, zbx_uint32_t size, /****************************************************************************** * * - * Function: ipc_read_data * - * * * Purpose: reads data from a socket * * * * Parameters: fd - [IN] the socket file descriptor * @@ -258,8 +252,6 @@ static int ipc_read_data(int fd, unsigned char *buffer, zbx_uint32_t size, zbx_u /****************************************************************************** * * - * Function: ipc_read_data_full * - * * * Purpose: reads data from a socket until the requested data has been read * * * * Parameters: fd - [IN] the socket file descriptor * @@ -302,8 +294,6 @@ out: /****************************************************************************** * * - * Function: ipc_socket_write_message * - * * * Purpose: writes IPC message to socket * * * * Parameters: csocket - [IN] the IPC socket * @@ -354,8 +344,6 @@ static int ipc_socket_write_message(zbx_ipc_socket_t *csocket, zbx_uint32_t code /****************************************************************************** * * - * Function: ipc_read_buffer * - * * * Purpose: reads message header and data from buffer * * * * Parameters: header - [IN/OUT] the message header * @@ -412,8 +400,6 @@ static int ipc_read_buffer(zbx_uint32_t *header, unsigned char **data, zbx_uint3 /****************************************************************************** * * - * Function: ipc_message_is_completed * - * * * Purpose: checks if IPC message has been completed * * * * Parameters: header - [IN] the message header * @@ -437,8 +423,6 @@ static int ipc_message_is_completed(const zbx_uint32_t *header, zbx_uint32_t rx_ /****************************************************************************** * * - * Function: ipc_socket_read_message * - * * * Purpose: reads IPC message from buffered client socket * * * * Parameters: csocket - [IN] the source socket * @@ -516,8 +500,6 @@ out: /****************************************************************************** * * - * Function: ipc_client_free_event * - * * * Purpose: frees client's libevent event * * * * Parameters: client - [IN] the client * @@ -540,8 +522,6 @@ static void ipc_client_free_events(zbx_ipc_client_t *client) /****************************************************************************** * * - * Function: ipc_client_free * - * * * Purpose: frees IPC service client * * * * Parameters: client - [IN] the client to free * @@ -573,8 +553,6 @@ static void ipc_client_free(zbx_ipc_client_t *client) /****************************************************************************** * * - * Function: ipc_client_push_rx_message * - * * * Purpose: adds message to received messages queue * * * * Parameters: client - [IN] the client to read * @@ -596,8 +574,6 @@ static void ipc_client_push_rx_message(zbx_ipc_client_t *client) /****************************************************************************** * * - * Function: ipc_client_pop_tx_message * - * * * Purpose: prepares to send the next message in send queue * * * * Parameters: client - [IN] the client * @@ -622,8 +598,6 @@ static void ipc_client_pop_tx_message(zbx_ipc_client_t *client) /****************************************************************************** * * - * Function: ipc_client_read * - * * * Purpose: reads data from IPC service client * * * * Parameters: client - [IN] the client to read * @@ -659,8 +633,6 @@ static int ipc_client_read(zbx_ipc_client_t *client) /****************************************************************************** * * - * Function: ipc_client_write * - * * * Purpose: writes queued data to IPC service client * * * * Parameters: client - [IN] the client * @@ -716,8 +688,6 @@ static int ipc_client_write(zbx_ipc_client_t *client) /****************************************************************************** * * - * Function: ipc_service_pop_client * - * * * Purpose: gets the next client with messages/closed socket from recv queue * * * * Parameters: service - [IN] the IPC service * @@ -737,8 +707,6 @@ static zbx_ipc_client_t *ipc_service_pop_client(zbx_ipc_service_t *service) /****************************************************************************** * * - * Function: ipc_service_push_client * - * * * Purpose: pushes client to the recv queue if needed * * * * Parameters: service - [IN] the IPC service * @@ -763,8 +731,6 @@ static void ipc_service_push_client(zbx_ipc_service_t *service, zbx_ipc_client_t /****************************************************************************** * * - * Function: ipc_service_add_client * - * * * Purpose: adds a new IPC service client * * * * Parameters: service - [IN] the IPC service * @@ -816,8 +782,6 @@ static void ipc_service_add_client(zbx_ipc_service_t *service, int fd) /****************************************************************************** * * - * Function: ipc_service_remove_client * - * * * Purpose: removes IPC service client * * * * Parameters: service - [IN] the IPC service * @@ -837,8 +801,6 @@ static void ipc_service_remove_client(zbx_ipc_service_t *service, zbx_ipc_client /****************************************************************************** * * - * Function: zbx_ipc_client_by_id * - * * * Purpose: to find connected client when only it's ID is known * * * * Parameters: service - [IN] the IPC service * @@ -865,8 +827,6 @@ zbx_ipc_client_t *zbx_ipc_client_by_id(const zbx_ipc_service_t *service, zbx_uin /****************************************************************************** * * - * Function: ipc_client_read_event_cb * - * * * Purpose: service client read event libevent callback * * * ******************************************************************************/ @@ -888,8 +848,6 @@ static void ipc_client_read_event_cb(evutil_socket_t fd, short what, void *arg) /****************************************************************************** * * - * Function: ipc_client_write_event_cb * - * * * Purpose: service client write event libevent callback * * * ******************************************************************************/ @@ -913,8 +871,6 @@ static void ipc_client_write_event_cb(evutil_socket_t fd, short what, void *arg) /****************************************************************************** * * - * Function: ipc_async_socket_write_event_cb * - * * * Purpose: asynchronous socket write event libevent callback * * * ******************************************************************************/ @@ -940,8 +896,6 @@ static void ipc_async_socket_write_event_cb(evutil_socket_t fd, short what, void /****************************************************************************** * * - * Function: ipc_async_socket_read_event_cb * - * * * Purpose: asynchronous socket read event libevent callback * * * ******************************************************************************/ @@ -961,8 +915,6 @@ static void ipc_async_socket_read_event_cb(evutil_socket_t fd, short what, void /****************************************************************************** * * - * Function: ipc_async_socket_timer_cb * - * * * Purpose: timer callback * * * ******************************************************************************/ @@ -978,8 +930,6 @@ static void ipc_async_socket_timer_cb(evutil_socket_t fd, short what, void *arg) /****************************************************************************** * * - * Function: ipc_service_accept * - * * * Purpose: accepts a new client connection * * * * Parameters: service - [IN] the IPC service * @@ -1009,8 +959,6 @@ static void ipc_service_accept(zbx_ipc_service_t *service) /****************************************************************************** * * - * Function: ipc_message_create * - * * * Purpose: creates IPC message * * * * Parameters: code - [IN] the message code * @@ -1042,8 +990,6 @@ static zbx_ipc_message_t *ipc_message_create(zbx_uint32_t code, const unsigned c /****************************************************************************** * * - * Function: ipc_service_event_log * - * * * Purpose: libevent logging callback * * * ******************************************************************************/ @@ -1075,8 +1021,6 @@ static void ipc_service_event_log_cb(int severity, const char *msg) /****************************************************************************** * * - * Function: ipc_service_init_libevent * - * * * Purpose: initialize libevent library * * * ******************************************************************************/ @@ -1087,8 +1031,6 @@ static void ipc_service_init_libevent(void) /****************************************************************************** * * - * Function: ipc_service_free_libevent * - * * * Purpose: uninitialize libevent library * * * ******************************************************************************/ @@ -1098,8 +1040,6 @@ static void ipc_service_free_libevent(void) /****************************************************************************** * * - * Function: ipc_service_client_connected_cb * - * * * Purpose: libevent listener callback * * * ******************************************************************************/ @@ -1115,8 +1055,6 @@ static void ipc_service_client_connected_cb(evutil_socket_t fd, short what, void /****************************************************************************** * * - * Function: ipc_service_timer_cb * - * * * Purpose: timer callback * * * ******************************************************************************/ @@ -1129,8 +1067,6 @@ static void ipc_service_timer_cb(evutil_socket_t fd, short what, void *arg) /****************************************************************************** * * - * Function: ipc_check_running_service * - * * * Purpose: checks if an IPC service is already running * * * * Parameters: service_name - [IN] * @@ -1156,8 +1092,6 @@ static int ipc_check_running_service(const char *service_name) /****************************************************************************** * * - * Function: zbx_ipc_socket_open * - * * * Purpose: opens socket to an IPC service listening on the specified path * * * * Parameters: csocket - [OUT] the IPC socket to the service * @@ -1218,8 +1152,6 @@ out: /****************************************************************************** * * - * Function: zbx_ipc_socket_close * - * * * Purpose: closes socket to an IPC service * * * * Parameters: csocket - [IN/OUT] the IPC socket to close * @@ -1240,8 +1172,6 @@ void zbx_ipc_socket_close(zbx_ipc_socket_t *csocket) /****************************************************************************** * * - * Function: zbx_ipc_socket_write * - * * * Purpose: writes a message to IPC service * * * * Parameters: csocket - [IN] an opened IPC socket to the service * @@ -1275,8 +1205,6 @@ int zbx_ipc_socket_write(zbx_ipc_socket_t *csocket, zbx_uint32_t code, const uns /****************************************************************************** * * - * Function: zbx_ipc_socket_read * - * * * Purpose: reads a message from IPC service * * * * Parameters: csocket - [IN] an opened IPC socket to the service * @@ -1330,8 +1258,6 @@ out: /****************************************************************************** * * - * Function: zbx_ipc_socket_connected * - * * * Purpose: check if socket is opened * * * * Parameters: csocket - [OUT] the IPC socket to the service * @@ -1347,8 +1273,6 @@ int zbx_ipc_socket_connected(const zbx_ipc_socket_t *csocket) /****************************************************************************** * * - * Function: zbx_ipc_message_free * - * * * Purpose: frees the resources allocated to store IPC message data * * * * Parameters: message - [IN] the message to free * @@ -1365,8 +1289,6 @@ void zbx_ipc_message_free(zbx_ipc_message_t *message) /****************************************************************************** * * - * Function: zbx_ipc_message_clean * - * * * Purpose: frees the resources allocated to store IPC message data * * * * Parameters: message - [IN] the message to clean * @@ -1379,8 +1301,6 @@ void zbx_ipc_message_clean(zbx_ipc_message_t *message) /****************************************************************************** * * - * Function: zbx_ipc_message_init * - * * * Purpose: initializes IPC message * * * * Parameters: message - [IN] the message to initialize * @@ -1393,8 +1313,6 @@ void zbx_ipc_message_init(zbx_ipc_message_t *message) /****************************************************************************** * * - * Function: zbx_ipc_message_format * - * * * Purpose: formats message to readable format for debug messages * * * * Parameters: message - [IN] the message * @@ -1430,8 +1348,6 @@ void zbx_ipc_message_format(const zbx_ipc_message_t *message, char **data) /****************************************************************************** * * - * Function: zbx_ipc_message_copy * - * * * Purpose: copies ipc message * * * * Parameters: dst - [IN] the destination message * @@ -1452,8 +1368,6 @@ void zbx_ipc_message_copy(zbx_ipc_message_t *dst, const zbx_ipc_message_t *src) /****************************************************************************** * * - * Function: zbx_ipc_service_init_env * - * * * Purpose: initializes IPC service environment * * * * Parameters: path - [IN] the service root path * @@ -1519,8 +1433,6 @@ out: /****************************************************************************** * * - * Function: zbx_ipc_service_free_env * - * * * Purpose: frees IPC service environment * * * ******************************************************************************/ @@ -1531,8 +1443,6 @@ void zbx_ipc_service_free_env(void) /****************************************************************************** * * - * Function: zbx_ipc_service_start * - * * * Purpose: starts IPC service on the specified path * * * * Parameters: service - [IN/OUT] the IPC service * @@ -1618,8 +1528,6 @@ out: /****************************************************************************** * * - * Function: zbx_ipc_service_close * - * * * Purpose: closes IPC service and frees the resources allocated by it * * * * Parameters: service - [IN/OUT] the IPC service * @@ -1650,8 +1558,6 @@ void zbx_ipc_service_close(zbx_ipc_service_t *service) /****************************************************************************** * * - * Function: zbx_ipc_service_recv * - * * * Purpose: receives ipc message from a connected client * * * * Parameters: service - [IN] the IPC service * @@ -1732,8 +1638,6 @@ int zbx_ipc_service_recv(zbx_ipc_service_t *service, const zbx_timespec_t *timeo /****************************************************************************** * * - * Function: zbx_ipc_client_send * - * * * Purpose: Sends IPC message to client * * * * Parameters: client - [IN] the IPC client * @@ -1784,8 +1688,6 @@ out: /****************************************************************************** * * - * Function: zbx_ipc_client_close * - * * * Purpose: closes client socket and frees resources allocated for client * * * * Parameters: client - [IN] the IPC client * @@ -1838,8 +1740,6 @@ void *zbx_ipc_client_get_userdata(zbx_ipc_client_t *client) /****************************************************************************** * * - * Function: zbx_ipc_async_socket_open * - * * * Purpose: opens asynchronous socket to IPC service client * * * * Parameters: client - [OUT] the IPC service client * @@ -1897,8 +1797,6 @@ out: /****************************************************************************** * * - * Function: zbx_ipc_async_socket_close * - * * * Purpose: closes asynchronous IPC socket and frees allocated resources * * * * Parameters: asocket - [IN] the asynchronous IPC socket * @@ -1919,8 +1817,6 @@ void zbx_ipc_async_socket_close(zbx_ipc_async_socket_t *asocket) /****************************************************************************** * * - * Function: zbx_ipc_async_socket_send * - * * * Purpose: Sends message through asynchronous IPC socket * * * * Parameters: asocket - [IN] the asynchronous IPC socket * @@ -1950,8 +1846,6 @@ int zbx_ipc_async_socket_send(zbx_ipc_async_socket_t *asocket, zbx_uint32_t code /****************************************************************************** * * - * Function: zbx_ipc_async_socket_recv * - * * * Purpose: receives message through asynchronous IPC socket * * * * Parameters: asocket - [IN] the asynchronous IPC socket * @@ -2024,8 +1918,6 @@ int zbx_ipc_async_socket_recv(zbx_ipc_async_socket_t *asocket, int timeout, zbx_ /****************************************************************************** * * - * Function: zbx_ipc_async_socket_flush * - * * * Purpose: flushes unsent through asynchronous IPC socket * * * * Parameters: asocket - [IN] the asynchronous IPC service socket * @@ -2093,8 +1985,6 @@ out: /****************************************************************************** * * - * Function: zbx_ipc_async_socket_check_unsent * - * * * Purpose: check if there are data to be sent * * * * Parameters: asocket - [IN] the asynchronous IPC service socket * @@ -2110,8 +2000,6 @@ int zbx_ipc_async_socket_check_unsent(zbx_ipc_async_socket_t *asocket) /****************************************************************************** * * - * Function: zbx_ipc_async_socket_connected * - * * * Purpose: check if socket is connected * * * * Parameters: asocket - [IN] the asynchronous IPC service socket * @@ -2130,8 +2018,6 @@ int zbx_ipc_async_socket_connected(zbx_ipc_async_socket_t *asocket) /****************************************************************************** * * - * Function: zbx_ipc_async_exchange * - * * * Purpose: connect, send message and receive response in a given timeout * * * * Parameters: service_name - [IN] the IPC service name * diff --git a/src/libs/zbxjson/json.c b/src/libs/zbxjson/json.c index 2e1ca7a2011..0f08f57f56e 100644 --- a/src/libs/zbxjson/json.c +++ b/src/libs/zbxjson/json.c @@ -25,8 +25,6 @@ /****************************************************************************** * * - * Function: zbx_json_strerror * - * * * Purpose: return string describing json error * * * * Return value: pointer to the null terminated string * @@ -68,8 +66,6 @@ void zbx_set_json_strerror(const char *fmt, ...) /****************************************************************************** * * - * Function: __zbx_json_realloc * - * * * Author: Alexander Vladishev * * * ******************************************************************************/ @@ -213,8 +209,6 @@ static size_t __zbx_json_stringsize(const char *string, zbx_json_type_t type) /****************************************************************************** * * - * Function: zbx_num2hex * - * * * Purpose: convert parameter c (0-15) to hexadecimal value ('0'-'f') * * * * Parameters: * @@ -492,8 +486,6 @@ int zbx_json_close(struct zbx_json *j) /****************************************************************************** * * - * Function: __zbx_json_type * - * * * Purpose: return type of pointed value * * * * Return value: type of pointed value * @@ -525,8 +517,6 @@ static zbx_json_type_t __zbx_json_type(const char *p) /****************************************************************************** * * - * Function: __zbx_json_rbracket * - * * * Purpose: return position of right bracket * * * * Return value: position of right bracket * @@ -585,8 +575,6 @@ static const char *__zbx_json_rbracket(const char *p) /****************************************************************************** * * - * Function: zbx_json_open * - * * * Purpose: open json buffer and check for brackets * * * * Return value: SUCCESS - processed successfully * @@ -629,8 +617,6 @@ int zbx_json_open(const char *buffer, struct zbx_json_parse *jp) /****************************************************************************** * * - * Function: zbx_json_next * - * * * Purpose: locate next pair or element * * * * Return value: NULL - no more values * @@ -698,8 +684,6 @@ const char *zbx_json_next(const struct zbx_json_parse *jp, const char *p) /****************************************************************************** * * - * Function: zbx_is_valid_json_hex * - * * * Purpose: check if a 4 character sequence is a valid hex number 0000 - FFFF * * * * Parameters: * @@ -723,8 +707,6 @@ static int zbx_is_valid_json_hex(const char *p) /****************************************************************************** * * - * Function: zbx_hex2num * - * * * Purpose: convert hexit c ('0'-'9''a'-'f''A'-'F') to number (0-15) * * * * Parameters: * @@ -752,8 +734,6 @@ static unsigned int zbx_hex2num(char c) /****************************************************************************** * * - * Function: zbx_json_decode_character * - * * * Purpose: decodes JSON escape character into UTF-8 * * * * Parameters: p - [IN/OUT] a pointer to the first character in string * @@ -871,8 +851,6 @@ static unsigned int zbx_json_decode_character(const char **p, unsigned char *byt /****************************************************************************** * * - * Function: zbx_json_copy_string * - * * * Purpose: copies json name/string value by omitting leading/trailing " and * * converting escape sequences * * * @@ -928,8 +906,6 @@ static const char *zbx_json_copy_string(const char *p, char *out, size_t size) /****************************************************************************** * * - * Function: zbx_json_copy_value * - * * * Purpose: copies unquoted (numeric, boolean) json value * * * * Parameters: p - [IN] a pointer to the next character in string * @@ -1047,8 +1023,6 @@ const char *zbx_json_pair_next(const struct zbx_json_parse *jp, const char *p, c /****************************************************************************** * * - * Function: zbx_json_pair_by_name * - * * * Purpose: find pair by name and return pointer to value * * * * Return value: pointer to value * @@ -1074,8 +1048,6 @@ const char *zbx_json_pair_by_name(const struct zbx_json_parse *jp, const char *n /****************************************************************************** * * - * Function: zbx_json_next_value * - * * * Author: Alexander Vladishev * * * ******************************************************************************/ @@ -1090,8 +1062,6 @@ const char *zbx_json_next_value(const struct zbx_json_parse *jp, const char *p, /****************************************************************************** * * - * Function: zbx_json_next_value_dyn * - * * ******************************************************************************/ const char *zbx_json_next_value_dyn(const struct zbx_json_parse *jp, const char *p, char **string, size_t *string_alloc, zbx_json_type_t *type) @@ -1104,8 +1074,6 @@ const char *zbx_json_next_value_dyn(const struct zbx_json_parse *jp, const char /****************************************************************************** * * - * Function: zbx_json_value_by_name * - * * * Purpose: return value by pair name * * * * Return value: SUCCEED - if value successfully parsed, FAIL - otherwise * @@ -1129,8 +1097,6 @@ int zbx_json_value_by_name(const struct zbx_json_parse *jp, const char *name, ch /****************************************************************************** * * - * Function: zbx_json_value_by_name_dyn * - * * * Purpose: return value by pair name * * * * Return value: SUCCEED - if value successfully parsed, FAIL - otherwise * @@ -1154,8 +1120,6 @@ int zbx_json_value_by_name_dyn(const struct zbx_json_parse *jp, const char *name /****************************************************************************** * * - * Function: zbx_json_brackets_open * - * * * Return value: SUCCESS - processed successfully * * FAIL - an error occurred * * * @@ -1179,8 +1143,6 @@ int zbx_json_brackets_open(const char *p, struct zbx_json_parse *jp) /****************************************************************************** * * - * Function: zbx_json_brackets_by_name * - * * * Return value: SUCCESS - processed successfully * * FAIL - an error occurred * * * @@ -1202,8 +1164,6 @@ int zbx_json_brackets_by_name(const struct zbx_json_parse *jp, const char *name, /****************************************************************************** * * - * Function: zbx_json_object_is_empty * - * * * Return value: SUCCESS - if object is empty * * FAIL - if object contains data * * * @@ -1217,8 +1177,6 @@ int zbx_json_object_is_empty(const struct zbx_json_parse *jp) /****************************************************************************** * * - * Function: zbx_json_count * - * * * Return value: number of elements in zbx_json_parse object * * * * Author: Alexander Vladishev * @@ -1237,8 +1195,6 @@ int zbx_json_count(const struct zbx_json_parse *jp) /****************************************************************************** * * - * Function: zbx_json_open_path * - * * * Purpose: opens an object by definite json path * * * * Return value: SUCCESS - processed successfully * diff --git a/src/libs/zbxjson/json_parser.c b/src/libs/zbxjson/json_parser.c index d3620d7403a..dad27bdbadb 100644 --- a/src/libs/zbxjson/json_parser.c +++ b/src/libs/zbxjson/json_parser.c @@ -29,8 +29,6 @@ static zbx_int64_t json_parse_object(const char *start, char **error); /****************************************************************************** * * - * Function: json_error * - * * * Purpose: Prepares JSON parsing error message * * * * Parameters: message - [IN] the error message * @@ -58,8 +56,6 @@ static zbx_int64_t json_error(const char *message, const char *json_buffer, char /****************************************************************************** * * - * Function: json_parse_string * - * * * Purpose: Parses JSON string value or object name * * * * Parameters: start - [IN] the JSON data without leading whitespace * @@ -135,8 +131,6 @@ static zbx_int64_t json_parse_string(const char *start, char **error) /****************************************************************************** * * - * Function: json_parse_array * - * * * Purpose: Parses JSON array value * * * * Parameters: start - [IN] the JSON data without leading whitespace * @@ -184,8 +178,6 @@ static zbx_int64_t json_parse_array(const char *start, char **error) /****************************************************************************** * * - * Function: json_parse_number * - * * * Purpose: Parses JSON number value * * * * Parameters: start - [IN] the JSON data without leading whitespace * @@ -259,8 +251,6 @@ static zbx_int64_t json_parse_number(const char *start, char **error) /****************************************************************************** * * - * Function: json_parse_literal * - * * * Purpose: Parses the specified literal value * * * * Parameters: start - [IN] the JSON data without leading whitespace * @@ -294,8 +284,6 @@ static zbx_int64_t json_parse_literal(const char *start, const char *text, char /****************************************************************************** * * - * Function: json_parse_value * - * * * Purpose: Parses JSON object value * * * * Parameters: start - [IN] the JSON data * @@ -366,8 +354,6 @@ zbx_int64_t json_parse_value(const char *start, char **error) /****************************************************************************** * * - * Function: json_parse_object * - * * * Purpose: Parses JSON object * * * * Parameters: start - [IN] the JSON data * @@ -435,8 +421,6 @@ static zbx_int64_t json_parse_object(const char *start, char **error) /****************************************************************************** * * - * Function: zbx_json_validate * - * * * Purpose: Validates JSON object * * * * Parameters: start - [IN] the string to validate * diff --git a/src/libs/zbxjson/jsonpath.c b/src/libs/zbxjson/jsonpath.c index 5341837073d..f29277e7d4e 100644 --- a/src/libs/zbxjson/jsonpath.c +++ b/src/libs/zbxjson/jsonpath.c @@ -115,8 +115,6 @@ static void zbx_vector_json_clear_ext(zbx_vector_json_t *elements) /****************************************************************************** * * - * Function: zbx_jsonpath_error * - * * * Purpose: set json error message and return FAIL * * * * Comments: This function is used to return from json path parsing functions * @@ -135,8 +133,6 @@ static int zbx_jsonpath_error(const char *path) /****************************************************************************** * * - * Function: jsonpath_strndup * - * * ******************************************************************************/ static char *jsonpath_strndup(const char *source, size_t len) { @@ -151,8 +147,6 @@ static char *jsonpath_strndup(const char *source, size_t len) /****************************************************************************** * * - * Function: jsonpath_unquote * - * * * Purpose: unquote single or double quoted string by stripping * * leading/trailing quotes and unescaping backslash sequences * * * @@ -178,8 +172,6 @@ static void jsonpath_unquote(char *value, const char *start, size_t len) /****************************************************************************** * * - * Function: jsonpath_unquote_dyn * - * * * Purpose: unquote string stripping leading/trailing quotes and unescaping * * backspace sequences * * * @@ -202,8 +194,6 @@ static char *jsonpath_unquote_dyn(const char *start, size_t len) /****************************************************************************** * * - * Function: jsonpath_list_create_item * - * * * Purpose: create jsonpath list item of the specified size * * * ******************************************************************************/ @@ -214,8 +204,6 @@ static zbx_jsonpath_list_node_t *jsonpath_list_create_node(size_t size) /****************************************************************************** * * - * Function: jsonpath_list_free * - * * * Purpose: free jsonpath list * * * ******************************************************************************/ @@ -232,8 +220,6 @@ static void jsonpath_list_free(zbx_jsonpath_list_node_t *list) /****************************************************************************** * * - * Function: jsonpath_create_token * - * * * Purpose: create jsonpath expression token * * * * Parameters: type - [IN] the token type * @@ -269,8 +255,6 @@ static zbx_jsonpath_token_t *jsonpath_create_token(int type, const char *express /****************************************************************************** * * - * Function: jsonpath_token_free * - * * ******************************************************************************/ static void jsonpath_token_free(zbx_jsonpath_token_t *token) { @@ -280,8 +264,6 @@ static void jsonpath_token_free(zbx_jsonpath_token_t *token) /****************************************************************************** * * - * Function: jsonpath_reserve * - * * * Purpose: reserve space in jsonpath segments array for more segments * * * * Parameters: jsonpath - [IN] the jsonpath data * @@ -312,8 +294,6 @@ static void jsonpath_reserve(zbx_jsonpath_t *jsonpath, int num) /****************************************************************************** * * - * Function: jsonpath_segment_clear * - * * ******************************************************************************/ static void jsonpath_segment_clear(zbx_jsonpath_segment_t *segment) { @@ -334,8 +314,6 @@ static void jsonpath_segment_clear(zbx_jsonpath_segment_t *segment) /****************************************************************************** * * - * Function: jsonpath_next * - * * * Purpose: find next component of json path * * * * Parameters: pnext - [IN/OUT] the reference to the next path component * @@ -415,8 +393,6 @@ static int jsonpath_next(const char **pnext) /****************************************************************************** * * - * Function: jsonpath_parse_substring * - * * * Purpose: parse single or double quoted substring * * * * Parameters: start - [IN] the substring start * @@ -452,8 +428,6 @@ static int jsonpath_parse_substring(const char *start, int *len) /****************************************************************************** * * - * Function: jsonpath_parse_path * - * * * Purpose: parse jsonpath reference * * * * Parameters: start - [IN] the jsonpath start * @@ -482,8 +456,6 @@ static int jsonpath_parse_path(const char *start, int *len) /****************************************************************************** * * - * Function: jsonpath_parse_number * - * * * Purpose: parse number value * * * * Parameters: start - [IN] the number start * @@ -520,8 +492,6 @@ static int jsonpath_parse_number(const char *start, int *len) /****************************************************************************** * * - * Function: jsonpath_expression_next_token * - * * * Purpose: get next token in jsonpath expression * * * * Parameters: exprsesion - [IN] the jsonpath expression * @@ -676,8 +646,6 @@ out: /****************************************************************************** * * - * Function: jsonpath_parse_expression * - * * * Purpose: parse jsonpath filter expression in format * * * * Parameters: expression - [IN] the expression, including opening and * @@ -876,8 +844,6 @@ cleanup: /****************************************************************************** * * - * Function: jsonpath_parse_names * - * * * Purpose: parse a list of single or double quoted names, including trivial * * case when a single name is used * * * @@ -990,8 +956,6 @@ out: /****************************************************************************** * * - * Function: jsonpath_parse_indexes * - * * * Purpose: parse a list of array indexes or range start:end values * * case when a single name is used * * * @@ -1139,8 +1103,6 @@ out: /****************************************************************************** * * - * Function: jsonpath_parse_bracket_segment * - * * * Purpose: parse jsonpath bracket notation segment * * * * Parameters: start - [IN] the segment start * @@ -1197,8 +1159,6 @@ static int jsonpath_parse_bracket_segment(const char *start, zbx_jsonpath_t *jso /****************************************************************************** * * - * Function: jsonpath_parse_dot_segment * - * * * Purpose: parse jsonpath dot notation segment * * * * Parameters: start - [IN] the segment start * @@ -1274,8 +1234,6 @@ static int jsonpath_parse_dot_segment(const char *start, zbx_jsonpath_t *jsonpat /****************************************************************************** * * - * Function: jsonpath_parse_name_reference * - * * * Purpose: parse jsonpath name reference ~ * * * * Parameters: start - [IN] the segment start * @@ -1300,8 +1258,6 @@ static int jsonpath_parse_name_reference(const char *start, zbx_jsonpath_t *json /****************************************************************************** * * - * Function: jsonpath_pointer_to_jp * - * * * Purpose: convert a pointer to an object/array/value in json data to * * json parse structure * * * @@ -1328,8 +1284,6 @@ static int jsonpath_pointer_to_jp(const char *pnext, struct zbx_json_parse *jp) /****************************************************************************** * * - * Function: jsonpath_query_contents * - * * * Purpose: perform the rest of jsonpath query on json data * * * * Parameters: jp_root - [IN] the document root * @@ -1365,8 +1319,6 @@ static int jsonpath_query_contents(const struct zbx_json_parse *jp_root, const c /****************************************************************************** * * - * Function: jsonpath_query_next_segment * - * * * Purpose: query next segment * * * * Parameters: jp_root - [IN] the document root * @@ -1398,8 +1350,6 @@ static int jsonpath_query_next_segment(const struct zbx_json_parse *jp_root, con /****************************************************************************** * * - * Function: jsonpath_match_name * - * * * Purpose: match object value name against jsonpath segment name list * * * * Parameters: jp_root - [IN] the document root * @@ -1439,8 +1389,6 @@ static int jsonpath_match_name(const struct zbx_json_parse *jp_root, const char /****************************************************************************** * * - * Function: jsonpath_extract_value * - * * * Purpose: extract value from json data by the specified path * * * * Parameters: jp - [IN] the parent object * @@ -1487,8 +1435,6 @@ out: /****************************************************************************** * * - * Function: jsonpath_expression_to_str * - * * * Purpose: convert jsonpath expression to text format * * * * Parameters: expression - [IN] the jsonpath exprssion * @@ -1578,8 +1524,6 @@ static char *jsonpath_expression_to_str(zbx_jsonpath_expression_t *expression) /****************************************************************************** * * - * Function: jsonpath_set_expression_error * - * * * Purpose: set jsonpath expression error message * * * * Parameters: expression - [IN] the jsonpath exprssion * @@ -1604,8 +1548,6 @@ static void jsonpath_set_expression_error(zbx_jsonpath_expression_t *expression) /****************************************************************************** * * - * Function: jsonpath_variant_to_boolean * - * * * Purpose: convert variant value to 'boolean' (1, 0) * * * * Parameters: value - [IN/OUT] the value * @@ -1644,8 +1586,6 @@ static void jsonpath_variant_to_boolean(zbx_variant_t *value) /****************************************************************************** * * - * Function: jsonpath_regexp_match * - * * * Purpose: match text against regular expression * * * * Parameters: text - [IN] the text to match * @@ -1675,8 +1615,6 @@ static int jsonpath_regexp_match(const char *text, const char *pattern, double * /****************************************************************************** * * - * Function: jsonpath_match_expression * - * * * Purpose: match json array element/object value against jsonpath expression * * * * Parameters: jp_root - [IN] the document root * @@ -1908,8 +1846,6 @@ out: /****************************************************************************** * * - * Function: jsonpath_query_object * - * * * Purpose: query object fields for jsonpath segment match * * * * Parameters: jp_root - [IN] the document root * @@ -1958,8 +1894,6 @@ static int jsonpath_query_object(const struct zbx_json_parse *jp_root, const str /****************************************************************************** * * - * Function: jsonpath_match_index * - * * * Purpose: match array element against segment index list * * * * Parameters: jp_root - [IN] the document root * @@ -2004,8 +1938,6 @@ static int jsonpath_match_index(const struct zbx_json_parse *jp_root, const char /****************************************************************************** * * - * Function: jsonpath_match_range * - * * * Purpose: match array element against segment index range * * * * Parameters: jp_root - [IN] the document root * @@ -2046,8 +1978,6 @@ static int jsonpath_match_range(const struct zbx_json_parse *jp_root, const char /****************************************************************************** * * - * Function: jsonpath_query_array * - * * * Purpose: query array elements for jsonpath segment match * * * * Parameters: jp_root - [IN] the document root * @@ -2108,8 +2038,6 @@ static int jsonpath_query_array(const struct zbx_json_parse *jp_root, const stru /****************************************************************************** * * - * Function: jsonpath_extract_element * - * * * Purpose: extract JSON element value from data * * * * Parameters: ptr - [IN] pointer to the element to extract * @@ -2141,8 +2069,6 @@ static int jsonpath_extract_element(const char *ptr, char **element) /****************************************************************************** * * - * Function: jsonpath_extract_numeric_value * - * * * Purpose: extract numeric value from json data * * * * Parameters: ptr - [IN] pointer to the value to extract * @@ -2168,8 +2094,6 @@ static int jsonpath_extract_numeric_value(const char *ptr, double *value) /****************************************************************************** * * - * Function: jsonpath_apply_function * - * * * Purpose: apply jsonpath function to the extracted object list * * * * Parameters: objects - [IN] the matched json elements (name, value) * @@ -2324,8 +2248,6 @@ out: /****************************************************************************** * * - * Function: jsonpath_apply_functions * - * * * Purpose: apply jsonpath function to the extracted object list * * * * Parameters: jp_root - [IN] the document root * @@ -2386,8 +2308,6 @@ static int jsonpath_apply_functions(const struct zbx_json_parse *jp_root, const /****************************************************************************** * * - * Function: jsonpath_format_query_result * - * * * Purpose: format query result, depending on jsonpath type * * * * Parameters: objects - [IN] the matched json elements (name, value) * @@ -2442,8 +2362,6 @@ static int jsonpath_format_query_result(const zbx_vector_json_t *objects, zbx_js /****************************************************************************** * * - * Function: zbx_jsonpath_clear * - * * ******************************************************************************/ void zbx_jsonpath_clear(zbx_jsonpath_t *jsonpath) { @@ -2457,8 +2375,6 @@ void zbx_jsonpath_clear(zbx_jsonpath_t *jsonpath) /****************************************************************************** * * - * Function: zbx_jsonpath_compile * - * * * Purpose: compile jsonpath to be used in queries * * * * Parameters: path - [IN] the path to parse * @@ -2560,8 +2476,6 @@ int zbx_jsonpath_compile(const char *path, zbx_jsonpath_t *jsonpath) /****************************************************************************** * * - * Function: zbx_jsonpath_query * - * * * Purpose: perform jsonpath query on the specified json data * * * * Parameters: jp - [IN] the json data * diff --git a/src/libs/zbxlog/log.c b/src/libs/zbxlog/log.c index 74508a22d2a..cf70a0e505f 100644 --- a/src/libs/zbxlog/log.c +++ b/src/libs/zbxlog/log.c @@ -681,8 +681,6 @@ char *strerror_from_module(unsigned long error, const wchar_t *module) /****************************************************************************** * * - * Function: zbx_strlog_alloc * - * * * Purpose: log the message optionally appending to a string buffer * * * * Parameters: lebel - [IN] the log level * diff --git a/src/libs/zbxmedia/email.c b/src/libs/zbxmedia/email.c index 17faf25e2d6..aa547600b99 100644 --- a/src/libs/zbxmedia/email.c +++ b/src/libs/zbxmedia/email.c @@ -39,8 +39,6 @@ /****************************************************************************** * * - * Function: str_base64_encode_rfc2047 * - * * * Purpose: Encode a string into a base64 string as required by rfc2047. * * Used for encoding e-mail headers. * * * @@ -122,8 +120,6 @@ static int smtp_readln(zbx_socket_t *s, const char **buf) /******************************************************************************** * * - * Function: smtp_parse_mailbox * - * * * Purpose: 1. Extract a display name and an angle address from mailbox string * * for using in "MAIL FROM:", "RCPT TO:", "From:" and "To:" fields. * * 2. If the display name contains multibyte UTF-8 characters encode * @@ -795,8 +791,6 @@ out: /****************************************************************************** * * - * Function: zbx_mailaddr_free * - * * * Purpose: frees the mail address object * * * * Parameters: mailaddr - [IN] the mail address * diff --git a/src/libs/zbxmodules/modules.c b/src/libs/zbxmodules/modules.c index b1b92bc4667..f182df37346 100644 --- a/src/libs/zbxmodules/modules.c +++ b/src/libs/zbxmodules/modules.c @@ -43,8 +43,6 @@ zbx_history_log_cb_t *history_log_cbs = NULL; /****************************************************************************** * * - * Function: zbx_register_module_items * - * * * Purpose: add items supported by module * * * * Parameters: metrics - list of items supported by module * @@ -75,8 +73,6 @@ static int zbx_register_module_items(ZBX_METRIC *metrics, char *error, size_t ma /****************************************************************************** * * - * Function: zbx_register_module * - * * * Purpose: add module to the list of successfully loaded modules * * * ******************************************************************************/ @@ -94,8 +90,6 @@ static zbx_module_t *zbx_register_module(void *lib, char *name) /****************************************************************************** * * - * Function: zbx_register_history_write_cbs * - * * * Purpose: registers callback functions for history export * * * * Parameters: module - module pointer for later reference * @@ -212,8 +206,6 @@ static int zbx_module_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: zbx_load_module * - * * * Purpose: load loadable module * * * * Parameters: path - directory where modules are located * @@ -322,8 +314,6 @@ fail: /****************************************************************************** * * - * Function: zbx_load_modules * - * * * Purpose: load loadable modules (dynamic libraries) * * * * Parameters: path - directory where modules are located * @@ -378,8 +368,6 @@ out: /****************************************************************************** * * - * Function: zbx_unload_module * - * * * Purpose: unload module and free allocated resources * * * ******************************************************************************/ @@ -403,8 +391,6 @@ static void zbx_unload_module(void *data) /****************************************************************************** * * - * Function: zbx_unload_modules * - * * * Purpose: Unload already loaded loadable modules (dynamic libraries). * * It is called on process shutdown. * * * diff --git a/src/libs/zbxnix/control.c b/src/libs/zbxnix/control.c index 248103c1216..df54a1ad569 100644 --- a/src/libs/zbxnix/control.c +++ b/src/libs/zbxnix/control.c @@ -109,8 +109,6 @@ static int parse_log_level_options(const char *opt, size_t len, unsigned int *sc /****************************************************************************** * * - * Function: parse_rtc_options * - * * * Purpose: parse runtime control options and create a runtime control * * message * * * diff --git a/src/libs/zbxnix/coredump.c b/src/libs/zbxnix/coredump.c index 50a0349c4f3..86b46b6246d 100644 --- a/src/libs/zbxnix/coredump.c +++ b/src/libs/zbxnix/coredump.c @@ -24,8 +24,6 @@ #if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL) /****************************************************************************** * * - * Function: zbx_coredump_disable * - * * * Purpose: disable core dump * * * * Return value: SUCCEED - core dump disabled * diff --git a/src/libs/zbxnix/daemon.c b/src/libs/zbxnix/daemon.c index 44f781aa646..c0441745d77 100644 --- a/src/libs/zbxnix/daemon.c +++ b/src/libs/zbxnix/daemon.c @@ -47,8 +47,6 @@ static void (*zbx_sigusr_handler)(int flags); #ifdef HAVE_SIGQUEUE /****************************************************************************** * * - * Function: common_sigusr_handler * - * * * Purpose: common SIGUSR1 handler for Zabbix processes * * * ******************************************************************************/ @@ -198,8 +196,6 @@ void zbx_set_sigusr_handler(void (*handler)(int flags)) /****************************************************************************** * * - * Function: user1_signal_handler * - * * * Purpose: handle user signal SIGUSR1 * * * ******************************************************************************/ @@ -276,8 +272,6 @@ static void user1_signal_handler(int sig, siginfo_t *siginfo, void *context) /****************************************************************************** * * - * Function: pipe_signal_handler * - * * * Purpose: handle pipe signal SIGPIPE * * * ******************************************************************************/ @@ -292,8 +286,6 @@ static void pipe_signal_handler(int sig, siginfo_t *siginfo, void *context) /****************************************************************************** * * - * Function: set_daemon_signal_handlers * - * * * Purpose: set the signal handlers used by daemons * * * ******************************************************************************/ @@ -315,8 +307,6 @@ static void set_daemon_signal_handlers(void) /****************************************************************************** * * - * Function: daemon_start * - * * * Purpose: init process as daemon * * * * Parameters: allow_root - allow root permission for application * diff --git a/src/libs/zbxnix/dshm.c b/src/libs/zbxnix/dshm.c index 8768cddf9f3..8fb0f5e545f 100644 --- a/src/libs/zbxnix/dshm.c +++ b/src/libs/zbxnix/dshm.c @@ -25,8 +25,6 @@ extern char *CONFIG_FILE; /****************************************************************************** * * - * Function: zbx_dshm_create * - * * * Purpose: creates dynamic shared memory segment * * * * Parameters: shm - [OUT] the dynamic shared memory data * @@ -76,8 +74,6 @@ out: /****************************************************************************** * * - * Function: zbx_dshm_destroy * - * * * Purpose: destroys dynamic shared memory segment * * * * Parameters: shm - [IN] the dynamic shared memory data * @@ -116,8 +112,6 @@ out: /****************************************************************************** * * - * Function: zbx_dshm_lock * - * * ******************************************************************************/ void zbx_dshm_lock(zbx_dshm_t *shm) { @@ -126,8 +120,6 @@ void zbx_dshm_lock(zbx_dshm_t *shm) /****************************************************************************** * * - * Function: zbx_dshm_unlock * - * * ******************************************************************************/ void zbx_dshm_unlock(zbx_dshm_t *shm) { @@ -136,8 +128,6 @@ void zbx_dshm_unlock(zbx_dshm_t *shm) /****************************************************************************** * * - * Function: zbx_dshm_validate_ref * - * * * Purpose: validates local reference to dynamic shared memory segment * * * * Parameters: shm - [IN] the dynamic shared memory data * @@ -194,8 +184,6 @@ out: /****************************************************************************** * * - * Function: zbx_dshm_realloc * - * * * Purpose: reallocates dynamic shared memory segment * * * * Parameters: shm - [IN/OUT] the dynamic shared memory data * diff --git a/src/libs/zbxnix/ipc.c b/src/libs/zbxnix/ipc.c index 207e0d76e43..8912f356437 100644 --- a/src/libs/zbxnix/ipc.c +++ b/src/libs/zbxnix/ipc.c @@ -23,8 +23,6 @@ /****************************************************************************** * * - * Function: zbx_shm_create * - * * * Purpose: Create block of shared memory * * * * Parameters: size - size * @@ -51,8 +49,6 @@ int zbx_shm_create(size_t size) /****************************************************************************** * * - * Function: zbx_shm_destroy * - * * * Purpose: Destroy block of shared memory * * * * Parameters: shmid - Shared memory identifier * diff --git a/src/libs/zbxnix/sighandler.c b/src/libs/zbxnix/sighandler.c index b54deabaeff..c5828db4bc5 100644 --- a/src/libs/zbxnix/sighandler.c +++ b/src/libs/zbxnix/sighandler.c @@ -50,8 +50,6 @@ static void exit_with_failure(void) /****************************************************************************** * * - * Function: fatal_signal_handler * - * * * Purpose: handle fatal signals: SIGILL, SIGFPE, SIGSEGV, SIGBUS * * * ******************************************************************************/ @@ -65,8 +63,6 @@ static void fatal_signal_handler(int sig, siginfo_t *siginfo, void *context) /****************************************************************************** * * - * Function: metric_thread_signal_handler * - * * * Purpose: same as fatal_signal_handler() but customized for metric thread - * * does not log memory map * * * @@ -81,8 +77,6 @@ static void metric_thread_signal_handler(int sig, siginfo_t *siginfo, void *cont /****************************************************************************** * * - * Function: alarm_signal_handler * - * * * Purpose: handle alarm signal SIGALRM * * * ******************************************************************************/ @@ -95,8 +89,6 @@ static void alarm_signal_handler(int sig, siginfo_t *siginfo, void *context) /****************************************************************************** * * - * Function: terminate_signal_handler * - * * * Purpose: handle terminate signals: SIGHUP, SIGINT, SIGTERM, SIGUSR2 * * * ******************************************************************************/ @@ -144,8 +136,6 @@ static void terminate_signal_handler(int sig, siginfo_t *siginfo, void *context) /****************************************************************************** * * - * Function: child_signal_handler * - * * * Purpose: handle child signal SIGCHLD * * * ******************************************************************************/ @@ -170,8 +160,6 @@ static void child_signal_handler(int sig, siginfo_t *siginfo, void *context) /****************************************************************************** * * - * Function: zbx_set_common_signal_handlers * - * * * Purpose: set the commonly used signal handlers * * * ******************************************************************************/ @@ -203,8 +191,6 @@ void zbx_set_common_signal_handlers(void) /****************************************************************************** * * - * Function: zbx_set_exit_on_terminate * - * * * Purpose: make main process to exit on terminate signals * * * ******************************************************************************/ @@ -215,8 +201,6 @@ void zbx_set_exit_on_terminate(void) /****************************************************************************** * * - * Function: zbx_unset_exit_on_terminate * - * * * Purpose: make main process to set exit flag and continue to work on * * terminate signals * * * @@ -228,8 +212,6 @@ void zbx_unset_exit_on_terminate(void) /****************************************************************************** * * - * Function: zbx_set_child_signal_handler * - * * * Purpose: set the handlers for child process signals * * * ******************************************************************************/ @@ -253,8 +235,6 @@ void zbx_unset_child_signal_handler(void) /****************************************************************************** * * - * Function: zbx_set_metric_thread_signal_handler * - * * * Purpose: set the handlers for child process signals * * * ******************************************************************************/ @@ -276,8 +256,6 @@ void zbx_set_metric_thread_signal_handler(void) /****************************************************************************** * * - * Function: zbx_block_signals * - * * * Purpose: block signals to avoid interruption * * * ******************************************************************************/ @@ -298,8 +276,6 @@ void zbx_block_signals(sigset_t *orig_mask) /****************************************************************************** * * - * Function: zbx_unblock_signals * - * * * Purpose: unblock signals after blocking * * * ******************************************************************************/ diff --git a/src/libs/zbxprometheus/zbxprometheus.c b/src/libs/zbxprometheus/zbxprometheus.c index a52dab6ec76..d5b8bfd5cf8 100644 --- a/src/libs/zbxprometheus/zbxprometheus.c +++ b/src/libs/zbxprometheus/zbxprometheus.c @@ -131,8 +131,6 @@ zbx_prometheus_label_index_t; /****************************************************************************** * * - * Function: str_loc_dup * - * * * Purpose: allocates and copies substring at the specified location * * * * Parameters: src - [IN] the source string * @@ -156,8 +154,6 @@ static char *str_loc_dup(const char *src, const zbx_strloc_t *loc) /****************************************************************************** * * - * Function: str_loc_unquote_dyn * - * * * Purpose: unquotes substring at the specified location * * * * Parameters: src - [IN] the source string * @@ -202,8 +198,6 @@ static char *str_loc_unquote_dyn(const char *src, const zbx_strloc_t *loc) /****************************************************************************** * * - * Function: str_loc_unescape_hint_dyn * - * * * Purpose: unescapes HELP hint * * * * Parameters: src - [IN] the source string * @@ -250,8 +244,6 @@ static char *str_loc_unescape_hint_dyn(const char *src, const zbx_strloc_t *loc) /****************************************************************************** * * - * Function: str_loc_cmp * - * * * Purpose: compares substring at the specified location with the specified * * text * * * @@ -273,8 +265,6 @@ static int str_loc_cmp(const char *src, const zbx_strloc_t *loc, const char *tex /****************************************************************************** * * - * Function: str_loc_op * - * * * Purpose: parses condition operation at the specified location * * * * Parameters: src - [IN] the source string * @@ -305,8 +295,6 @@ static zbx_prometheus_condition_op_t str_loc_op(const char *data, const zbx_strl /****************************************************************************** * * - * Function: skip_spaces * - * * * Purpose: skips spaces * * * * Parameters: src - [IN] the source string * @@ -325,8 +313,6 @@ static size_t skip_spaces(const char *data, size_t pos) /****************************************************************************** * * - * Function: skip_row * - * * * Purpose: skips until beginning of the next row * * * * Parameters: src - [IN] the source string * @@ -347,8 +333,6 @@ static size_t skip_row(const char *data, size_t pos) /****************************************************************************** * * - * Function: parse_metric * - * * * Purpose: parses metric name * * * * Parameters: data - [IN] the source string * @@ -380,8 +364,6 @@ static int parse_metric(const char *data, size_t pos, zbx_strloc_t *loc) /****************************************************************************** * * - * Function: parse_label * - * * * Purpose: parses label name * * * * Parameters: data - [IN] the source string * @@ -413,8 +395,6 @@ static int parse_label(const char *data, size_t pos, zbx_strloc_t *loc) /****************************************************************************** * * - * Function: parse_label_op * - * * * Purpose: parses label operation * * * * Parameters: data - [IN] the source string * @@ -451,8 +431,6 @@ static int parse_label_op(const char *data, size_t pos, zbx_strloc_t *loc) /****************************************************************************** * * - * Function: parse_label_value * - * * * Purpose: parses label value * * * * Parameters: data - [IN] the source string * @@ -495,8 +473,6 @@ static int parse_label_value(const char *data, size_t pos, zbx_strloc_t *loc) /****************************************************************************** * * - * Function: parse_metric_op * - * * * Purpose: parses metric operation * * * * Parameters: data - [IN] the source string * @@ -525,8 +501,6 @@ static int parse_metric_op(const char *data, size_t pos, zbx_strloc_t *loc) /****************************************************************************** * * - * Function: str_copy_lowercase * - * * * Purpose: copies lowercase converted string to a buffer * * * * Parameters: dst - [OUT] the output buffer * @@ -557,8 +531,6 @@ static int str_copy_lowercase(char *dst, int size, const char *src, int len) /****************************************************************************** * * - * Function: parse_metric_value * - * * * Purpose: parses metric value * * * * Parameters: data - [IN] the source string * @@ -604,8 +576,6 @@ static int parse_metric_value(const char *data, size_t pos, zbx_strloc_t *loc) /****************************************************************************** * * - * Function: prometheus_condition_free * - * * ******************************************************************************/ static void prometheus_condition_free(zbx_prometheus_condition_t *condition) { @@ -616,8 +586,6 @@ static void prometheus_condition_free(zbx_prometheus_condition_t *condition) /****************************************************************************** * * - * Function: prometheus_condition_create * - * * * Purpose: allocates and initializes conditionect * * * * Parameters: key - [IN] the key to match * @@ -642,8 +610,6 @@ static zbx_prometheus_condition_t *prometheus_condition_create(char *key, char * /****************************************************************************** * * - * Function: prometheus_filter_clear * - * * * Purpose: clears resources allocated by prometheus filter * * * * Parameters: filter - [IN] the filter to clear * @@ -663,8 +629,6 @@ static void prometheus_filter_clear(zbx_prometheus_filter_t *filter) /****************************************************************************** * * - * Function: parse_condition * - * * * Purpose: parses condition data - key, pattern and operation * * * * Parameters: data - [IN] the filter data * @@ -698,8 +662,6 @@ static int parse_condition(const char *data, size_t pos, zbx_strloc_t *loc_key, /****************************************************************************** * * - * Function: prometheus_filter_parse_labels * - * * * Purpose: parses label conditions * * * * Parameters: filter - [IN/OUT] the filter * @@ -769,8 +731,6 @@ static int prometheus_filter_parse_labels(zbx_prometheus_filter_t *filter, const /****************************************************************************** * * - * Function: prometheus_filter_init * - * * * Purpose: initializes prometheus pattern filter from the specified data * * * * Parameters: filter - [IN/OUT] the filter * @@ -862,8 +822,6 @@ out: /****************************************************************************** * * - * Function: prometheus_label_free * - * * ******************************************************************************/ static void prometheus_label_free(zbx_prometheus_label_t *label) { @@ -874,8 +832,6 @@ static void prometheus_label_free(zbx_prometheus_label_t *label) /****************************************************************************** * * - * Function: prometheus_row_free * - * * ******************************************************************************/ static void prometheus_row_free(zbx_prometheus_row_t *row) { @@ -889,8 +845,6 @@ static void prometheus_row_free(zbx_prometheus_row_t *row) /****************************************************************************** * * - * Function: condition_match_key_value * - * * * Purpose: matches key,value against filter condition * * * * Parameters: condition - [IN] the condition * @@ -937,8 +891,6 @@ static int condition_match_key_value(const zbx_prometheus_condition_t *condition /****************************************************************************** * * - * Function: condition_match_metric_value * - * * * Purpose: matches metric value against filter condition * * * * Parameters: pattern - [IN] the condition * @@ -977,8 +929,6 @@ static int condition_match_metric_value(const char *pattern, const char *value) /****************************************************************************** * * - * Function: prometheus_metric_parse_labels * - * * * Purpose: parses metric labels * * * * Parameters: data - [IN] the metric data * @@ -1043,8 +993,6 @@ static int prometheus_metric_parse_labels(const char *data, size_t pos, zbx_vect /****************************************************************************** * * - * Function: prometheus_parse_row * - * * * Purpose: parses metric row * * * * Parameters: filter - [IN] the prometheus filter * @@ -1191,8 +1139,6 @@ out: /****************************************************************************** * * - * Function: parse_help * - * * * Purpose: parses HELP comment metric and help text * * * * Parameters: data - [IN] the prometheus data * @@ -1231,8 +1177,6 @@ static int parse_help(const char *data, size_t pos, zbx_strloc_t *loc_metric, zb /****************************************************************************** * * - * Function: parse_type * - * * * Purpose: parses TYPE comment metric and the type * * * * Parameters: data - [IN] the prometheus data * @@ -1268,8 +1212,6 @@ static int parse_type(const char *data, size_t pos, zbx_strloc_t *loc_metric, zb /****************************************************************************** * * - * Function: prometheus_register_hint * - * * * Purpose: registers TYPE/HELP comment hint to the specified metric * * * * Parameters: hints - [IN/OUT] the hint registry * @@ -1327,8 +1269,6 @@ static int prometheus_register_hint(zbx_hashset_t *hints, const char *data, char /****************************************************************************** * * - * Function: prometheus_parse_hint * - * * * Purpose: parses TYPE/HELP comment hint and registers it * * * * Parameters: filter - [IN] the prometheus filter * @@ -1403,8 +1343,6 @@ static int prometheus_parse_hint(zbx_prometheus_filter_t *filter, const char *da /****************************************************************************** * * - * Function: prometheus_parse_rows * - * * * Purpose: parses rows with metrics from prometheus data * * * * Parameters: filter - [IN] the prometheus filter * @@ -1488,8 +1426,6 @@ out: /****************************************************************************** * * - * Function: prometheus_extract_value * - * * * Purpose: extracts value from row * * * * Parameters: rows - [IN] the source rows * @@ -1569,8 +1505,6 @@ static int prometheus_extract_value(const zbx_vector_ptr_t *rows, const char *ou /****************************************************************************** * * - * Function: prometheus_aggregate_values * - * * * Purpose: aggregates row values * * * * Parameters: rows - [IN] the source rows * @@ -1642,8 +1576,6 @@ static int prometheus_aggregate_values(const zbx_vector_ptr_t *rows, const char /****************************************************************************** * * - * Function: prometheus_query_rows * - * * * Purpose: performs the specified request on rows * * * * Parameters: rows - [IN] the source rows * @@ -1667,8 +1599,6 @@ static int prometheus_query_rows(const zbx_vector_ptr_t *rows, const char *reque /****************************************************************************** * * - * Function: prometheus_filter_rows * - * * * Purpose: get rows matching the filter criteria * * * * Parameters: rows - [IN] the rows to filter * @@ -1730,8 +1660,6 @@ static void prometheus_filter_rows(zbx_vector_ptr_t *rows, zbx_prometheus_filter /****************************************************************************** * * - * Function: zbx_prometheus_init * - * * * Purpose: parse prometheus input and initialize cache * * * * Parameters: prom - [IN] the prometheus cache * @@ -1783,8 +1711,6 @@ static void prometheus_label_index_free(zbx_prometheus_label_index_t *label_inde /****************************************************************************** * * - * Function: zbx_prometheus_clear * - * * * Purpose: free resources allocated by prometheus cache * * * * Parameters: prom - [IN] the prometheus cache * @@ -1842,8 +1768,6 @@ static int prometheus_index_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: prometheus_get_row_label * - * * * Purpose: get label from row by the specified name * * * * Parameters: row - [IN] the prometheus row * @@ -1870,8 +1794,6 @@ static zbx_prometheus_label_t *prometheus_get_row_label(zbx_prometheus_row_t *ro /****************************************************************************** * * - * Function: prometheus_get_indexed_rows_by_label * - * * * Purpose: get rows matching one filter label * * * * Parameters: prom - [IN] the prometheus cache * @@ -1949,8 +1871,6 @@ static int prometheus_get_indexed_rows_by_label(zbx_prometheus_t *prom, zbx_prom /****************************************************************************** * * - * Function: prometheus_validate_request * - * * * Purpose: validate prometheus pattern request and output * * * * Return value: SUCCEED - valid request and output combination * @@ -1980,8 +1900,6 @@ static int prometheus_validate_request(const char *request, const char *output, /****************************************************************************** * * - * Function: zbx_prometheus_pattern_ex * - * * * Purpose: extract value from prometheus cache by the specified filter * * * * Parameters: data - [IN] the prometheus cache * @@ -2038,8 +1956,6 @@ out: /****************************************************************************** * * - * Function: zbx_prometheus_pattern * - * * * Purpose: extracts value from prometheus data by the specified filter * * * * Parameters: data - [IN] the prometheus data * @@ -2098,8 +2014,6 @@ out: /****************************************************************************** * * - * Function: zbx_prometheus_to_json * - * * * Purpose: converts filtered prometheus data to json to be used with LLD * * * * Parameters: data - [IN] the prometheus data * diff --git a/src/libs/zbxregexp/zbxregexp.c b/src/libs/zbxregexp/zbxregexp.c index 5c1be8a6690..b498fcc30a0 100644 --- a/src/libs/zbxregexp/zbxregexp.c +++ b/src/libs/zbxregexp/zbxregexp.c @@ -71,8 +71,6 @@ zbx_regmatch_t; /****************************************************************************** * * - * Function: regexp_compile * - * * * Purpose: compiles a regular expression * * * * Parameters: * @@ -187,8 +185,6 @@ static int regexp_compile(const char *pattern, int flags, zbx_regexp_t **regexp, /******************************************************* * * - * Function: zbx_regexp_compile * - * * * Purpose: public wrapper for regexp_compile * * * *******************************************************/ @@ -203,8 +199,6 @@ int zbx_regexp_compile(const char *pattern, zbx_regexp_t **regexp, const char ** /******************************************************* * * - * Function: zbx_regexp_compile_ext * - * * * Purpose: public wrapper for regexp_compile * * * *******************************************************/ @@ -215,8 +209,6 @@ int zbx_regexp_compile_ext(const char *pattern, zbx_regexp_t **regexp, int flags /**************************************************************************************************** * * - * Function: regexp_prepare * - * * * Purpose: wrapper for zbx_regexp_compile. Caches and reuses the last used regexp. * * * ****************************************************************************************************/ @@ -270,8 +262,6 @@ static unsigned long int compute_recursion_limit(void) /*********************************************************************************** * * - * Function: regexp_exec * - * * * Purpose: wrapper for pcre_exec(), searches for a given pattern, specified by * * regexp, in the string * * * @@ -395,8 +385,6 @@ static int regexp_exec(const char *string, const zbx_regexp_t *regexp, int flags /****************************************************************************** * * - * Function: zbx_regexp_free * - * * * Purpose: wrapper for pcre_free * * * * Parameters: regexp - [IN] compiled regular expression * @@ -422,8 +410,6 @@ void zbx_regexp_free(zbx_regexp_t *regexp) /****************************************************************************** * * - * Function: zbx_regexp_match_precompiled * - * * * Purpose: checks if string matches a precompiled regular expression without * * returning matching groups * * * @@ -444,8 +430,6 @@ int zbx_regexp_match_precompiled(const char *string, const zbx_regexp_t *reg /**************************************************************************************************** * * - * Function: zbx_regexp * - * * * Purpose: compiles and executes a regexp * * * * Parameters: * @@ -497,8 +481,6 @@ char *zbx_regexp_match(const char *string, const char *pattern, int *len) /****************************************************************************** * * - * Function: strncpy_alloc * - * * * Purpose: zbx_strncpy_alloc with maximum allocated memory limit. * * * * Parameters: str - [IN/OUT] destination buffer pointer * @@ -519,8 +501,6 @@ static void strncpy_alloc(char **str, size_t *alloc_len, size_t *offset, const c /********************************************************************************* * * - * Function: regexp_sub_replace * - * * * Purpose: Constructs a string from the specified template and regexp match. * * * * Parameters: text - [IN] the input string. * @@ -639,8 +619,6 @@ out: /********************************************************************************* * * - * Function: regexp_sub * - * * * Purpose: Test if a string matches the specified regular expression. If yes * * then create a return value by substituting '\<n>' sequences in * * output template with the captured groups. * @@ -701,8 +679,6 @@ static int regexp_sub(const char *string, const char *pattern, const char *outpu /********************************************************************************* * * - * Function: zbx_mregexp_sub_precompiled * - * * * Purpose: Test if a string matches precompiled regular expression. If yes * * then create a return value by substituting '\<n>' sequences in * * output template with the captured groups. * @@ -752,8 +728,6 @@ int zbx_mregexp_sub_precompiled(const char *string, const zbx_regexp_t *regexp, /********************************************************************************* * * - * Function: zbx_regexp_sub * - * * * Purpose: Test if a string matches the specified regular expression. If yes * * then create a return value by substituting '\<n>' sequences in * * output template with the captured groups. * @@ -781,8 +755,6 @@ int zbx_regexp_sub(const char *string, const char *pattern, const char *output_t /********************************************************************************* * * - * Function: zbx_mregexp_sub * - * * * Purpose: This function is similar to zbx_regexp_sub() with exception that * * multiline matches are accepted. * * * @@ -794,8 +766,6 @@ int zbx_mregexp_sub(const char *string, const char *pattern, const char *output_ /********************************************************************************* * * - * Function: zbx_iregexp_sub * - * * * Purpose: This function is similar to zbx_regexp_sub() with exception that * * case insensitive matches are accepted. * * * @@ -807,8 +777,6 @@ int zbx_iregexp_sub(const char *string, const char *pattern, const char *output_ /****************************************************************************** * * - * Function: zbx_regexp_clean_expressions * - * * * Purpose: frees expression data retrieved by DCget_expressions function or * * prepared with add_regexp_ex() function calls * * * @@ -850,8 +818,6 @@ void add_regexp_ex(zbx_vector_ptr_t *regexps, const char *name, const char *expr /********************************************************************************** * * - * Function: regexp_match_ex_regsub * - * * * Purpose: Test if the string matches regular expression with the specified * * case sensitivity option and allocates output variable to store the * * result if necessary. * @@ -912,8 +878,6 @@ static int regexp_match_ex_regsub(const char *string, const char *pattern, int c /********************************************************************************** * * - * Function: regexp_match_ex_substring * - * * * Purpose: Test if the string contains substring with the specified case * * sensitivity option. * * * @@ -945,8 +909,6 @@ static int regexp_match_ex_substring(const char *string, const char *pattern, in /********************************************************************************** * * - * Function: regexp_match_ex_substring_list * - * * * Purpose: Test if the string contains a substring from list with the specified * * delimiter and case sensitivity option. * * * @@ -988,8 +950,6 @@ static int regexp_match_ex_substring_list(const char *string, char *pattern, int /********************************************************************************** * * - * Function: regexp_sub_ex * - * * * Purpose: Test if the string matches regular expression with the specified * * case sensitivity option and allocates output variable to store the * * result if necessary. * @@ -1145,8 +1105,6 @@ int zbx_global_regexp_exists(const char *name, const zbx_vector_ptr_t *regexps) /********************************************************************************** * * - * Function: zbx_regexp_escape_stringsize * - * * * Purpose: calculate a string size after symbols escaping * * * * Parameters: string - [IN] the string to check * @@ -1199,8 +1157,6 @@ static size_t zbx_regexp_escape_stringsize(const char *string) /********************************************************************************** * * - * Function: zbx_regexp_escape_string * - * * * Purpose: replace . \ + * ? [ ^ ] $ ( ) { } = ! < > | : - symbols in string * * with combination of \ and escaped symbol * * * @@ -1250,8 +1206,6 @@ static void zbx_regexp_escape_string(char *p, const char *string) /********************************************************************************** * * - * Function: zbx_regexp_escape * - * * * Purpose: escaping of symbols for using in regexp expression * * * * Parameters: string - [IN/OUT] the string to update * @@ -1274,8 +1228,6 @@ void zbx_regexp_escape(char **string) /********************************************************************************** * * - * Function: zbx_wildcard_minimize * - * * * Purpose: remove repeated wildcard characters from the expression * * * * Parameters: str - [IN/OUT] the string to update * @@ -1307,8 +1259,6 @@ void zbx_wildcard_minimize(char *str) /****************************************************************************** * * - * Function: zbx_wildcard_match * - * * * Purpose: Matches string value to specified wildcard. * * Asterisk (*) characters match to any characters of any length. * * * diff --git a/src/libs/zbxrtc/rtc.c b/src/libs/zbxrtc/rtc.c index f333fd8d192..486ae84fc2f 100644 --- a/src/libs/zbxrtc/rtc.c +++ b/src/libs/zbxrtc/rtc.c @@ -27,8 +27,6 @@ /****************************************************************************** * * - * Function: zbx_rtc_parse_loglevel_option * - * * * Purpose: parse loglevel runtime control option * * * * Parameters: opt - [IN] the runtime control option * diff --git a/src/libs/zbxrtc/rtc_client.c b/src/libs/zbxrtc/rtc_client.c index f5c6a698539..a0d08a1c627 100644 --- a/src/libs/zbxrtc/rtc_client.c +++ b/src/libs/zbxrtc/rtc_client.c @@ -26,8 +26,6 @@ extern int CONFIG_TIMEOUT; /****************************************************************************** * * - * Function: rtc_parse_log_level_parameter * - * * * Purpose: parse loglevel runtime control option * * * * Parameters: opt - [IN] the runtime control option * @@ -76,8 +74,6 @@ finish: /****************************************************************************** * * - * Function: rtc_parse_options * - * * * Purpose: parse runtime control options and create a runtime control * * message * * * @@ -160,8 +156,6 @@ static int rtc_parse_options(const char *opt, zbx_uint32_t *code, char **data, c /****************************************************************************** * * - * Function: zbx_rtc_process * - * * * Purpose: process runtime control option and print result * * * * Parameters: opt - [IN] the runtime control option * @@ -224,8 +218,6 @@ int zbx_rtc_open(zbx_ipc_async_socket_t *asocket, int timeout, char **error) /****************************************************************************** * * - * Function: zbx_rtc_notify_config_sync * - * * * Purpose: notify RTC service about finishing initial configuration sync * * * * Parameters: error - [OUT] error message * diff --git a/src/libs/zbxrtc/rtc_server.c b/src/libs/zbxrtc/rtc_server.c index 76a638b4901..67475d3f640 100644 --- a/src/libs/zbxrtc/rtc_server.c +++ b/src/libs/zbxrtc/rtc_server.c @@ -127,8 +127,6 @@ int rtc_parse_options_ex(const char *opt, zbx_uint32_t *code, char **data, char /****************************************************************************** * * - * Function: rtc_process_loglevel * - * * * Purpose: process loglevel runtime control option * * * * Parameters: direction - [IN] the loglevel change direction: * @@ -188,8 +186,6 @@ static int rtc_process_loglevel(int direction, const char *data, char **result) /****************************************************************************** * * - * Function: rtc_process_diaginfo * - * * * Purpose: process diaginfo runtime control option * * * * Parameters: data - [IN] the runtime control parameter (optional) * @@ -235,8 +231,6 @@ static void rtc_process_diaginfo(const char *data, char **result) /****************************************************************************** * * - * Function: rtc_ha_status * - * * * Purpose: process ha_status runtime command * * * ******************************************************************************/ @@ -339,8 +333,6 @@ static void rtc_ha_status(char **out) /****************************************************************************** * * - * Function: rtc_ha_remove_node * - * * * Purpose: process ha_remove_node runtime command * * * ******************************************************************************/ @@ -373,8 +365,6 @@ static void rtc_ha_remove_node(const char *data, char **out) /****************************************************************************** * * - * Function: rtc_ha_failover_delay * - * * * Purpose: process ha_failover_delay runtime command * * * ******************************************************************************/ @@ -416,8 +406,6 @@ static void rtc_ha_failover_delay(const char *data, char **out) } /****************************************************************************** * * - * Function: rtc_process_request_ex * - * * * Purpose: process runtime control option * * * * Parameters: code - [IN] the request code * diff --git a/src/libs/zbxrtc/rtc_service.c b/src/libs/zbxrtc/rtc_service.c index e7c61febecb..b1358222ced 100644 --- a/src/libs/zbxrtc/rtc_service.c +++ b/src/libs/zbxrtc/rtc_service.c @@ -27,8 +27,6 @@ /****************************************************************************** * * - * Function: rtc_change_service_loglevel * - * * * Purpose: change log level of service process * * * ******************************************************************************/ @@ -64,8 +62,6 @@ static void rtc_change_service_loglevel(int code) /****************************************************************************** * * - * Function: rtc_process_loglevel * - * * * Purpose: process loglevel runtime control option * * * * Parameters: code - [IN] the runtime control request code * @@ -134,8 +130,6 @@ static void rtc_process_loglevel(int code, const char *data, char **result) /****************************************************************************** * * - * Function: rtc_process_diaginfo * - * * * Purpose: process diaginfo runtime control option * * * * Parameters: data - [IN] the runtime control parameter (optional) * @@ -183,8 +177,6 @@ static void rtc_process_diaginfo(const char *data, char **result) /****************************************************************************** * * - * Function: rtc_process_request * - * * * Purpose: process runtime control option * * * * Parameters: code - [IN] the request code * @@ -244,8 +236,6 @@ static void rtc_process_request(int code, const unsigned char *data, char **resu /****************************************************************************** * * - * Function: zbx_rtc_init * - * * * Purpose: initialize runtime control service * * * ******************************************************************************/ @@ -256,8 +246,6 @@ int zbx_rtc_init(zbx_rtc_t *rtc ,char **error) /****************************************************************************** * * - * Function: zbx_rtc_dispatch * - * * * Purpose: accept and process runtime control request * * * ******************************************************************************/ @@ -292,8 +280,6 @@ void zbx_rtc_dispatch(zbx_ipc_client_t *client, zbx_ipc_message_t *message) /****************************************************************************** * * - * Function: zbx_rtc_wait_config_sync * - * * * Purpose: wait for configuration sync notification while optionally * * dispatching runtime control commands * * * diff --git a/src/libs/zbxself/selfmon.c b/src/libs/zbxself/selfmon.c index b06e0fa2226..a8336e98760 100644 --- a/src/libs/zbxself/selfmon.c +++ b/src/libs/zbxself/selfmon.c @@ -128,8 +128,6 @@ extern ZBX_THREAD_LOCAL int process_num; /****************************************************************************** * * - * Function: get_process_type_forks * - * * * Purpose: Returns number of processes depending on process type * * * * Parameters: proc_type - [IN] process type; ZBX_PROCESS_TYPE_* * @@ -221,8 +219,6 @@ int get_process_type_forks(unsigned char proc_type) #ifndef _WINDOWS /****************************************************************************** * * - * Function: init_selfmon_collector * - * * * Purpose: Initialize structures and prepare state * * for self-monitoring collector * * * @@ -294,8 +290,6 @@ out: /****************************************************************************** * * - * Function: free_selfmon_collector * - * * * Purpose: Free memory allocated for self-monitoring collector * * * * Author: Alexander Vladishev * @@ -322,8 +316,6 @@ void free_selfmon_collector(void) /****************************************************************************** * * - * Function: update_selfmon_counter * - * * * Parameters: state - [IN] new process state; ZBX_PROCESS_STATE_* * * * * Author: Alexander Vladishev * @@ -393,8 +385,6 @@ void update_selfmon_counter(unsigned char state) /****************************************************************************** * * - * Function: collect_selfmon_stats * - * * * Author: Alexander Vladishev * * * ******************************************************************************/ @@ -474,8 +464,6 @@ out: /****************************************************************************** * * - * Function: get_selfmon_stats * - * * * Purpose: calculate statistics for selected process * * * * Parameters: proc_type - [IN] type of process; ZBX_PROCESS_TYPE_* * @@ -573,8 +561,6 @@ unlock: /****************************************************************************** * * - * Function: zbx_get_all_process_stats * - * * * Purpose: retrieves internal metrics of all running processes based on * * process type * * * @@ -676,8 +662,6 @@ static int sleep_remains; /****************************************************************************** * * - * Function: zbx_sleep_loop * - * * * Purpose: sleeping process * * * * Parameters: sleeptime - [IN] required sleeptime, in seconds * diff --git a/src/libs/zbxself/selfmon_proxy.c b/src/libs/zbxself/selfmon_proxy.c index c80089301a3..0f353a147a9 100644 --- a/src/libs/zbxself/selfmon_proxy.c +++ b/src/libs/zbxself/selfmon_proxy.c @@ -23,8 +23,6 @@ /****************************************************************************** * * - * Function: get_component_process_type_forks * - * * * Purpose: Returns number of processes depending on process type * * * * Parameters: proc_type - [IN] process type; ZBX_PROCESS_TYPE_* * diff --git a/src/libs/zbxself/selfmon_server.c b/src/libs/zbxself/selfmon_server.c index f1852c9a4d1..57516561aac 100644 --- a/src/libs/zbxself/selfmon_server.c +++ b/src/libs/zbxself/selfmon_server.c @@ -26,8 +26,6 @@ extern int CONFIG_REPORTWRITER_FORKS; /****************************************************************************** * * - * Function: get_component_process_type_forks * - * * * Purpose: Returns number of processes depending on process type * * * * Parameters: proc_type - [IN] process type; ZBX_PROCESS_TYPE_* * diff --git a/src/libs/zbxserver/anomalystl.c b/src/libs/zbxserver/anomalystl.c index 5528880f490..d37fba3d6b1 100644 --- a/src/libs/zbxserver/anomalystl.c +++ b/src/libs/zbxserver/anomalystl.c @@ -33,8 +33,6 @@ ZBX_PTR_VECTOR_IMPL(VV, zbx_vector_history_record_t *) /******************************************************************************* * * - * Function: zbx_get_percentage_of_deviations_in_remainder * - * * * Purpose: finds how many values in stl remainder are outliers * * * * Parameters: remainder - [IN] stl remainder values vector * diff --git a/src/libs/zbxserver/evalfunc.c b/src/libs/zbxserver/evalfunc.c index ead77b3caec..a66f9fee8dc 100644 --- a/src/libs/zbxserver/evalfunc.c +++ b/src/libs/zbxserver/evalfunc.c @@ -52,8 +52,6 @@ ZBX_PTR_VECTOR_IMPL(valuemaps_ptr, zbx_valuemaps_t *) /****************************************************************************** * * - * Function: add_value_suffix_uptime * - * * * Purpose: Process suffix 'uptime' * * * * Parameters: value - value for adjusting * @@ -98,8 +96,6 @@ static void add_value_suffix_uptime(char *value, size_t max_len) /****************************************************************************** * * - * Function: add_value_suffix_s * - * * * Purpose: Process suffix 's' * * * * Parameters: value - value for adjusting * @@ -185,8 +181,6 @@ clean: /****************************************************************************** * * - * Function: is_blacklisted_unit * - * * * Purpose: check if unit is blacklisted or not * * * * Parameters: unit - unit to check * @@ -210,8 +204,6 @@ static int is_blacklisted_unit(const char *unit) /****************************************************************************** * * - * Function: add_value_units_no_kmgt * - * * * Purpose: add only units to the value * * * * Parameters: value - value for adjusting * @@ -248,8 +240,6 @@ static void add_value_units_no_kmgt(char *value, size_t max_len, const char *uni /****************************************************************************** * * - * Function: add_value_units_with_kmgt * - * * * Purpose: add units with K,M,G,T prefix to the value * * * * Parameters: value - value for adjusting * @@ -315,8 +305,6 @@ static void add_value_units_with_kmgt(char *value, size_t max_len, const char *u /****************************************************************************** * * - * Function: add_value_suffix * - * * * Purpose: Add suffix for value * * * * Parameters: value - value for replacing * @@ -370,8 +358,6 @@ static void zbx_valuemaps_free(zbx_valuemaps_t *valuemap) /****************************************************************************** * * - * Function: evaluate_value_by_map * - * * * Purpose: replace value by mapping value * * * * Parameters: value - value for replacing * @@ -524,8 +510,6 @@ map_value: /****************************************************************************** * * - * Function: replace_value_by_map * - * * * Purpose: replace value by mapping value * * * * Parameters: value - value for replacing * @@ -584,8 +568,6 @@ clean: /****************************************************************************** * * - * Function: zbx_format_value * - * * * Purpose: replace value by value mapping or by units * * * * Parameters: value - [IN/OUT] value for replacing * @@ -620,8 +602,6 @@ void zbx_format_value(char *value, size_t max_len, zbx_uint64_t valuemapid, /****************************************************************************** * * - * Function: evaluatable_for_notsupported * - * * * Purpose: check is function to be evaluated for NOTSUPPORTED items * * * * Parameters: fn - [IN] function name * @@ -643,8 +623,6 @@ int zbx_evaluatable_for_notsupported(const char *fn) /****************************************************************************** * * - * Function: get_function_parameter_period * - * * * Purpose: get the value of sec|#num trigger function parameter * * * * Parameters: parameters - [IN] trigger function parameters * @@ -705,8 +683,6 @@ out: /****************************************************************************** * * - * Function: get_last_n_value * - * * * Purpose: get last Nth value defined by #num:now-timeshift first parameter * * * * Parameters: item - [IN] item (performance metric) * @@ -763,8 +739,6 @@ out: /****************************************************************************** * * - * Function: evaluate_LOGEVENTID * - * * * Purpose: evaluate function 'logeventid' for the item * * * * Parameters: value - [OUT] result * @@ -862,8 +836,6 @@ out: /****************************************************************************** * * - * Function: evaluate_LOGSOURCE * - * * * Purpose: evaluate function 'logsource' for the item * * * * Parameters: value - [OUT] result * @@ -956,8 +928,6 @@ out: /****************************************************************************** * * - * Function: evaluate_LOGSEVERITY * - * * * Purpose: evaluate function 'logseverity' for the item * * * * Parameters: value - [OUT] result * @@ -1206,8 +1176,6 @@ static void count_one_str(int *count, int op, const char *value, const char *pat /****************************************************************************** * * - * Function: evaluate_COUNT * - * * * Purpose: evaluate functions 'count' and 'find' for the item * * * * Parameters: value - [OUT] result * @@ -1553,8 +1521,6 @@ out: /****************************************************************************** * * - * Function: evaluate_SUM * - * * * Purpose: evaluate function 'sum' for the item * * * * Parameters: value - [OUT] result * @@ -1647,8 +1613,6 @@ out: /****************************************************************************** * * - * Function: evaluate_AVG * - * * * Purpose: evaluate function 'avg' for the item * * * * Parameters: value - [OUT] result * @@ -1748,8 +1712,6 @@ out: /****************************************************************************** * * - * Function: evaluate_LAST * - * * * Purpose: evaluate function 'last' for the item * * * * Parameters: value - [OUT] result * @@ -1783,8 +1745,6 @@ static int evaluate_LAST(zbx_variant_t *value, DC_ITEM *item, const char *parame /****************************************************************************** * * - * Function: evaluate_MIN * - * * * Purpose: evaluate function 'min' for the item * * * * Parameters: value - [OUT] result * @@ -1888,8 +1848,6 @@ out: /****************************************************************************** * * - * Function: evaluate_MAX * - * * * Purpose: evaluate function 'max' for the item * * * * Parameters: value - [OUT] * @@ -1994,8 +1952,6 @@ out: /****************************************************************************** * * - * Function: evaluate_PERCENTILE * - * * * Purpose: evaluate function 'percentile' for the item * * * * Parameters: value - [OUT] result * @@ -2102,8 +2058,6 @@ out: /****************************************************************************** * * - * Function: evaluate_NODATA * - * * * Purpose: evaluate function 'nodata' for the item * * * * Parameters: value - [OUT] result * @@ -2215,8 +2169,6 @@ out: /****************************************************************************** * * - * Function: evaluate_CHANGE * - * * * Purpose: evaluate function 'change' for the item * * * * Parameters: value - [OUT] result * @@ -2288,8 +2240,6 @@ out: /****************************************************************************** * * - * Function: evaluate_FUZZYTIME * - * * * Purpose: evaluate function 'fuzzytime' for the item * * * * Parameters: value - [OUT] result * @@ -2372,8 +2322,6 @@ out: /****************************************************************************** * * - * Function: evaluate_BITAND * - * * * Purpose: evaluate logical bitwise function 'and' for the item * * * * Parameters: value - [OUT] dynamic buffer,result * @@ -2441,8 +2389,6 @@ clean: /****************************************************************************** * * - * Function: evaluate_FORECAST * - * * * Purpose: evaluate function 'forecast' for the item * * * * Parameters: value - [OUT] result * @@ -2600,8 +2546,6 @@ out: /****************************************************************************** * * - * Function: evaluate_TIMELEFT * - * * * Purpose: evaluate function 'timeleft' for the item * * * * Parameters: value - [OUT] result * @@ -2819,8 +2763,6 @@ out: /****************************************************************************** * * - * Function: evaluate_TREND * - * * * Purpose: evaluate trend* functions for the item * * * * Parameters: value - [OUT] result * @@ -3041,8 +2983,6 @@ static int validate_params_and_get_data(DC_ITEM *item, const char *parameters, c /****************************************************************************** * * - * Function: evaluate_FIRST * - * * * Purpose: evaluate function 'first' for the item * * * * Parameters: value - [OUT] result * @@ -3150,8 +3090,6 @@ out: /****************************************************************************** * * - * Function: evaluate_MONO * - * * * Purpose: evaluate functions 'monoinc' and 'monodec' for the item * * * * Parameters: value - [OUT] result * @@ -3291,8 +3229,6 @@ out: /****************************************************************************** * * - * Function: evaluate_RATE * - * * * Purpose: evaluate functions 'rate' for the item * * * * Parameters: value - [OUT] result * @@ -3482,8 +3418,6 @@ int zbx_evaluate_RATE(zbx_variant_t *value, DC_ITEM *item, const char *parameter /****************************************************************************** * * - * Function: evaluate_CHANGECOUNT * - * * * Purpose: evaluate function 'changecount' for the item * * * * Parameters: value - [OUT] result * @@ -3643,8 +3577,6 @@ out: /****************************************************************************** * * - * Function: evaluate_BASELINE * - * * * Purpose: evaluate baseline* functions for the item * * * * Parameters: value - [OUT] the function result * @@ -3804,8 +3736,6 @@ static void history_to_dbl_vector(const zbx_history_record_t *v, int n, unsigned /****************************************************************************** * * - * Function: evaluate_statistical_func * - * * * Purpose: common operations for aggregate function calculation * * * * Parameters: value - [OUT] result * @@ -3860,8 +3790,6 @@ out: /****************************************************************************** * * - * Function: evaluate_function * - * * * Purpose: evaluate function * * * * Parameters: value - [OUT] dynamic buffer, result * @@ -4029,8 +3957,6 @@ int evaluate_function2(zbx_variant_t *value, DC_ITEM *item, const char *function /****************************************************************************** * * - * Function: zbx_is_trigger_function * - * * * Purpose: check if the specified function is a trigger function * * * * Parameters: name - [IN] the function name to check * diff --git a/src/libs/zbxserver/evalfunc_common.c b/src/libs/zbxserver/evalfunc_common.c index 2293d94e5b0..ae19f3d257b 100644 --- a/src/libs/zbxserver/evalfunc_common.c +++ b/src/libs/zbxserver/evalfunc_common.c @@ -101,8 +101,6 @@ out: /****************************************************************************** * * - * Function: get_function_parameter_hist_range * - * * * Purpose: get the value of sec|num + timeshift trigger function parameter * * * * Parameters: from - [IN] the function calculation time * diff --git a/src/libs/zbxserver/expression.c b/src/libs/zbxserver/expression.c index 07a55e45ee5..e715cf3a3e0 100644 --- a/src/libs/zbxserver/expression.c +++ b/src/libs/zbxserver/expression.c @@ -86,8 +86,6 @@ static int substitute_key_macros_impl(char **data, zbx_uint64_t *hostid, DC_ITEM /****************************************************************************** * * - * Function: get_trigger_severity_name * - * * * Purpose: get trigger severity name * * * * Parameters: trigger - [IN] a trigger data with priority field; * @@ -117,8 +115,6 @@ static int get_trigger_severity_name(unsigned char priority, char **replace_to) /****************************************************************************** * * - * Function: get_problem_update_actions * - * * * Purpose: get human readable list of problem update actions * * * * Parameters: ack - [IN] the acknowledge (problem update) data * @@ -202,8 +198,6 @@ static int get_problem_update_actions(const DB_ACKNOWLEDGE *ack, int actions, ch /****************************************************************************** * * - * Function: DBget_host_value * - * * * Purpose: request host name by hostid * * * * Return value: upon successful completion return SUCCEED * @@ -234,8 +228,6 @@ static int DBget_host_value(zbx_uint64_t hostid, char **replace_to, const char * /****************************************************************************** * * - * Function: DBget_templateid_by_triggerid * - * * * Purpose: get template trigger ID from which the trigger is inherited * * * * Return value: upon successful completion return SUCCEED * @@ -266,8 +258,6 @@ static int DBget_templateid_by_triggerid(zbx_uint64_t triggerid, zbx_uint64_t *t /****************************************************************************** * * - * Function: DBget_trigger_template_name * - * * * Purpose: get comma-space separated trigger template names in which * * the trigger is defined * * * @@ -383,8 +373,6 @@ out: /****************************************************************************** * * - * Function: DBget_trigger_hostgroup_name * - * * * Purpose: get comma-space separated host group names in which the trigger * * is defined * * * @@ -469,8 +457,6 @@ out: /****************************************************************************** * * - * Function: get_interface_value * - * * * Purpose: retrieve a particular value associated with the interface * * * * Return value: upon successful completion return SUCCEED * @@ -538,8 +524,6 @@ static int get_host_value(zbx_uint64_t itemid, char **replace_to, int request) /****************************************************************************** * * - * Function: zbx_substitute_macros_in_item_key * - * * * Purpose: get item key, replace macros in the key * * * * Parameters: dc_item - [IN] item information used in substitution * @@ -557,8 +541,6 @@ static void zbx_substitute_macros_in_item_key(DC_ITEM *dc_item, char **replace_t /****************************************************************************** * * - * Function: DBget_item_value * - * * * Purpose: retrieve a particular value associated with the item * * * * Return value: upon successful completion return SUCCEED * @@ -710,8 +692,6 @@ out: /****************************************************************************** * * - * Function: DBget_trigger_value * - * * * Purpose: retrieve a particular value associated with the trigger's * * N_functionid'th function * * * @@ -736,8 +716,6 @@ int DBget_trigger_value(const DB_TRIGGER *trigger, char **replace_to, int N_func /****************************************************************************** * * - * Function: DBget_trigger_event_count * - * * * Purpose: retrieve number of events (acknowledged or unacknowledged) for a * * trigger (in an OK or PROBLEM state) which generated an event * * * @@ -794,8 +772,6 @@ static int DBget_trigger_event_count(zbx_uint64_t triggerid, char **replace_to, /****************************************************************************** * * - * Function: DBget_dhost_value_by_event * - * * * Purpose: retrieve discovered host value by event and field name * * * * Parameters: * @@ -856,8 +832,6 @@ static int DBget_dhost_value_by_event(const DB_EVENT *event, char **replace_to, /****************************************************************************** * * - * Function: DBget_dchecks_value_by_event * - * * * Purpose: retrieve discovery rule check value by event and field name * * * * Return value: upon successful completion return SUCCEED * @@ -893,8 +867,6 @@ static int DBget_dchecks_value_by_event(const DB_EVENT *event, char **replace_to /****************************************************************************** * * - * Function: DBget_dservice_value_by_event * - * * * Purpose: retrieve discovered service value by event and field name * * * * Parameters: * @@ -935,8 +907,6 @@ static int DBget_dservice_value_by_event(const DB_EVENT *event, char **replace_t /****************************************************************************** * * - * Function: DBget_drule_value_by_event * - * * * Purpose: retrieve discovery rule value by event and field name * * * * Parameters: * @@ -986,8 +956,6 @@ static int DBget_drule_value_by_event(const DB_EVENT *event, char **replace_to, /****************************************************************************** * * - * Function: DBget_history_log_value * - * * * Purpose: retrieve a particular attribute of a log value * * * * Return value: upon successful completion return SUCCEED * @@ -1062,8 +1030,6 @@ out: /****************************************************************************** * * - * Function: DBitem_get_value * - * * * Purpose: retrieve item value by item id * * * * Parameters: * @@ -1120,8 +1086,6 @@ static int DBitem_get_value(zbx_uint64_t itemid, char **lastvalue, int raw, zbx_ /****************************************************************************** * * - * Function: DBitem_value * - * * * Purpose: retrieve item value by trigger expression and number of function * * * * Return value: upon successful completion return SUCCEED * @@ -1146,8 +1110,6 @@ static int DBitem_value(const DB_TRIGGER *trigger, char **value, int N_functioni /****************************************************************************** * * - * Function: DBitem_lastvalue * - * * * Purpose: retrieve item lastvalue by trigger expression * * and number of function * * * @@ -1172,8 +1134,6 @@ static int DBitem_lastvalue(const DB_TRIGGER *trigger, char **lastvalue, int N_f /****************************************************************************** * * - * Function: format_user_fullname * - * * * Purpose: formats full user name from name, surname and alias * * * * Parameters: name - [IN] the user name, can be empty string * @@ -1216,8 +1176,6 @@ static char *format_user_fullname(const char *name, const char *surname, const c /****************************************************************************** * * - * Function: get_escalation_history * - * * * Purpose: retrieve escalation history * * * ******************************************************************************/ @@ -1326,8 +1284,6 @@ static void get_escalation_history(zbx_uint64_t actionid, const DB_EVENT *event, /****************************************************************************** * * - * Function: get_event_update_history * - * * * Purpose: retrieve event acknowledges history * * * * Parameters: * @@ -1404,8 +1360,6 @@ static void get_event_update_history(const DB_EVENT *event, char **replace_to, c /****************************************************************************** * * - * Function: get_autoreg_value_by_event * - * * * Purpose: request value from autoreg_host table by event * * * * Parameters: * @@ -1834,8 +1788,6 @@ static inventory_field_t inventory_fields[] = /****************************************************************************** * * - * Function: get_action_value * - * * * Purpose: request action value by macro * * * * Return value: upon successful completion return SUCCEED * @@ -1870,8 +1822,6 @@ static int get_action_value(const char *macro, zbx_uint64_t actionid, char **rep /****************************************************************************** * * - * Function: get_host_inventory * - * * * Purpose: request host inventory value by macro and trigger * * * * Return value: upon successful completion return SUCCEED * @@ -1901,8 +1851,6 @@ static int get_host_inventory(const char *macro, const DB_TRIGGER *trigger, char /****************************************************************************** * * - * Function: get_host_inventory_by_itemid * - * * * Purpose: request host inventory value by macro and itemid * * * * Return value: upon successful completion return SUCCEED * @@ -1924,8 +1872,6 @@ static int get_host_inventory_by_itemid(const char *macro, zbx_uint64_t itemid, /****************************************************************************** * * - * Function: get_host_inventory_by_itemid * - * * * Purpose: request host inventory value by macro and hostid * * * * Return value: upon successful completion return SUCCEED * @@ -1947,8 +1893,6 @@ static int get_host_inventory_by_hostid(const char *macro, zbx_uint64_t hostid, /****************************************************************************** * * - * Function: compare_tags * - * * * Purpose: comparison function to sort tags by tag/value * * * ******************************************************************************/ @@ -1967,8 +1911,6 @@ static int compare_tags(const void *d1, const void *d2) /****************************************************************************** * * - * Function: get_event_tags * - * * * Purpose: format event tags string in format <tag1>[:<value1>], ... * * * * Parameters: event [IN] the event * @@ -2020,8 +1962,6 @@ static void get_event_tags(const DB_EVENT *event, char **replace_to) /****************************************************************************** * * - * Function: get_event_tags_json * - * * * Purpose: format event tags string in JSON format * * * * Parameters: event [IN] the event * @@ -2052,8 +1992,6 @@ static void get_event_tags_json(const DB_EVENT *event, char **replace_to) /****************************************************************************** * * - * Function: get_event_tag_by_name * - * * * Purpose: get event tag value by name * * * * Parameters: macro - [IN] the macro * @@ -2098,8 +2036,6 @@ static void get_event_tag_by_name(const char *text, const DB_EVENT *event, char /****************************************************************************** * * - * Function: get_recovery_event_value * - * * * Purpose: request recovery event value by macro * * * ******************************************************************************/ @@ -2141,8 +2077,6 @@ static void get_recovery_event_value(const char *macro, const DB_EVENT *r_event, /****************************************************************************** * * - * Function: get_current_event_value * - * * * Purpose: request current event value by macro * * * ******************************************************************************/ @@ -2161,8 +2095,6 @@ static void get_current_event_value(const char *macro, const DB_EVENT *event, ch /****************************************************************************** * * - * Function: get_event_value * - * * * Purpose: request event value by macro * * * ******************************************************************************/ @@ -2260,8 +2192,6 @@ static void get_event_value(const char *macro, const DB_EVENT *event, char **rep /****************************************************************************** * * - * Function: rootcause_free * - * * * Purpose: free memory allocated for root cause * * * ******************************************************************************/ @@ -2274,8 +2204,6 @@ static void rootcause_free(zbx_rootcause_t *rootcause) /****************************************************************************** * * - * Function: rootcause_compare * - * * * Purpose: compare root cause to sort by highest severity and host name * * * ******************************************************************************/ @@ -2288,8 +2216,6 @@ static int rootcause_compare(const zbx_rootcause_t *d1, const zbx_rootcause_t *d /****************************************************************************** * * - * Function: get_rootcause * - * * * Purpose: get root cause of service being in problem state * * * ******************************************************************************/ @@ -2346,8 +2272,6 @@ fail: /****************************************************************************** * * - * Function: get_history_log_value * - * * * Purpose: retrieve a particular attribute of a log value * * * * Return value: upon successful completion return SUCCEED * @@ -2399,8 +2323,6 @@ static int get_history_log_value(const char *m, const DB_TRIGGER *trigger, char /****************************************************************************** * * - * Function: is_indexed_macro * - * * * Purpose: check if a token contains indexed macro * * * ******************************************************************************/ @@ -2426,8 +2348,6 @@ static int is_indexed_macro(const char *str, const zbx_token_t *token) /****************************************************************************** * * - * Function: macro_in_list * - * * * Purpose: check if a macro in string is one of the list and extract index * * * * Parameters: str - [IN] string containing potential macro * @@ -2479,8 +2399,6 @@ static const char *macro_in_list(const char *str, zbx_strloc_t strloc, const cha /****************************************************************************** * * - * Function: func_macro_in_list * - * * * Purpose: check if a macro function one in the list for the macro * * * * Parameters: str - [IN] string containing potential macro * @@ -2527,8 +2445,6 @@ static const char *func_macro_in_list(const char *str, zbx_token_func_macro_t *f /****************************************************************************** * * - * Function: get_expression_macro_result * - * * * Purpose: calculate result of expression macro * * * * Return value: upon successful completion return SUCCEED * @@ -2587,8 +2503,6 @@ out: /****************************************************************************** * * - * Function: cache_item_hostid * - * * * Purpose: cache host identifier referenced by an item or a lld-rule * * * * Parameters: hostids - [OUT] the host identifier cache * @@ -2630,8 +2544,6 @@ static const char *zbx_dobject_status2str(int st) /****************************************************************************** * * - * Function: resolve_opdata * - * * * Purpose: resolve {EVENT.OPDATA} macro * * * ******************************************************************************/ @@ -2681,8 +2593,6 @@ static void resolve_opdata(const DB_EVENT *event, char **replace_to, const char /****************************************************************************** * * - * Function: resolve_user_macros * - * * * Purpose: resolve {USER.*} macros * * * ******************************************************************************/ @@ -2761,8 +2671,6 @@ static int resolve_host_target_macros(const char *m, const DC_HOST *dc_host, DC_ /****************************************************************************** * * - * Function: substitute_simple_macros_impl * - * * * Purpose: substitute simple macros in data string with real values * * * * Author: Eugene Grigorjev * @@ -4868,8 +4776,6 @@ zbx_trigger_func_position_t; /****************************************************************************** * * - * Function: expand_trigger_macros * - * * * Purpose: expand macros in a trigger expression * * * * Parameters: event - The trigger event structure * @@ -4905,8 +4811,6 @@ static int expand_trigger_macros(zbx_eval_context_t *ctx, const DB_EVENT *event, /****************************************************************************** * * - * Function: zbx_link_triggers_with_functions * - * * * Purpose: triggers links with functions * * * * Parameters: triggers_func_pos - [IN/OUT] pointer to the list of triggers * @@ -4957,8 +4861,6 @@ static void zbx_link_triggers_with_functions(zbx_vector_ptr_t *triggers_func_pos /****************************************************************************** * * - * Function: zbx_determine_items_in_expressions * - * * * Purpose: mark triggers that use one of the items in problem expression * * with ZBX_DC_TRIGGER_PROBLEM_EXPRESSION flag * * * @@ -5088,8 +4990,6 @@ static void func_clean(void *ptr) /****************************************************************************** * * - * Function: zbx_populate_function_items * - * * * Purpose: prepare hashset of functions to evaluate * * * * Parameters: functionids - [IN] function identifiers * @@ -5379,8 +5279,6 @@ static void zbx_substitute_functions_results(zbx_hashset_t *ifuncs, zbx_vector_p /****************************************************************************** * * - * Function: substitute_functions * - * * * Purpose: substitute expression functions with their values * * * * Parameters: triggers - [IN] vector of DC_TRIGGER pointers, sorted by * @@ -5431,8 +5329,6 @@ empty: /****************************************************************************** * * - * Function: prepare_triggers * - * * * Purpose: prepare triggers for evaluation * * * * Parameters: triggers - [IN] array of DC_TRIGGER pointers * @@ -5490,8 +5386,6 @@ static int evaluate_expression(zbx_eval_context_t *ctx, const zbx_timespec_t *ts /****************************************************************************** * * - * Function: evaluate_expressions * - * * * Purpose: evaluate trigger expressions * * * * Parameters: triggers - [IN] vector of DC_TRIGGER pointers, sorted by * @@ -5608,8 +5502,6 @@ void evaluate_expressions(zbx_vector_ptr_t *triggers, const zbx_vector_uint64_t /****************************************************************************** * * - * Function: process_lld_macro_token * - * * * Purpose: expand discovery macro in expression * * * * Parameters: data - [IN/OUT] the expression containing lld macro * @@ -5737,8 +5629,6 @@ static void process_lld_macro_token(char **data, zbx_token_t *token, int flags, /****************************************************************************** * * - * Function: process_user_macro_token * - * * * Purpose: expand discovery macro in user macro context * * * * Parameters: data - [IN/OUT] the expression containing lld macro * @@ -5792,8 +5682,6 @@ static int process_user_macro_token(char **data, zbx_token_t *token, const struc /****************************************************************************** * * - * Function: substitute_query_filter_lld_macros * - * * * Purpose: substitute lld macros in calculated item query filter * * * * Parameters: filter - [IN/OUT] the filter * @@ -5861,8 +5749,6 @@ out: /****************************************************************************** * * - * Function: substitute_item_query_macros * - * * * Purpose: substitute lld macros in history function item query argument * * /host/key?[filter] * * * @@ -5919,8 +5805,6 @@ out: /****************************************************************************** * * - * Function: zbx_substitute_expression_macros * - * * * Purpose: substitutes lld macros in an expression * * * * Parameters: data - [IN/OUT] the expression * @@ -5997,8 +5881,6 @@ out: /****************************************************************************** * * - * Function: process_expression_macro_token * - * * * Purpose: expand discovery macro in expression macro * * * * Parameters: data - [IN/OUT] the expression containing macro * @@ -6037,8 +5919,6 @@ static int process_expression_macro_token(char **data, zbx_token_t *token, const /****************************************************************************** * * - * Function: substitute_func_macro * - * * * Purpose: substitute lld macros in function macro parameters * * * * Parameters: data - [IN/OUT] pointer to a buffer * @@ -6090,8 +5970,6 @@ static int substitute_func_macro(char **data, zbx_token_t *token, const struct z /****************************************************************************** * * - * Function: substitute_lld_macros * - * * * Parameters: data - [IN/OUT] pointer to a buffer * * jp_row - [IN] discovery data * * flags - [IN] ZBX_MACRO_ANY - all LLD macros will be resolved * @@ -6191,8 +6069,6 @@ replace_key_param_data_t; /****************************************************************************** * * - * Function: replace_key_param * - * * * Comments: auxiliary function for substitute_key_macros() * * * ******************************************************************************/ @@ -6236,8 +6112,6 @@ static int replace_key_param_cb(const char *data, int key_type, int level, int n /****************************************************************************** * * - * Function: substitute_key_macros_impl * - * * * Purpose: safely substitutes macros in parameters of an item key and OID * * * * Example: key | macro | result | return * @@ -6306,8 +6180,6 @@ static int substitute_key_macros_impl(char **data, zbx_uint64_t *hostid, DC_ITEM /****************************************************************************** * * - * Function: substitute_function_lld_param * - * * * Purpose: substitute lld macros in function parameters * * * * Parameters: e - [IN] the function parameter list without * @@ -6412,8 +6284,6 @@ out: /****************************************************************************** * * - * Function: substitute_macros_in_json_pairs * - * * * Purpose: substitute LLD macros in JSON pairs * * * * Parameters: data - [IN/OUT] pointer to a buffer that JSON pair * @@ -6492,8 +6362,6 @@ exit: #ifdef HAVE_LIBXML2 /****************************************************************************** * * - * Function: substitute_macros_in_xml_elements * - * * * Comments: auxiliary function for substitute_macros_xml() * * * ******************************************************************************/ @@ -6593,8 +6461,6 @@ static void substitute_macros_in_xml_elements(const DC_ITEM *item, const struct /****************************************************************************** * * - * Function: substitute_macros_xml_impl * - * * * Purpose: substitute simple or LLD macros in XML text nodes, attributes of * * a node or in CDATA section, validate XML * * * @@ -6657,8 +6523,6 @@ exit: #ifdef HAVE_LIBXML2 /****************************************************************************** * * - * Function: libxml_handle_error * - * * * Purpose: libxml2 callback function for error handle * * * * Parameters: user_data - [IN/OUT] the user context * @@ -6688,8 +6552,6 @@ static void libxml_handle_error(void *user_data, xmlErrorPtr err) /****************************************************************************** * * - * Function: xml_xpath_check * - * * * Purpose: validate xpath string * * * * Parameters: xpath - [IN] the xpath value * @@ -6735,8 +6597,6 @@ int xml_xpath_check(const char *xpath, char *error, size_t errlen) /****************************************************************************** * * - * Function: substitute_simple_macros * - * * * Purpose: substitute_simple_macros with masked secret macros * * (default setting) * * * @@ -6753,8 +6613,6 @@ int substitute_simple_macros(const zbx_uint64_t *actionid, const DB_EVENT *event /****************************************************************************** * * - * Function: substitute_simple_macros_unmasked * - * * * Purpose: substitute_simple_macros with unmasked secret macros * * * ******************************************************************************/ @@ -6776,8 +6634,6 @@ int substitute_simple_macros_unmasked(const zbx_uint64_t *actionid, const DB_EVE /****************************************************************************** * * - * Function: substitute_macros_xml * - * * * substitute_macros_xml with masked secret macros * * * ******************************************************************************/ @@ -6789,8 +6645,6 @@ int substitute_macros_xml(char **data, const DC_ITEM *item, const struct zbx_jso /****************************************************************************** * * - * Function: substitute_macros_xml_unmasked * - * * * substitute_macros_xml with unmasked secret macros * * * ******************************************************************************/ @@ -6808,8 +6662,6 @@ int substitute_macros_xml_unmasked(char **data, const DC_ITEM *item, const struc /****************************************************************************** * * - * Function: substitute_key_macros * - * * * substitute_key_macros with masked secret macros * * * ******************************************************************************/ @@ -6821,8 +6673,6 @@ int substitute_key_macros(char **data, zbx_uint64_t *hostid, DC_ITEM *dc_item, c /****************************************************************************** * * - * Function: substitute_key_macros_unmasked * - * * * substitute_key_macros with unmasked secret macros * * * ******************************************************************************/ @@ -6841,8 +6691,6 @@ int substitute_key_macros_unmasked(char **data, zbx_uint64_t *hostid, DC_ITEM *d /****************************************************************************** * * - * Function: zbx_host_macro_index * - * * * Purpose: extract index from valid indexed host macro * * * * Return value: The index or -1 if it was not valid indexed host macro * diff --git a/src/libs/zbxserver/expression_eval.c b/src/libs/zbxserver/expression_eval.c index 81689c72345..afdbf4dfa5e 100644 --- a/src/libs/zbxserver/expression_eval.c +++ b/src/libs/zbxserver/expression_eval.c @@ -117,8 +117,6 @@ static void expression_query_free(zbx_expression_query_t *query) /****************************************************************************** * * - * Function: test_key_param_wildcard_cb * - * * * Purpose: check if key parameter is a wildcard '*' * * * ******************************************************************************/ @@ -144,8 +142,6 @@ static int test_key_param_wildcard_cb(const char *data, int key_type, int level, /****************************************************************************** * * - * Function: expression_create_query * - * * * Purpose: create expression item query from item query /host/key?[filter] * * * * Parameters: itemquery - [IN] the item query * @@ -199,8 +195,6 @@ static zbx_expression_query_t* expression_create_query(const char *itemquery) /****************************************************************************** * * - * Function: expression_group_free * - * * ******************************************************************************/ static void expression_group_free(zbx_expression_group_t *group) { @@ -211,8 +205,6 @@ static void expression_group_free(zbx_expression_group_t *group) /****************************************************************************** * * - * Function: expression_get_group * - * * * Purpose: get group from cache by name * * * * Parameters: eval - [IN] the evaluation data * @@ -247,8 +239,6 @@ static zbx_expression_group_t *expression_get_group(zbx_expression_eval_t *eval, /****************************************************************************** * * - * Function: expression_get_item * - * * * Purpose: get item from cache by itemid * * * * Parameters: eval - [IN] the evaluation data * @@ -283,8 +273,6 @@ static zbx_expression_item_t *expression_get_item(zbx_expression_eval_t *eval, z /****************************************************************************** * * - * Function: expression_item_free * - * * ******************************************************************************/ static void expression_item_free(zbx_expression_item_t *item) { @@ -295,8 +283,6 @@ static void expression_item_free(zbx_expression_item_t *item) /****************************************************************************** * * - * Function: expression_init_query_one * - * * * Purpose: initialize one item query * * * * Parameters: eval - [IN] the evaluation data * @@ -314,8 +300,6 @@ static void expression_init_query_one(zbx_expression_eval_t *eval, zbx_expressio /****************************************************************************** * * - * Function: replace_key_param_wildcard_cb * - * * * Purpose: replace wildcards '*'in key parameters with % and escape existing * * %, \ characters for SQL like operation * * * @@ -358,8 +342,6 @@ static int replace_key_param_wildcard_cb(const char *data, int key_type, int lev /****************************************************************************** * * - * Function: expression_match_item_key * - * * * Purpose: check if item key matches the pattern * * * * Parameters: item_key - [IN] the item key to match * @@ -408,8 +390,6 @@ zbx_expression_eval_many_t; /****************************************************************************** * * - * Function: expression_get_item_candidates * - * * * Purpose: get itemids + hostids of items that might match query based on * * host, key and filter groups * * * @@ -553,8 +533,6 @@ static void expression_get_item_candidates(zbx_expression_eval_t *eval, const zb /****************************************************************************** * * - * Function: expression_item_check_tag * - * * * Purpose: check if the item matches the tag * * * * Parameters: item - [IN] the item with tags * @@ -597,8 +575,6 @@ static int expression_item_check_tag(zbx_expression_item_t *item, const char *ta /****************************************************************************** * * - * Function: expression_eval_filter * - * * * Purpose: evaluate filter function * * * * Parameters: name - [IN] the function name (not zero terminated) * @@ -672,8 +648,6 @@ static int expression_eval_filter(const char *name, size_t len, int args_num, co /****************************************************************************** * * - * Function: expression_init_query_many * - * * * Purpose: initialize many item query * * * * Parameters: eval - [IN] the evaluation data * @@ -802,8 +776,6 @@ out: /****************************************************************************** * * - * Function: expression_cache_dcitems_hk * - * * * Purpose: cache items used in one item queries * * * * Parameters: eval - [IN] the evaluation data * @@ -861,8 +833,6 @@ static int expression_find_dcitem_by_itemid(const void *d1, const void *d2) /****************************************************************************** * * - * Function: expression_cache_dcitems * - * * * Purpose: cache items used in many item queries * * * * Parameters: eval - [IN] the evaluation data * @@ -940,8 +910,6 @@ static void expression_cache_dcitems(zbx_expression_eval_t *eval) /****************************************************************************** * * - * Function: expression_eval_one * - * * * Purpose: evaluate historical function for one item query * * * * Parameters: eval - [IN] the evaluation data * @@ -1110,8 +1078,6 @@ static int get_function_by_name(const char *name, size_t len) /****************************************************************************** * * - * Function: evaluate_history_func_min * - * * * Purpose: calculate minimum value from the history value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -1144,8 +1110,6 @@ static void evaluate_history_func_min(zbx_vector_history_record_t *values, int v /****************************************************************************** * * - * Function: evaluate_history_func_max * - * * * Purpose: calculate maximum value from the history value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -1178,8 +1142,6 @@ static void evaluate_history_func_max(zbx_vector_history_record_t *values, int v /****************************************************************************** * * - * Function: evaluate_history_func_sum * - * * * Purpose: calculate sum of values from the history value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -1208,8 +1170,6 @@ static void evaluate_history_func_sum(zbx_vector_history_record_t *values, int v /****************************************************************************** * * - * Function: evaluate_history_func_avg * - * * * Purpose: calculate average value of values from the history value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -1226,8 +1186,6 @@ static void evaluate_history_func_avg(zbx_vector_history_record_t *values, int v /****************************************************************************** * * - * Function: evaluate_history_func_count * - * * * Purpose: calculate number of values in value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -1243,8 +1201,6 @@ static void evaluate_history_func_count(zbx_vector_history_record_t *values, dou /****************************************************************************** * * - * Function: evaluate_history_func_last * - * * * Purpose: calculate the last (newest) value in value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -1261,8 +1217,6 @@ static void evaluate_history_func_last(zbx_vector_history_record_t *values, int /****************************************************************************** * * - * Function: evaluate_history_func * - * * * Purpose: calculate function with values from value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -1304,8 +1258,6 @@ static void evaluate_history_func(zbx_vector_history_record_t *values, int value /****************************************************************************** * * - * Function: get_dcitem * - * * * Purpose: get item from cache by itemid * * * * Parameters: eval - [IN] the evaluation data * @@ -1326,8 +1278,6 @@ static DC_ITEM *get_dcitem(zbx_vector_ptr_t *dcitem_refs, zbx_uint64_t itemid) /****************************************************************************** * * - * Function: expression_eval_exists * - * * * Purpose: evaluate functions 'exists_foreach' and 'item_count' * * for multiple items * * * @@ -1384,8 +1334,6 @@ static void expression_eval_exists(zbx_expression_eval_t *eval, zbx_expression_q /****************************************************************************** * * - * Function: expression_eval_bucket_rate * - * * * Purpose: evaluate functions 'bucket_rate_foreach' for 'histogram_quantile' * * and evaluate functions 'bucket_percentile' * * * @@ -1566,8 +1514,6 @@ err: /****************************************************************************** * * - * Function: expression_eval_many * - * * * Purpose: evaluate historical function for multiple items (aggregate checks)* * * * Parameters: eval - [IN] the evaluation data * @@ -1710,8 +1656,6 @@ out: /****************************************************************************** * * - * Function: expression_eval_history * - * * * Purpose: evaluate historical function * * * * Parameters: name - [IN] the function name (not zero terminated) * @@ -1790,8 +1734,6 @@ out: /****************************************************************************** * * - * Function: expression_eval_common * - * * * Purpose: evaluate common function * * * * Parameters: name - [IN] the function name (not zero terminated) * @@ -1851,8 +1793,6 @@ static int expression_eval_common(const char *name, size_t len, int args_num, co /****************************************************************************** * * - * Function: expression_eval_init * - * * * Purpose: initialize expression evaluation data * * * * Parameters: eval - [IN] the evaluation data * @@ -1906,8 +1846,6 @@ void zbx_expression_eval_init(zbx_expression_eval_t *eval, int mode, zbx_eval_co /****************************************************************************** * * - * Function: expression_eval_clear * - * * * Purpose: free resources allocated by expression evaluation data * * * * Parameters: eval - [IN] the evaluation data * @@ -1944,8 +1882,6 @@ void zbx_expression_eval_clear(zbx_expression_eval_t *eval) /****************************************************************************** * * - * Function: zbx_expression_eval_resolve_item_hosts * - * * * Purpose: resolve calculated item formula empty and macro host references * * (// , {HOST.HOST}) to host names * * * @@ -1991,8 +1927,6 @@ static void host_index_free(zbx_host_index_t *index) /****************************************************************************** * * - * Function: zbx_expression_eval_resolve_trigger_hosts * - * * * Purpose: resolve expression macro empty and macro host references * * (// , {HOST.HOST}, {HOST.HOST<N>}) to host names * * * @@ -2050,8 +1984,6 @@ void zbx_expression_eval_resolve_trigger_hosts(zbx_expression_eval_t *eval, cons /****************************************************************************** * * - * Function: zbx_expression_eval_execute * - * * * Purpose: execute expression containing history functions * * * * Parameters: eval - [IN] the evaluation data * diff --git a/src/libs/zbxserver/macrofunc.c b/src/libs/zbxserver/macrofunc.c index af9ed8791d3..49ab156b926 100644 --- a/src/libs/zbxserver/macrofunc.c +++ b/src/libs/zbxserver/macrofunc.c @@ -24,8 +24,6 @@ /****************************************************************************** * * - * Function: macrofunc_regsub * - * * * Purpose: calculates regular expression substitution * * * * Parameters: params - [IN] the function parameters * @@ -57,8 +55,6 @@ static int macrofunc_regsub(char **params, size_t nparam, char **out) /****************************************************************************** * * - * Function: macrofunc_iregsub * - * * * Purpose: calculates case insensitive regular expression substitution * * * * Parameters: params - [IN] the function parameters * @@ -90,8 +86,6 @@ static int macrofunc_iregsub(char **params, size_t nparam, char **out) /****************************************************************************** * * - * Function: macrofunc_fmttime * - * * * Purpose: time formatting macro function * * * * Parameters: params - [IN] the function parameters * @@ -181,8 +175,6 @@ static int macrofunc_fmttime(char **params, size_t nparam, char **out) /****************************************************************************** * * - * Function: macrofunc_fmtnum * - * * * Purpose: number formatting macro function * * * * Parameters: params - [IN] the function data * @@ -223,8 +215,6 @@ static int macrofunc_fmtnum(char **params, size_t nparam, char **out) /****************************************************************************** * * - * Function: zbx_calculate_macro_function * - * * * Purpose: calculates macro function value * * * * Parameters: expression - [IN] expression containing macro function * diff --git a/src/libs/zbxserver/zabbix_stats.c b/src/libs/zbxserver/zabbix_stats.c index 56183420cda..c40293b8cbb 100644 --- a/src/libs/zbxserver/zabbix_stats.c +++ b/src/libs/zbxserver/zabbix_stats.c @@ -32,8 +32,6 @@ extern unsigned char program_type; /****************************************************************************** * * - * Function: zbx_send_zabbix_stats * - * * * Purpose: collects all metrics required for Zabbix stats request * * * * Parameters: json - [OUT] the json data * diff --git a/src/libs/zbxserver/zabbix_stats_proxy.c b/src/libs/zbxserver/zabbix_stats_proxy.c index 8422af873d1..8f0c8e846c2 100644 --- a/src/libs/zbxserver/zabbix_stats_proxy.c +++ b/src/libs/zbxserver/zabbix_stats_proxy.c @@ -23,8 +23,6 @@ /****************************************************************************** * * - * Function: zbx_get_zabbix_stats_ext * - * * * Purpose: get program type (proxy) specific internal statistics * * * * Parameters: param1 - [IN/OUT] the json data * diff --git a/src/libs/zbxserver/zabbix_stats_server.c b/src/libs/zbxserver/zabbix_stats_server.c index f79b35f5e91..d03da23e792 100644 --- a/src/libs/zbxserver/zabbix_stats_server.c +++ b/src/libs/zbxserver/zabbix_stats_server.c @@ -31,8 +31,6 @@ /****************************************************************************** * * - * Function: zbx_get_zabbix_stats_ext * - * * * Purpose: get program type (server) specific internal statistics * * * * Parameters: param1 - [IN/OUT] the json data * diff --git a/src/libs/zbxserver/zabbix_users.c b/src/libs/zbxserver/zabbix_users.c index cf2769bfd61..f0832982a92 100644 --- a/src/libs/zbxserver/zabbix_users.c +++ b/src/libs/zbxserver/zabbix_users.c @@ -24,8 +24,6 @@ /****************************************************************************** * * - * Function: check_perm2system * - * * * Purpose: Check user permissions to access system * * * * Parameters: userid - user ID * @@ -75,8 +73,6 @@ char *get_user_timezone(zbx_uint64_t userid) /****************************************************************************** * * - * Function: zbx_check_user_administration_permissions * - * * * Purpose: check if the user has specific or default access for * * administration actions * * * diff --git a/src/libs/zbxsys/mutexs.c b/src/libs/zbxsys/mutexs.c index a55e0f4579b..5882ba1d6e7 100644 --- a/src/libs/zbxsys/mutexs.c +++ b/src/libs/zbxsys/mutexs.c @@ -57,8 +57,6 @@ static int shm_id, locks_disabled; /****************************************************************************** * * - * Function: zbx_locks_create * - * * * Purpose: if pthread mutexes and read-write locks can be shared between * * processes then create them, otherwise fallback to System V * * semaphore operations * @@ -194,8 +192,6 @@ void zbx_locks_destroy(void) /****************************************************************************** * * - * Function: zbx_mutex_addr_get * - * * * Purpose: acquire address of the mutex * * * * Parameters: mutex_name - name of the mutex to return address for * @@ -214,8 +210,6 @@ zbx_mutex_t zbx_mutex_addr_get(zbx_mutex_name_t mutex_name) /****************************************************************************** * * - * Function: zbx_mutex_addr_get * - * * * Purpose: acquire address of the rwlock * * * * Parameters: rwlock_name - name of the rwlock to return address for * @@ -234,8 +228,6 @@ zbx_rwlock_t zbx_rwlock_addr_get(zbx_rwlock_name_t rwlock_name) /****************************************************************************** * * - * Function: zbx_rwlock_create * - * * * Purpose: read-write locks are created using zbx_locks_create() function * * this is only to obtain handle, if read write locks are not * * supported, then outputs numeric handle of mutex that can be used * @@ -262,8 +254,6 @@ int zbx_rwlock_create(zbx_rwlock_t *rwlock, zbx_rwlock_name_t name, char **error #ifdef HAVE_PTHREAD_PROCESS_SHARED /****************************************************************************** * * - * Function: __zbx_rwlock_wrlock * - * * * Purpose: acquire write lock for read-write lock (exclusive access) * * * * Parameters: rwlock - handle of read-write lock * @@ -286,8 +276,6 @@ void __zbx_rwlock_wrlock(const char *filename, int line, zbx_rwlock_t rwlock) /****************************************************************************** * * - * Function: __zbx_rwlock_rdlock * - * * * Purpose: acquire read lock for read-write lock (there can be many readers) * * * * Parameters: rwlock - handle of read-write lock * @@ -310,8 +298,6 @@ void __zbx_rwlock_rdlock(const char *filename, int line, zbx_rwlock_t rwlock) /****************************************************************************** * * - * Function: __zbx_rwlock_unlock * - * * * Purpose: unlock read-write lock * * * * Parameters: rwlock - handle of read-write lock * @@ -334,8 +320,6 @@ void __zbx_rwlock_unlock(const char *filename, int line, zbx_rwlock_t rwlock) /****************************************************************************** * * - * Function: zbx_rwlock_destroy * - * * * Purpose: Destroy read-write lock * * * * Parameters: rwlock - handle of read-write lock * @@ -352,8 +336,6 @@ void zbx_rwlock_destroy(zbx_rwlock_t *rwlock) /****************************************************************************** * * - * Function: zbx_locks_disable * - * * * Purpose: disable locks * * * ******************************************************************************/ @@ -365,8 +347,6 @@ void zbx_locks_disable(void) /****************************************************************************** * * - * Function: zbx_locks_enable * - * * * Purpose: enable locks * * * ******************************************************************************/ @@ -381,8 +361,6 @@ void zbx_locks_enable(void) /****************************************************************************** * * - * Function: zbx_mutex_create * - * * * Purpose: Create the mutex * * * * Parameters: mutex - handle of mutex * @@ -416,8 +394,6 @@ int zbx_mutex_create(zbx_mutex_t *mutex, zbx_mutex_name_t name, char **error) /****************************************************************************** * * - * Function: zbx_mutex_lock * - * * * Purpose: Waits until the mutex is in the signalled state * * * * Parameters: mutex - handle of mutex * @@ -490,8 +466,6 @@ void __zbx_mutex_lock(const char *filename, int line, zbx_mutex_t mutex) /****************************************************************************** * * - * Function: zbx_mutex_unlock * - * * * Purpose: Unlock the mutex * * * * Parameters: mutex - handle of mutex * @@ -546,8 +520,6 @@ void __zbx_mutex_unlock(const char *filename, int line, zbx_mutex_t mutex) /****************************************************************************** * * - * Function: zbx_mutex_destroy * - * * * Purpose: Destroy the mutex * * * * Parameters: mutex - handle of mutex * @@ -570,8 +542,6 @@ void zbx_mutex_destroy(zbx_mutex_t *mutex) #ifdef _WINDOWS /****************************************************************************** * * - * Function: zbx_mutex_create_per_process_name * - * * * Purpose: Appends PID to the prefix of the mutex * * * * Parameters: prefix - mutex type * diff --git a/src/libs/zbxsys/threads.c b/src/libs/zbxsys/threads.c index d13ac89ce3c..f07bdaa78b3 100644 --- a/src/libs/zbxsys/threads.c +++ b/src/libs/zbxsys/threads.c @@ -45,8 +45,6 @@ void CALLBACK ZBXEndThread(ULONG_PTR dwParam) #else /****************************************************************************** * * - * Function: zbx_fork * - * * * Purpose: Flush stdout and stderr before forking * * * * Return value: same as system fork() function * @@ -63,8 +61,6 @@ int zbx_fork(void) /****************************************************************************** * * - * Function: zbx_child_fork * - * * * Purpose: fork from master process and set SIGCHLD handler * * * * Return value: same as system fork() function * @@ -102,8 +98,6 @@ void zbx_child_fork(pid_t *pid) /****************************************************************************** * * - * Function: zbx_thread_start * - * * * Purpose: Start the handled function as "thread" * * * * Parameters: handler - [IN] new thread starts execution from this * @@ -150,8 +144,6 @@ void zbx_thread_start(ZBX_THREAD_ENTRY_POINTER(handler), zbx_thread_args_t *thre /****************************************************************************** * * - * Function: zbx_thread_wait * - * * * Purpose: Waits until the "thread" is in the signalled state * * * * Parameters: "thread" handle * @@ -211,8 +203,6 @@ int zbx_thread_wait(ZBX_THREAD_HANDLE thread) /****************************************************************************** * * - * Function: threads_kill * - * * * Purpose: sends termination signal to "threads" * * * * Parameters: threads - [IN] handles to threads or processes * @@ -249,8 +239,6 @@ static void threads_kill(ZBX_THREAD_HANDLE *threads, int threads_num, const int /****************************************************************************** * * - * Function: zbx_threads_wait * - * * * Purpose: Waits until the "threads" are in the signalled state * * * * Parameters: "threads" handles * diff --git a/src/libs/zbxsysinfo/agent/modbus.c b/src/libs/zbxsysinfo/agent/modbus.c index b551acba221..1b979bba845 100644 --- a/src/libs/zbxsysinfo/agent/modbus.c +++ b/src/libs/zbxsysinfo/agent/modbus.c @@ -127,8 +127,6 @@ static void set_serial_params_default(zbx_modbus_connection_serial *serial_param /****************************************************************************** * * - * Function: result_to_str * - * * * Purpose: converts result to a string * * * * Parameters: buf - [IN] modbus data * @@ -227,8 +225,6 @@ end: /****************************************************************************** * * - * Function: result_to_str_bit * - * * * Purpose: converts bits result to a string * * * * Parameters: buf8 - [IN] modbus data * @@ -254,8 +250,6 @@ static char *result_to_str_bit(uint8_t *buf8, unsigned short count) /****************************************************************************** * * - * Function: set_result * - * * * Purpose: set result * * * * Parameters: buf - [IN] modbus data * @@ -311,8 +305,6 @@ static void set_result(uint16_t *buf, modbus_datatype_t type, modbus_endianness_ /****************************************************************************** * * - * Function: get_total_count * - * * * Purpose: get total count of bits/registers plus offset * * * * Parameters: count - [IN] count of sequenced same data type values to * @@ -354,8 +346,6 @@ static unsigned int get_total_count(unsigned short count, unsigned short offset, /****************************************************************************** * * - * Function: parse_params * - * * * Purpose: parse serial connection parameters * * * * Parameters: params - [IN] string holding parameters * @@ -394,8 +384,6 @@ static int parse_params(char *params, zbx_modbus_connection_serial *serial_param /****************************************************************************** * * - * Function: endpoint_parse * - * * * Purpose: parse endpoint * * * * Parameters: endpoint_str - [IN] string holding endpoint * @@ -483,8 +471,6 @@ static int endpoint_parse(char *endpoint_str, zbx_modbus_endpoint_t *endpoint) /****************************************************************************** * * - * Function: modbus_read_data * - * * * Purpose: request and read modbus data * * * * Parameters: endpoint - [IN] endpoint * @@ -856,8 +842,6 @@ err: /****************************************************************************** * * - * Function: zbx_init_modbus * - * * * Purpose: create modbus mutex * * * * Parameters: error - [OUT] error message in case of failure * diff --git a/src/libs/zbxsysinfo/common/dir.c b/src/libs/zbxsysinfo/common/dir.c index af69f35d47a..b6175814f42 100644 --- a/src/libs/zbxsysinfo/common/dir.c +++ b/src/libs/zbxsysinfo/common/dir.c @@ -29,8 +29,6 @@ /****************************************************************************** * * - * Function: filename_matches * - * * * Purpose: checks if filename matches the include-regexp and doesn't match * * the exclude-regexp * * * @@ -52,8 +50,6 @@ static int filename_matches(const char *fname, const zbx_regexp_t *regex_incl, c /****************************************************************************** * * - * Function: queue_directory * - * * * Purpose: adds directory to processing queue after checking if current * * depth is less than 'max_depth' * * * @@ -88,8 +84,6 @@ static int queue_directory(zbx_vector_ptr_t *list, char *path, int depth, int ma /****************************************************************************** * * - * Function: compare_descriptors * - * * * Purpose: compares two zbx_file_descriptor_t values to perform search * * within descriptor vector * * * @@ -415,8 +409,6 @@ static void descriptors_vector_destroy(zbx_vector_ptr_t *descriptors) /****************************************************************************** * * - * Function: has_timed_out * - * * * Purpose: Checks if timeout has occurred. If it is, thread should * * immediately stop whatever it is doing, clean up everything and * * return SYSINFO_RET_FAIL. * @@ -866,8 +858,6 @@ int VFS_DIR_SIZE(AGENT_REQUEST *request, AGENT_RESULT *result) /****************************************************************************** * * - * Function: vfs_dir_info * - * * * Purpose: counts or lists files in directory, subject to regexp, type and * * depth filters * * * diff --git a/src/libs/zbxsysinfo/common/system.c b/src/libs/zbxsysinfo/common/system.c index c8a9c7561ea..09c8a526a41 100644 --- a/src/libs/zbxsysinfo/common/system.c +++ b/src/libs/zbxsysinfo/common/system.c @@ -27,8 +27,6 @@ /****************************************************************************** * * - * Function: SYSTEM_LOCALTIME * - * * * Comments: Thread-safe * * * ******************************************************************************/ diff --git a/src/libs/zbxsysinfo/common/zabbix_stats.c b/src/libs/zbxsysinfo/common/zabbix_stats.c index ecfd49d22ce..aea44ac7a1a 100644 --- a/src/libs/zbxsysinfo/common/zabbix_stats.c +++ b/src/libs/zbxsysinfo/common/zabbix_stats.c @@ -25,8 +25,6 @@ /****************************************************************************** * * - * Function: check_response * - * * * Purpose: Check whether JSON response is "success" or "failed" * * * * Parameters: response - [IN] the request * @@ -68,8 +66,6 @@ static int check_response(const char *response, AGENT_RESULT *result) /****************************************************************************** * * - * Function: get_remote_zabbix_stats * - * * * Purpose: send Zabbix stats request and receive the result data * * * * Parameters: json - [IN] the request * @@ -121,8 +117,6 @@ static void get_remote_zabbix_stats(const struct zbx_json *json, const char *ip, /****************************************************************************** * * - * Function: zbx_get_remote_zabbix_stats * - * * * Purpose: create Zabbix stats request * * * * Parameters: ip - [IN] external Zabbix instance hostname * @@ -149,8 +143,6 @@ int zbx_get_remote_zabbix_stats(const char *ip, unsigned short port, AGENT_RESUL /****************************************************************************** * * - * Function: zbx_get_remote_zabbix_stats_queue * - * * * Purpose: create Zabbix stats queue request * * * * Parameters: ip - [IN] external Zabbix instance hostname * diff --git a/src/libs/zbxsysinfo/linux/net.c b/src/libs/zbxsysinfo/linux/net.c index 4b0ad6c8e22..0478592f09a 100644 --- a/src/libs/zbxsysinfo/linux/net.c +++ b/src/libs/zbxsysinfo/linux/net.c @@ -294,8 +294,6 @@ static int get_net_stat(const char *if_name, net_stat_t *result, char **error) /****************************************************************************** * * - * Function: proc_read_tcp_listen * - * * * Purpose: reads /proc/net/tcp(6) file by chunks until the last line in * * in buffer has non-listening socket state * * * @@ -379,8 +377,6 @@ out: /****************************************************************************** * * - * Function: proc_read_file * - * * * Purpose: reads whole file into a buffer in a single read operation * * * * Parameters: filename - [IN] the file to read * diff --git a/src/libs/zbxsysinfo/linux/proc.c b/src/libs/zbxsysinfo/linux/proc.c index a79627a174f..e8d19c2cc8b 100644 --- a/src/libs/zbxsysinfo/linux/proc.c +++ b/src/libs/zbxsysinfo/linux/proc.c @@ -43,8 +43,6 @@ zbx_sysinfo_proc_t; /****************************************************************************** * * - * Function: zbx_sysinfo_proc_free * - * * * Purpose: frees process data structure * * * ******************************************************************************/ @@ -237,8 +235,6 @@ static int check_procstate(FILE *f_stat, int zbx_proc_stat) /****************************************************************************** * * - * Function: byte_value_from_proc_file * - * * * Purpose: Read amount of memory in bytes from a string in /proc file. * * For example, reading "VmSize: 176712 kB" from /proc/1/status * * will produce a result 176712*1024 = 180953088 bytes * @@ -833,8 +829,6 @@ out: /****************************************************************************** * * - * Function: proc_get_process_name * - * * * Purpose: returns process name * * * * Parameters: pid - [IN] the process identifier * @@ -878,8 +872,6 @@ static int proc_get_process_name(pid_t pid, char **procname) /****************************************************************************** * * - * Function: proc_get_process_cmdline * - * * * Purpose: returns process command line * * * * Parameters: pid - [IN] the process identifier * @@ -945,8 +937,6 @@ static int proc_get_process_cmdline(pid_t pid, char **cmdline, size_t *cmdline_n /****************************************************************************** * * - * Function: proc_get_process_uid * - * * * Purpose: returns process user identifier * * * * Parameters: pid - [IN] the process identifier * @@ -973,8 +963,6 @@ static int proc_get_process_uid(pid_t pid, uid_t *uid) /****************************************************************************** * * - * Function: proc_read_value * - * * * Purpose: read 64 bit unsigned space or zero character terminated integer * * from a text string * * * @@ -1002,8 +990,6 @@ static int proc_read_value(const char *ptr, zbx_uint64_t *value) /****************************************************************************** * * - * Function: proc_read_cpu_util * - * * * Purpose: reads process cpu utilization values from /proc/[pid]/stat file * * * * Parameters: procutil - [IN/OUT] the process cpu utilization data * @@ -1085,8 +1071,6 @@ out: /****************************************************************************** * * - * Function: proc_match_name * - * * * Purpose: checks if the process name matches filter * * * ******************************************************************************/ @@ -1106,8 +1090,6 @@ static int proc_match_name(const zbx_sysinfo_proc_t *proc, const char *procname) /****************************************************************************** * * - * Function: proc_match_user * - * * * Purpose: checks if the process user matches filter * * * ******************************************************************************/ @@ -1124,8 +1106,6 @@ static int proc_match_user(const zbx_sysinfo_proc_t *proc, const struct passwd * /****************************************************************************** * * - * Function: proc_match_cmdline * - * * * Purpose: checks if the process command line matches filter * * * ******************************************************************************/ @@ -1142,8 +1122,6 @@ static int proc_match_cmdline(const zbx_sysinfo_proc_t *proc, const char *cmdlin /****************************************************************************** * * - * Function: zbx_proc_get_process_stats * - * * * Purpose: get process cpu utilization data * * * * Parameters: procs - [IN/OUT] an array of process utilization data * @@ -1164,8 +1142,6 @@ void zbx_proc_get_process_stats(zbx_procstat_util_t *procs, int procs_num) /****************************************************************************** * * - * Function: proc_create * - * * * Purpose: create process object with the specified properties * * * * Parameters: pid - [IN] the process identifier * @@ -1238,8 +1214,6 @@ out: /****************************************************************************** * * - * Function: zbx_proc_get_processes * - * * * Purpose: get system processes * * * * Parameters: processes - [OUT] the system processes * @@ -1286,8 +1260,6 @@ out: /****************************************************************************** * * - * Function: zbx_proc_free_processes * - * * * Purpose: frees process vector read by zbx_proc_get_processes function * * * * Parameters: processes - [IN/OUT] the process vector to free * @@ -1300,8 +1272,6 @@ void zbx_proc_free_processes(zbx_vector_ptr_t *processes) /****************************************************************************** * * - * Function: zbx_proc_get_matching_pids * - * * * Purpose: get pids matching the specified process name, user name and * * command line * * * diff --git a/src/libs/zbxsysinfo/linux/sensors.c b/src/libs/zbxsysinfo/linux/sensors.c index 80a20104069..99c51f49adf 100644 --- a/src/libs/zbxsysinfo/linux/sensors.c +++ b/src/libs/zbxsysinfo/linux/sensors.c @@ -78,8 +78,6 @@ static void count_sensor(int do_task, const char *filename, double *aggr, int *c #ifndef KERNEL_2_4 /********************************************************************************* * * - * Function: sysfs_read_attr * - * * * Purpose: locate and read the name attribute of a sensor from sysfs * * * * Parameters: device - [IN] the path to sensor data in sysfs * diff --git a/src/libs/zbxsysinfo/solaris/proc.c b/src/libs/zbxsysinfo/solaris/proc.c index 250e9f35137..7980abed464 100644 --- a/src/libs/zbxsysinfo/solaris/proc.c +++ b/src/libs/zbxsysinfo/solaris/proc.c @@ -55,8 +55,6 @@ zbx_sysinfo_proc_t; /****************************************************************************** * * - * Function: zbx_solaris_version_get * - * * * Purpose: get Solaris version at runtime * * * * Parameters: * @@ -93,8 +91,6 @@ static int zbx_solaris_version_get(unsigned int *major_version, unsigned int *mi /****************************************************************************** * * - * Function: zbx_detect_zone_support * - * * * Purpose: find if zones are supported * * * * Return value: * @@ -145,8 +141,6 @@ static void zbx_sysinfo_proc_clear(zbx_sysinfo_proc_t *proc) /****************************************************************************** * * - * Function: zbx_sysinfo_proc_free * - * * * Purpose: frees process data structure * * * ******************************************************************************/ @@ -211,8 +205,6 @@ static int get_cmdline(FILE *f_cmd, char **line, size_t *line_offset) /****************************************************************************** * * - * Function: proc_get_process_info * - * * * Purpose: get single process information * * * * Parameters: pid - [IN] the process pid * @@ -302,8 +294,6 @@ static int proc_get_process_info(const char *pid, unsigned int flags, zbx_sysinf /****************************************************************************** * * - * Function: proc_match_name * - * * * Purpose: checks if the process name matches filter * * * ******************************************************************************/ @@ -323,8 +313,6 @@ static int proc_match_name(const zbx_sysinfo_proc_t *proc, const char *procname) /****************************************************************************** * * - * Function: proc_match_user * - * * * Purpose: checks if the process user matches filter * * * ******************************************************************************/ @@ -341,8 +329,6 @@ static int proc_match_user(const zbx_sysinfo_proc_t *proc, const struct passwd * /****************************************************************************** * * - * Function: proc_match_cmdline * - * * * Purpose: checks if the process command line matches filter * * * ******************************************************************************/ @@ -360,8 +346,6 @@ static int proc_match_cmdline(const zbx_sysinfo_proc_t *proc, const char *cmdlin #ifdef HAVE_ZONE_H /****************************************************************************** * * - * Function: proc_match_zone * - * * * Purpose: checks if the process zone matches filter * * * ******************************************************************************/ @@ -379,8 +363,6 @@ static int proc_match_zone(const zbx_sysinfo_proc_t *proc, zbx_uint64_t flags, z /****************************************************************************** * * - * Function: proc_match_props * - * * * Purpose: checks if the process properties (except zone) matches filter * * * ******************************************************************************/ @@ -706,8 +688,6 @@ out: /****************************************************************************** * * - * Function: proc_read_cpu_util * - * * * Purpose: reads process cpu utilization values from /proc/[pid]/usage file * * * * Parameters: procutil - [IN/OUT] the process cpu utilization data * @@ -771,8 +751,6 @@ static int proc_read_cpu_util(zbx_procstat_util_t *procutil) /****************************************************************************** * * - * Function: zbx_proc_get_process_stats * - * * * Purpose: get process cpu utilization data * * * * Parameters: procs - [IN/OUT] an array of process utilization data * @@ -793,8 +771,6 @@ void zbx_proc_get_process_stats(zbx_procstat_util_t *procs, int procs_num) /****************************************************************************** * * - * Function: zbx_proc_get_processes * - * * * Purpose: get system processes * * * * Parameters: processes - [OUT] the system processes * @@ -844,8 +820,6 @@ out: /****************************************************************************** * * - * Function: zbx_proc_free_processes * - * * * Purpose: frees process vector read by zbx_proc_get_processes function * * * * Parameters: processes - [IN/OUT] the process vector to free * @@ -858,8 +832,6 @@ void zbx_proc_free_processes(zbx_vector_ptr_t *processes) /****************************************************************************** * * - * Function: zbx_proc_get_matching_pids * - * * * Purpose: get pids matching the specified process name, user name and * * command line * * * diff --git a/src/libs/zbxsysinfo/solaris/swap.c b/src/libs/zbxsysinfo/solaris/swap.c index 8d88853f327..54def653b64 100644 --- a/src/libs/zbxsysinfo/solaris/swap.c +++ b/src/libs/zbxsysinfo/solaris/swap.c @@ -23,8 +23,6 @@ /****************************************************************************** * * - * Function: get_swapinfo * - * * * Purpose: get swap usage statistics * * * * Return value: SUCCEED if swap usage statistics retrieved successfully * diff --git a/src/libs/zbxsysinfo/sysinfo.c b/src/libs/zbxsysinfo/sysinfo.c index 7dfa81c2464..fd7cc45b94b 100644 --- a/src/libs/zbxsysinfo/sysinfo.c +++ b/src/libs/zbxsysinfo/sysinfo.c @@ -76,8 +76,6 @@ static int parse_key_access_rule(char *pattern, zbx_key_access_rule_t *rule); /****************************************************************************** * * - * Function: parse_command_dyn * - * * * Purpose: parses item key and splits it into command and parameters * * * * Return value: ZBX_COMMAND_ERROR - error * @@ -143,8 +141,6 @@ static int add_to_metrics(ZBX_METRIC **metrics, ZBX_METRIC *metric, char *error, /****************************************************************************** * * - * Function: add_metric * - * * * Purpose: registers a new item key into the system * * * ******************************************************************************/ @@ -155,8 +151,6 @@ int add_metric(ZBX_METRIC *metric, char *error, size_t max_error_len) /****************************************************************************** * * - * Function: add_metric_local * - * * * Purpose: registers a new item key as local into the system * * * ******************************************************************************/ @@ -374,8 +368,6 @@ void free_metrics(void) /****************************************************************************** * * - * Function: init_key_access_rules * - * * * Purpose: initializes key access rule list * * * ******************************************************************************/ @@ -386,8 +378,6 @@ void init_key_access_rules(void) /****************************************************************************** * * - * Function: zbx_key_access_rule_free * - * * * Purpose: frees key access rule and its resources * * * ******************************************************************************/ @@ -401,8 +391,6 @@ static void zbx_key_access_rule_free(zbx_key_access_rule_t *rule) /****************************************************************************** * * - * Function: zbx_key_access_rule_create * - * * * Purpose: creates key access rule * * * * Parameters: pattern - [IN] the rule pattern * @@ -430,8 +418,6 @@ static zbx_key_access_rule_t *zbx_key_access_rule_create(char *pattern, zbx_key_ /****************************************************************************** * * - * Function: finalize_key_access_rules_configuration * - * * * Purpose: validates key access rules configuration * * * ******************************************************************************/ @@ -527,8 +513,6 @@ void finalize_key_access_rules_configuration(void) /****************************************************************************** * * - * Function: parse_key_access_rule * - * * * Purpose: parses key access rule expression from AllowKey and DenyKey * * * * Parameters: pattern - [IN] key access rule wildcard * @@ -605,8 +589,6 @@ static int parse_key_access_rule(char *pattern, zbx_key_access_rule_t *rule) /****************************************************************************** * * - * Function: compare_key_access_rules * - * * * Purpose: Compares two zbx_key_access_rule_t values to perform search * * within vector. Rule type (allow/deny) is not checked here. * * * @@ -639,8 +621,6 @@ static int compare_key_access_rules(const void *rule_a, const void *rule_b) /****************************************************************************** * * - * Function: add_key_access_rule * - * * * Purpose: adds new key access rule from AllowKey and DenyKey parameters * * * * Parameters: parameter - [IN] the parameter that defined the rule * @@ -682,8 +662,6 @@ int add_key_access_rule(const char *parameter, char *pattern, zbx_key_access_rul /****************************************************************************** * * - * Function: check_request_access_rules * - * * * Purpose: checks agent metric request against configured access rules * * * * Parameters: request - [IN] metric request (key and parameters) * @@ -768,8 +746,6 @@ int check_request_access_rules(AGENT_REQUEST *request) /****************************************************************************** * * - * Function: check_key_access_rules * - * * * Purpose: checks agent metric request against configured access rules * * * * Parameters: metric - [IN] metric requested (key and parameters) * @@ -797,8 +773,6 @@ int check_key_access_rules(const char *metric) /****************************************************************************** * * - * Function: free_key_access_rules * - * * * Purpose: cleanup key access rule list * * * ******************************************************************************/ @@ -850,8 +824,6 @@ void free_result(AGENT_RESULT *result) /****************************************************************************** * * - * Function: init_request * - * * * Purpose: initialize the request structure * * * * Parameters: request - pointer to the structure * @@ -869,8 +841,6 @@ void init_request(AGENT_REQUEST *request) /****************************************************************************** * * - * Function: free_request_params * - * * * Purpose: free memory used by the request parameters * * * * Parameters: request - pointer to the request structure * @@ -890,8 +860,6 @@ static void free_request_params(AGENT_REQUEST *request) /****************************************************************************** * * - * Function: free_request * - * * * Purpose: free memory used by the request * * * * Parameters: request - pointer to the request structure * @@ -905,8 +873,6 @@ void free_request(AGENT_REQUEST *request) /****************************************************************************** * * - * Function: add_request_param * - * * * Purpose: add a new parameter * * * * Parameters: request - [OUT] pointer to the request structure * @@ -926,8 +892,6 @@ static void add_request_param(AGENT_REQUEST *request, char *pvalue, zbx_request_ /****************************************************************************** * * - * Function: parse_item_key * - * * * Purpose: parse item command (key) and fill AGENT_REQUEST structure * * * * Parameters: itemkey - complete item key * @@ -1136,8 +1100,6 @@ static int replace_param(const char *cmd, const AGENT_REQUEST *request, char **o /****************************************************************************** * * - * Function: process * - * * * Purpose: execute agent check * * * * Parameters: in_command - item key * @@ -1502,8 +1464,6 @@ static zbx_log_t *get_result_log_value(AGENT_RESULT *result) /****************************************************************************** * * - * Function: get_result_value_by_type * - * * * Purpose: return value of result in special type * * if value missing, convert existing value to requested type * * * @@ -1552,8 +1512,6 @@ void *get_result_value_by_type(AGENT_RESULT *result, int require_type) /****************************************************************************** * * - * Function: unquote_key_param * - * * * Purpose: unquotes special symbols in item key parameter * * * * Parameters: param - [IN/OUT] item key parameter * @@ -1582,8 +1540,6 @@ void unquote_key_param(char *param) /****************************************************************************** * * - * Function: quote_key_param * - * * * Purpose: quotes special symbols in item key parameter * * * * Parameters: param - [IN/OUT] item key parameter * @@ -1662,8 +1618,6 @@ int zbx_execute_threaded_metric(zbx_metric_func_t metric_func, AGENT_REQUEST *re #else /****************************************************************************** * * - * Function: serialize_agent_result * - * * * Purpose: serialize agent result to transfer over pipe/socket * * * * Parameters: data - [IN/OUT] the data buffer * @@ -1749,8 +1703,6 @@ static void serialize_agent_result(char **data, size_t *data_alloc, size_t *data /****************************************************************************** * * - * Function: deserialize_agent_result * - * * * Purpose: deserialize agent result * * * * Parameters: data - [IN] the data to deserialize * @@ -1799,8 +1751,6 @@ static int deserialize_agent_result(char *data, AGENT_RESULT *result) /****************************************************************************** * * - * Function: zbx_execute_threaded_metric * - * * * Purpose: execute metric in a separate process/thread so it can be * * killed/terminated when timeout is detected * * * @@ -1974,8 +1924,6 @@ ZBX_THREAD_ENTRY(agent_metric_thread, data) /****************************************************************************** * * - * Function: zbx_execute_threaded_metric * - * * * Purpose: execute metric in a separate process/thread so it can be * * killed/terminated when timeout is detected * * * @@ -2085,8 +2033,6 @@ int zbx_execute_threaded_metric(zbx_metric_func_t metric_func, AGENT_REQUEST *re /****************************************************************************** * * - * Function: zbx_mpoints_free * - * * * Purpose: frees previously allocated mount-point structure * * * * Parameters: mpoint - [IN] pointer to structure from vector * diff --git a/src/libs/zbxsysinfo/win32/cpu.c b/src/libs/zbxsysinfo/win32/cpu.c index 7ffe1834d54..b4f9d55ab6a 100644 --- a/src/libs/zbxsysinfo/win32/cpu.c +++ b/src/libs/zbxsysinfo/win32/cpu.c @@ -32,8 +32,6 @@ static GETLPIEX get_lpiex; /****************************************************************************** * * - * Function: get_cpu_num_win32 * - * * * Purpose: find number of active logical CPUs * * * * Return value: number of CPUs or 0 on failure * @@ -127,8 +125,6 @@ finish: /****************************************************************************** * * - * Function: get_cpu_group_num_win32 * - * * * Purpose: returns the number of active processor groups * * * * Return value: number of groups, 1 if groups are not supported * @@ -167,8 +163,6 @@ int get_cpu_group_num_win32(void) /****************************************************************************** * * - * Function: get_numa_node_count_win32 * - * * * Purpose: returns the number of NUMA nodes * * * * Return value: number of NUMA nodes, 1 if NUMA not supported * diff --git a/src/libs/zbxsysinfo/win32/net.c b/src/libs/zbxsysinfo/win32/net.c index 9da8d2fc589..b9fdb6d4bbf 100644 --- a/src/libs/zbxsysinfo/win32/net.c +++ b/src/libs/zbxsysinfo/win32/net.c @@ -46,8 +46,6 @@ zbx_ifrow_t; /****************************************************************************** * * - * Function: zbx_ifrow_init * - * * * Purpose: initialize the zbx_ifrow_t variable * * * * Parameters: * @@ -93,8 +91,6 @@ static void zbx_ifrow_init(zbx_ifrow_t *pIfRow) /****************************************************************************** * * - * Function: zbx_ifrow_clean * - * * * Purpose: clean the zbx_ifrow_t variable * * * * Parameters: * @@ -111,8 +107,6 @@ static void zbx_ifrow_clean(zbx_ifrow_t *pIfRow) /****************************************************************************** * * - * Function: zbx_ifrow_call_get_if_entry * - * * * Purpose: call either GetIfEntry() or GetIfEntry2() based on the Windows * * release to fill the passed MIB interface structure. * * * @@ -264,8 +258,6 @@ static ULONG64 zbx_ifrow_get_out_discards(const zbx_ifrow_t *pIfRow) /****************************************************************************** * * - * Function: zbx_ifrow_get_utf8_description * - * * * Purpose: returns interface description encoded in UTF-8 format * * * * Parameters: * @@ -307,8 +299,6 @@ static char *zbx_ifrow_get_utf8_description(const zbx_ifrow_t *pIfRow) /****************************************************************************** * * - * Function: zbx_ifrow_get_guid_str * - * * * Purpose: returns interface GUID in string format * * * * Parameters: * diff --git a/src/libs/zbxsysinfo/win32/services.c b/src/libs/zbxsysinfo/win32/services.c index 808db5ab9a6..f6e910de653 100644 --- a/src/libs/zbxsysinfo/win32/services.c +++ b/src/libs/zbxsysinfo/win32/services.c @@ -39,8 +39,6 @@ zbx_startup_type_t; /****************************************************************************** * * - * Function: get_state_code * - * * * Purpose: convert service state code from value used in Microsoft Windows * * to value used in Zabbix * * * @@ -119,8 +117,6 @@ static void log_if_buffer_too_small(const char *function_name, DWORD sz) /****************************************************************************** * * - * Function: zbx_get_service_config * - * * * Purpose: wrapper function around QueryServiceConfig() * * * * Parameters: * @@ -146,8 +142,6 @@ static int zbx_get_service_config(SC_HANDLE hService, LPQUERY_SERVICE_CONFIG buf /****************************************************************************** * * - * Function: zbx_get_service_config2 * - * * * Purpose: wrapper function around QueryServiceConfig2() * * * * Parameters: * diff --git a/src/libs/zbxsysinfo/win32/system.c b/src/libs/zbxsysinfo/win32/system.c index 8a19ace9ad5..72fe68d4ace 100644 --- a/src/libs/zbxsysinfo/win32/system.c +++ b/src/libs/zbxsysinfo/win32/system.c @@ -26,8 +26,6 @@ /****************************************************************************** * * - * Function: read_registry_value * - * * * Purpose: read value from Windows registry * * * ******************************************************************************/ @@ -48,8 +46,6 @@ static wchar_t *read_registry_value(HKEY hKey, LPCTSTR name) /****************************************************************************** * * - * Function: zbx_win_getversion * - * * * Purpose: get Windows version information * * * ******************************************************************************/ diff --git a/src/libs/zbxtasks/task.c b/src/libs/zbxtasks/task.c index c96f4492da7..e4d9ca4f86a 100644 --- a/src/libs/zbxtasks/task.c +++ b/src/libs/zbxtasks/task.c @@ -28,8 +28,6 @@ /****************************************************************************** * * - * Function: tm_remote_command_clear * - * * * Purpose: frees remote command task resources * * * * Parameters: data - [IN] the remote command task data * @@ -46,8 +44,6 @@ static void tm_remote_command_clear(zbx_tm_remote_command_t *data) /****************************************************************************** * * - * Function: tm_remote_command_result_clear * - * * * Purpose: frees remote command result task resources * * * * Parameters: data - [IN] the remote command result task data * @@ -60,8 +56,6 @@ static void tm_remote_command_result_clear(zbx_tm_remote_command_result_t *data) /****************************************************************************** * * - * Function: tm_data_result_clear * - * * * Purpose: frees data result task resources * * * * Parameters: data - [IN] the data result task data * @@ -74,8 +68,6 @@ static void tm_data_result_clear(zbx_tm_data_result_t *data) /****************************************************************************** * * - * Function: tm_data_clear * - * * * Purpose: frees data task resources * * * * Parameters: data - [IN] the data task * @@ -88,8 +80,6 @@ static void tm_data_clear(zbx_tm_data_t *data) /****************************************************************************** * * - * Function: zbx_tm_task_clear * - * * * Purpose: frees task resources * * * * Parameters: task - [IN] * @@ -127,8 +117,6 @@ void zbx_tm_task_clear(zbx_tm_task_t *task) /****************************************************************************** * * - * Function: zbx_tm_task_free * - * * * Purpose: frees task and its resources * * * * Parameters: task - [IN] the task to free * @@ -142,8 +130,6 @@ void zbx_tm_task_free(zbx_tm_task_t *task) /****************************************************************************** * * - * Function: zbx_tm_remote_command_create * - * * * Purpose: create a remote command task data * * * * Parameters: command_type - [IN] the remote command type (ZBX_SCRIPT_TYPE_)* @@ -187,8 +173,6 @@ zbx_tm_remote_command_t *zbx_tm_remote_command_create(int command_type, const ch /****************************************************************************** * * - * Function: zbx_tm_remote_command_result_create * - * * * Purpose: create a remote command result task data * * * * Parameters: parent_taskid - [IN] the parent task identifier * @@ -213,8 +197,6 @@ zbx_tm_remote_command_result_t *zbx_tm_remote_command_result_create(zbx_uint64_t /****************************************************************************** * * - * Function: zbx_tm_check_now_create * - * * * Purpose: create a check now task data * * * * Parameters: itemid - [IN] the item identifier * @@ -234,8 +216,6 @@ zbx_tm_check_now_t *zbx_tm_check_now_create(zbx_uint64_t itemid) /****************************************************************************** * * - * Function: zbx_tm_data_create * - * * * Purpose: create a data task * * * * Parameters: parent_taskid - [IN] parent task identifier * @@ -262,8 +242,6 @@ zbx_tm_data_t *zbx_tm_data_create(zbx_uint64_t parent_taskid, const char *str, i /****************************************************************************** * * - * Function: zbx_tm_data_result_create * - * * * Purpose: create a data result task data * * * * Parameters: parent_taskid - [IN] the parent task identifier * @@ -287,8 +265,6 @@ zbx_tm_data_result_t *zbx_tm_data_result_create(zbx_uint64_t parent_taskid, int /****************************************************************************** * * - * Function: zbx_tm_task_create * - * * * Purpose: create a new task * * * * Parameters: taskid - [IN] the task identifier * @@ -321,8 +297,6 @@ zbx_tm_task_t *zbx_tm_task_create(zbx_uint64_t taskid, unsigned char type, unsig /****************************************************************************** * * - * Function: tm_save_remote_command_tasks * - * * * Purpose: saves remote command task data in database * * * * Parameters: tasks - [IN] the tasks * @@ -367,8 +341,6 @@ static int tm_save_remote_command_tasks(zbx_tm_task_t **tasks, int tasks_num) /****************************************************************************** * * - * Function: tm_save_remote_command_result_tasks * - * * * Purpose: saves remote command result task data in database * * * * Parameters: tasks - [IN] the tasks * @@ -410,8 +382,6 @@ static int tm_save_remote_command_result_tasks(zbx_tm_task_t **tasks, int tasks_ /****************************************************************************** * * - * Function: tm_save_check_now_tasks * - * * * Purpose: saves remote command task data in database * * * * Parameters: tasks - [IN] the tasks * @@ -451,8 +421,6 @@ static int tm_save_check_now_tasks(zbx_tm_task_t **tasks, int tasks_num) /****************************************************************************** * * - * Function: tm_save_data_tasks * - * * * Purpose: saves data task in database * * * * Parameters: tasks - [IN] the tasks * @@ -493,8 +461,6 @@ static int tm_save_data_tasks(zbx_tm_task_t **tasks, int tasks_num) /****************************************************************************** * * - * Function: tm_save_data_result_tasks * - * * * Purpose: saves data task result in database * * * * Parameters: tasks - [IN] the tasks * @@ -535,8 +501,6 @@ static int tm_save_data_result_tasks(zbx_tm_task_t **tasks, int tasks_num) /****************************************************************************** * * - * Function: tm_save_tasks * - * * * Purpose: saves tasks into database * * * * Parameters: tasks - [IN] the tasks * @@ -624,8 +588,6 @@ static int tm_save_tasks(zbx_tm_task_t **tasks, int tasks_num) /****************************************************************************** * * - * Function: zbx_tm_save_tasks * - * * * Purpose: saves tasks and their data into database * * * * Parameters: tasks - [IN] the tasks * @@ -642,8 +604,6 @@ void zbx_tm_save_tasks(zbx_vector_ptr_t *tasks) /****************************************************************************** * * - * Function: zbx_tm_save_task * - * * * Purpose: saves task and its data into database * * * * Parameters: task - [IN] the task * @@ -667,8 +627,6 @@ int zbx_tm_save_task(zbx_tm_task_t *task) /****************************************************************************** * * - * Function: zbx_tm_update_task_status * - * * * Purpose: update status of the specified tasks in database * * * * Parameters: tasks - [IN] the tasks * @@ -706,8 +664,6 @@ void zbx_tm_update_task_status(zbx_vector_ptr_t *tasks, int status) /****************************************************************************** * * - * Function: tm_json_serialize_task * - * * * Purpose: serializes common task data in json format * * * * Parameters: json - [OUT] the json data * @@ -723,8 +679,6 @@ static void tm_json_serialize_task(struct zbx_json *json, const zbx_tm_task_t *t /****************************************************************************** * * - * Function: tm_json_serialize_remote_command * - * * * Purpose: serializes remote command data in json format * * * * Parameters: json - [OUT] the json data * @@ -749,8 +703,6 @@ static void tm_json_serialize_remote_command(struct zbx_json *json, const zbx_tm /****************************************************************************** * * - * Function: tm_json_serialize_remote_command_result * - * * * Purpose: serializes remote command result data in json format * * * * Parameters: json - [OUT] the json data * @@ -767,8 +719,6 @@ static void tm_json_serialize_remote_command_result(struct zbx_json *json, /****************************************************************************** * * - * Function: tm_json_serialize_check_now * - * * * Purpose: serializes check now data in json format * * * * Parameters: json - [OUT] the json data * @@ -782,8 +732,6 @@ static void tm_json_serialize_check_now(struct zbx_json *json, const zbx_tm_chec /****************************************************************************** * * - * Function: tm_json_serialize_data * - * * * Purpose: serializes data task in json format * * * * Parameters: json - [OUT] the json data * @@ -799,8 +747,6 @@ static void tm_json_serialize_data(struct zbx_json *json, const zbx_tm_data_t *d /****************************************************************************** * * - * Function: tm_json_serialize_data_result * - * * * Purpose: serializes data task result in json format * * * * Parameters: json - [OUT] the json data * @@ -816,8 +762,6 @@ static void tm_json_serialize_data_result(struct zbx_json *json, const zbx_tm_da /****************************************************************************** * * - * Function: zbx_tm_json_serialize_tasks * - * * * Purpose: serializes remote command data in json format * * * * Parameters: json - [OUT] the json data * @@ -867,8 +811,6 @@ void zbx_tm_json_serialize_tasks(struct zbx_json *json, const zbx_vector_ptr_t * /****************************************************************************** * * - * Function: tm_json_deserialize_remote_command * - * * * Purpose: deserializes remote command from json data * * * * Parameters: jp - [IN] the json data * @@ -955,8 +897,6 @@ out: /****************************************************************************** * * - * Function: tm_json_deserialize_remote_command_result * - * * * Purpose: deserializes remote command result from json data * * * * Parameters: jp - [IN] the json data * @@ -997,8 +937,6 @@ out: /****************************************************************************** * * - * Function: tm_json_deserialize_check_now * - * * * Purpose: deserializes check now from json data * * * * Parameters: jp - [IN] the json data * @@ -1023,8 +961,6 @@ static zbx_tm_check_now_t *tm_json_deserialize_check_now(const struct zbx_json_p /****************************************************************************** * * - * Function: tm_json_deserialize_data * - * * * Purpose: deserializes data task from json * * * * Parameters: jp - [IN] the json * @@ -1065,8 +1001,6 @@ out: /****************************************************************************** * * - * Function: tm_json_deserialize_data_result * - * * * Purpose: deserializes data task result from json * * * * Parameters: jp - [IN] the json * @@ -1107,8 +1041,6 @@ out: /****************************************************************************** * * - * Function: tm_json_deserialize_task * - * * * Purpose: deserializes common task data from json data * * * * Parameters: jp - [IN] the json data * @@ -1141,8 +1073,6 @@ static zbx_tm_task_t *tm_json_deserialize_task(const struct zbx_json_parse *jp) /****************************************************************************** * * - * Function: zbx_tm_json_deserialize_tasks * - * * * Purpose: deserializes tasks from json data * * * * Parameters: jp - [IN] the json data * @@ -1207,8 +1137,6 @@ void zbx_tm_json_deserialize_tasks(const struct zbx_json_parse *jp, zbx_vector_p /****************************************************************************** * * - * Function: zbx_create_task_data * - * * * Purpose: insert task and its data in database * * * * Parameters: data - [IN] task data * @@ -1243,8 +1171,6 @@ static zbx_uint64_t zbx_create_task_data(const char *data, int len, zbx_uint64_t /****************************************************************************** * * - * Function: zbx_tm_task_result_wait * - * * * Purpose: wait for task result * * * * Parameters: taskid - [IN] task identifier * @@ -1288,8 +1214,6 @@ static int zbx_tm_task_result_wait(zbx_uint64_t taskid, char **info) /****************************************************************************** * * - * Function: zbx_tm_execute_task_data * - * * * Purpose: wait for task result * * * * Parameters: data - [IN] task data * diff --git a/src/libs/zbxtrends/baseline.c b/src/libs/zbxtrends/baseline.c index 351a6351a49..8877bf1e95a 100644 --- a/src/libs/zbxtrends/baseline.c +++ b/src/libs/zbxtrends/baseline.c @@ -23,8 +23,6 @@ /****************************************************************************** * * - * Function: baseline_get_common_data * - * * * Purpose: get baseline data for common period/season combinations * * * * Parameters: itemid - [IN] the item identifier * @@ -97,8 +95,6 @@ static int baseline_get_common_data(zbx_uint64_t itemid, const char *table, time /****************************************************************************** * * - * Function: baseline_get_isoyear_data * - * * * Purpose: get baseline data for week based periods in a year * * * * Parameters: itemid - [IN] the item identifier * @@ -186,8 +182,6 @@ static int baseline_get_isoyear_data(zbx_uint64_t itemid, const char *table, tim /****************************************************************************** * * - * Function: zbx_baseline_get_data * - * * * Purpose: get baseline data for the specified period * * * * Parameters: itemid - [IN] the item identifier * diff --git a/src/libs/zbxtrends/cache.c b/src/libs/zbxtrends/cache.c index c86040fc6c5..7ff5620f19f 100644 --- a/src/libs/zbxtrends/cache.c +++ b/src/libs/zbxtrends/cache.c @@ -141,8 +141,6 @@ static int tfc_compare_func(const void *v1, const void *v2) /****************************************************************************** * * - * Function: tfc_malloc_func * - * * * Purpose: allocate memory for indexing hashset * * * * Comments: There are two kinds of allocations that should be done: * @@ -182,8 +180,6 @@ static void tfc_free_func(void *ptr) /****************************************************************************** * * - * Function: tfc_lru_append * - * * * Purpose: append data to the tail of least recently used slot list * * * ******************************************************************************/ @@ -206,8 +202,6 @@ static void tfc_lru_append(zbx_tfc_data_t *data) /****************************************************************************** * * - * Function: tfc_lru_remove * - * * * Purpose: remove data from least recently used slot list * * * ******************************************************************************/ @@ -226,8 +220,6 @@ static void tfc_lru_remove(zbx_tfc_data_t *data) /****************************************************************************** * * - * Function: tfc_value_append * - * * * Purpose: append data to the tail of same item value list * * * ******************************************************************************/ @@ -249,8 +241,6 @@ static void tfc_value_append(zbx_tfc_data_t *root, zbx_tfc_data_t *data) /****************************************************************************** * * - * Function: tfc_value_remove * - * * * Purpose: remove data from same item value list * * * ******************************************************************************/ @@ -262,8 +252,6 @@ static void tfc_value_remove(zbx_tfc_data_t *data) /****************************************************************************** * * - * Function: tfc_free_data * - * * * Purpose: frees slot used to store trends function data * * * ******************************************************************************/ @@ -283,8 +271,6 @@ static void tfc_free_data(zbx_tfc_data_t *data) /****************************************************************************** * * - * Function: tfc_reserve_slot * - * * * Purpose: ensure there is a free slot available * * * ******************************************************************************/ @@ -304,8 +290,6 @@ static void tfc_reserve_slot(void) /****************************************************************************** * * - * Function: tfc_index_add * - * * * Purpose: indexes data by adding it to the index hashset * * * ******************************************************************************/ @@ -331,8 +315,6 @@ static zbx_tfc_data_t *tfc_index_add(zbx_tfc_data_t *data_local) /****************************************************************************** * * - * Function: tfc_function_str * - * * * Purpose: return trend function name in readable format * * * ******************************************************************************/ @@ -359,8 +341,6 @@ static const char *tfc_function_str(zbx_trend_function_t function) /****************************************************************************** * * - * Function: tfc_state_str * - * * * Purpose: return trend cache state in readable format * * * ******************************************************************************/ @@ -381,8 +361,6 @@ static const char *tfc_state_str(zbx_trend_state_t state) /****************************************************************************** * * - * Function: zbx_tfc_init * - * * * Purpose: initialize trend function cache * * * * Parameters: error - [OUT] the error message * @@ -451,8 +429,6 @@ out: /****************************************************************************** * * - * Function: zbx_tfc_destroy * - * * * Purpose: destroy trend function cache * * * ******************************************************************************/ @@ -469,8 +445,6 @@ void zbx_tfc_destroy(void) /****************************************************************************** * * - * Function: zbx_tfc_get_value * - * * * Purpose: get value and state from trend function cache * * * * Parameters: itemid - [IN] the itemid * @@ -548,8 +522,6 @@ int zbx_tfc_get_value(zbx_uint64_t itemid, int start, int end, zbx_trend_functio /****************************************************************************** * * - * Function: zbx_tfc_put_value * - * * * Purpose: put value and state from trend function cache * * * * Parameters: itemid - [IN] the itemid * diff --git a/src/libs/zbxtrends/trends.c b/src/libs/zbxtrends/trends.c index 44d6f1c2b82..e61dd0c5245 100644 --- a/src/libs/zbxtrends/trends.c +++ b/src/libs/zbxtrends/trends.c @@ -32,8 +32,6 @@ static char *trends_errors[ZBX_TREND_STATE_COUNT] = { /****************************************************************************** * * - * Function: trends_parse_base * - * * * Purpose: parse largest period base from function parameters * * * * Parameters: shift - [IN] the period shift parameter * @@ -76,8 +74,6 @@ static int trends_parse_base(const char *period_shift, zbx_time_unit_t *base, ch /****************************************************************************** * * - * Function: zbx_trends_parse_base * - * * * Purpose: parse largest period base from function parameters * * * * Parameters: params - [IN] the function parameters * @@ -103,8 +99,6 @@ int zbx_trends_parse_base(const char *params, zbx_time_unit_t *base, char **erro /****************************************************************************** * * - * Function: trends_parse_timeshift * - * * * Purpose: parse timeshift * * * * Parameters: from - [IN] the start time * @@ -198,8 +192,6 @@ static int trends_parse_timeshift(time_t from, const char *timeshift, zbx_time_u /****************************************************************************** * * - * Function: zbx_parse_timeshift * - * * * Purpose: parse timeshift * * * * Parameters: from - [IN] the start time * @@ -218,8 +210,6 @@ int zbx_parse_timeshift(time_t from, const char *timeshift, struct tm *tm, char /****************************************************************************** * * - * Function: zbx_trends_parse_range * - * * * Purpose: parse trend function period arguments into time range * * * * Parameters: from - [IN] the time the period shift is calculated * @@ -311,8 +301,6 @@ int zbx_trends_parse_range(time_t from, const char *param, int *start, int *end, /****************************************************************************** * * - * Function: zbx_trends_parse_nextcheck * - * * * Purpose: calculate possible nextcheck based on trend function parameters * * * * Parameters: from - [IN] the time the period shift is calculated * @@ -414,8 +402,6 @@ int zbx_trends_parse_nextcheck(time_t from, const char *period_shift, time_t *ne /****************************************************************************** * * - * Function: trends_eval * - * * * Purpose: evaluate expression with trends data * * * * Parameters: table - [IN] the trends table name * @@ -478,8 +464,6 @@ static zbx_trend_state_t trends_eval(const char *table, zbx_uint64_t itemid, int /****************************************************************************** * * - * Function: trends_eval_avg * - * * * Purpose: evaluate avg function with trends data * * * * Parameters: table - [IN] the trends table name * @@ -539,8 +523,6 @@ static zbx_trend_state_t trends_eval_avg(const char *table, zbx_uint64_t itemid, /****************************************************************************** * * - * Function: trends_eval_sum * - * * * Purpose: evaluate sum function with trends data * * * * Parameters: table - [IN] the trends table name * diff --git a/src/libs/zbxwin32/disk.c b/src/libs/zbxwin32/disk.c index cc2f9dadcd1..e54c8c309fd 100644 --- a/src/libs/zbxwin32/disk.c +++ b/src/libs/zbxwin32/disk.c @@ -22,8 +22,6 @@ /****************************************************************************** * * - * Function: get_cluster_size * - * * * Purpose: get file system cluster size for specified path (for cases when * * the file system is mounted on empty NTFS directory) * * * diff --git a/src/libs/zbxwin32/perfmon.c b/src/libs/zbxwin32/perfmon.c index 40846e0438e..3acba359173 100644 --- a/src/libs/zbxwin32/perfmon.c +++ b/src/libs/zbxwin32/perfmon.c @@ -290,8 +290,6 @@ close_query: /****************************************************************************** * * - * Function: get_builtin_object_index * - * * * Purpose: get performance object index by reference value described by * * zbx_builtin_counter_ref_t enum * * * @@ -308,8 +306,6 @@ DWORD get_builtin_object_index(zbx_builtin_counter_ref_t counter_ref) /****************************************************************************** * * - * Function: get_builtin_counter_index * - * * * Purpose: get performance counter index by reference value described by * * zbx_builtin_counter_ref_t enum * * * @@ -326,8 +322,6 @@ DWORD get_builtin_counter_index(zbx_builtin_counter_ref_t counter_ref) /****************************************************************************** * * - * Function: get_all_counter_names * - * * * Purpose: function to read counter names/help from registry * * * * Parameters: reg_key - [IN] registry key * @@ -378,8 +372,6 @@ finish: /****************************************************************************** * * - * Function: get_perf_name_by_index * - * * * Purpose: fills performance counter name based on its index * * * * Parameters: index - [IN] PDH counter index * @@ -407,8 +399,6 @@ static int get_perf_name_by_index(DWORD index, wchar_t *name, DWORD size) /****************************************************************************** * * - * Function: validate_counter_path * - * * * Purpose: checks if a specified counter path data is pointing to a valid * * counter * * * @@ -461,8 +451,6 @@ static int validate_counter_path(PDH_COUNTER_PATH_ELEMENTS *cpe) /****************************************************************************** * * - * Function: validate_object_counter * - * * * Purpose: checks if specified counter is valid successor of the object * * * * Parameters: object - [IN] PDH object index * @@ -509,8 +497,6 @@ out: /****************************************************************************** * * - * Function: init_builtin_counter_indexes * - * * * Purpose: Scans registry key with all performance counter English names * * and obtains system-dependent PDH counter indexes for further * * use by corresponding items. * @@ -619,8 +605,6 @@ out: /****************************************************************************** * * - * Function: get_counter_name * - * * * Purpose: get performance object or counter name by PDH index * * * * Parameters: pdhIndex - [IN] built-in performance counter index * diff --git a/src/libs/zbxxml/xml.c b/src/libs/zbxxml/xml.c index ca9738ea435..2715f035290 100644 --- a/src/libs/zbxxml/xml.c +++ b/src/libs/zbxxml/xml.c @@ -51,8 +51,6 @@ ZBX_PTR_VECTOR_IMPL(xml_node_ptr, zbx_xml_node_t *) /****************************************************************************** * * - * Function: xml_escape_dyn * - * * * Purpose: replace <> symbols in string with <> so the resulting * * string can be written into xml field * * * @@ -146,8 +144,6 @@ char *xml_escape_dyn(const char *data) /********************************************************************************** * * - * Function: xml_escape_xpath_stringsize * - * * * Purpose: calculate a string size after symbols escaping * * * * Parameters: string - [IN] the string to check * @@ -171,8 +167,6 @@ static size_t xml_escape_xpath_stringsize(const char *string) /********************************************************************************** * * - * Function: xml_escape_xpath_string * - * * * Purpose: replace " symbol in string with "" * * * * Parameters: string - [IN] the xpath string to escape * @@ -194,8 +188,6 @@ static void xml_escape_xpath_string(char *p, const char *string) /********************************************************************************** * * - * Function: xml_escape_xpath * - * * * Purpose: escaping of symbols for using in xpath expression * * * * Parameters: data - [IN/OUT] the string to update * @@ -218,8 +210,6 @@ void xml_escape_xpath(char **data) /****************************************************************************** * * - * Function: zbx_query_xpath * - * * * Purpose: execute xpath query * * * * Parameters: value - [IN/OUT] the value to process * @@ -329,8 +319,6 @@ out: #ifdef HAVE_LIBXML2 /****************************************************************************** * * - * Function: compare_xml_nodes_by_name * - * * * Purpose: compare two xml nodes by name * * * * Comments: This function is used to sort xml nodes by name * @@ -357,8 +345,6 @@ static void zbx_xml_node_free(zbx_xml_node_t *node) /****************************************************************************** * * - * Function: xml_to_vector * - * * * Purpose: to collect content of XML document nodes into vector * * * * Parameters: xml_node - [IN] parent XML node structure * @@ -471,8 +457,6 @@ static void xml_to_vector(xmlNode *xml_node, zbx_vector_xml_node_ptr_t *nodes) /****************************************************************************** * * - * Function: is_data * - * * * Purpose: to check if node is leaf node with text content * * * * Parameters: node - [IN] node structure * @@ -494,8 +478,6 @@ static int is_data(zbx_xml_node_t *node) /****************************************************************************** * * - * Function: vector_to_json * - * * * Purpose: to write content of vector into JSON document * * * * Parameters: nodes - [IN] vector of nodes * @@ -586,8 +568,6 @@ static void vector_to_json(zbx_vector_xml_node_ptr_t *nodes, struct zbx_json *js #ifdef HAVE_LIBXML2 /****************************************************************************** * * - * Function: zbx_open_xml * - * * * Purpose: to create xmlDoc and it's root node for input data * * * * Parameters: data - [IN] input data * @@ -647,8 +627,6 @@ int zbx_open_xml(char *data, int options, int maxerrlen, void **xml_doc, void ** /****************************************************************************** * * - * Function: zbx_check_xml_memory * - * * * Purpose: to check xml memory to be valid * * * * Parameters: mem - [IN] pointer to memory * @@ -685,8 +663,6 @@ int zbx_check_xml_memory(char *mem, int maxerrlen, char **errmsg) /****************************************************************************** * * - * Function: zbx_xml_to_json * - * * * Purpose: convert XML format value to JSON format * * * * Parameters: xml_data - [IN] the XML data to process * @@ -728,8 +704,6 @@ exit: /****************************************************************************** * * - * Function: zbx_xmlnode_to_json * - * * * Purpose: convert XML format value to JSON format * * * * Parameters: xml_node - [IN] the XML data to process * @@ -769,8 +743,6 @@ int zbx_xmlnode_to_json(void *xml_node, char **jstr) #ifdef HAVE_LIBXML2 /****************************************************************************** * * - * Function: json_to_xmlnode * - * * * Purpose: to write content of JSON document into XML node * * * * Parameters: jp - [IN] JSON parse structure * @@ -900,8 +872,6 @@ static void json_to_xmlnode(struct zbx_json_parse *jp, char *arr_name, int deep, /****************************************************************************** * * - * Function: zbx_json_to_xml * - * * * Purpose: convert JSON format value to XML format * * * * Parameters: json_data - [IN] the JSON data to process * diff --git a/src/modules/dummy/dummy.c b/src/modules/dummy/dummy.c index 3ebe626817a..1495517fbde 100644 --- a/src/modules/dummy/dummy.c +++ b/src/modules/dummy/dummy.c @@ -44,8 +44,6 @@ static ZBX_METRIC keys[] = /****************************************************************************** * * - * Function: zbx_module_api_version * - * * * Purpose: returns version number of the module interface * * * * Return value: ZBX_MODULE_API_VERSION - version of module.h module is * @@ -60,8 +58,6 @@ int zbx_module_api_version(void) /****************************************************************************** * * - * Function: zbx_module_item_timeout * - * * * Purpose: set timeout value for processing of items * * * * Parameters: timeout - timeout in seconds, 0 - no timeout set * @@ -74,8 +70,6 @@ void zbx_module_item_timeout(int timeout) /****************************************************************************** * * - * Function: zbx_module_item_list * - * * * Purpose: returns list of item keys supported by the module * * * * Return value: list of item keys * @@ -113,8 +107,6 @@ static int dummy_echo(AGENT_REQUEST *request, AGENT_RESULT *result) /****************************************************************************** * * - * Function: dummy_random * - * * * Purpose: a main entry point for processing of an item * * * * Parameters: request - structure that contains item key and parameters * @@ -171,8 +163,6 @@ static int dummy_random(AGENT_REQUEST *request, AGENT_RESULT *result) /****************************************************************************** * * - * Function: zbx_module_init * - * * * Purpose: the function is called on agent startup * * It should be used to call any initialization routines * * * @@ -192,8 +182,6 @@ int zbx_module_init(void) /****************************************************************************** * * - * Function: zbx_module_uninit * - * * * Purpose: the function is called on agent shutdown * * It should be used to cleanup used resources if there are any * * * @@ -273,8 +261,6 @@ static void dummy_history_log_cb(const ZBX_HISTORY_LOG *history, int history_num /****************************************************************************** * * - * Function: zbx_module_history_write_cbs * - * * * Purpose: returns a set of module functions Zabbix will call to export * * different types of historical data * * * diff --git a/src/zabbix_agent/active.c b/src/zabbix_agent/active.c index 3899d4d8169..a8f045d4f7f 100644 --- a/src/zabbix_agent/active.c +++ b/src/zabbix_agent/active.c @@ -255,8 +255,6 @@ out: /****************************************************************************** * * - * Function: mode_parameter_is_skip * - * * * Purpose: test log[] or log.count[] item key if <mode> parameter is set to * * 'skip' * * * @@ -291,8 +289,6 @@ static int mode_parameter_is_skip(unsigned char flags, const char *itemkey) /****************************************************************************** * * - * Function: parse_list_of_checks * - * * * Purpose: Parse list of active checks received from server * * * * Parameters: str - NULL terminated string received from server * @@ -526,8 +522,6 @@ out: /********************************************************************************* * * - * Function: process_config_item * - * * * Purpose: process configuration item and set it value to respective parameter * * * * Parameters: json - pointer to JSON structure where to put resulting value * @@ -590,8 +584,6 @@ static void process_config_item(struct zbx_json *json, char *config, size_t leng /****************************************************************************** * * - * Function: refresh_active_checks * - * * * Purpose: Retrieve from Zabbix server list of active checks * * * * Parameters: host - IP or Hostname of Zabbix server * @@ -709,8 +701,6 @@ static int refresh_active_checks(zbx_vector_ptr_t *addrs) /****************************************************************************** * * - * Function: check_response * - * * * Purpose: Check whether JSON response is SUCCEED * * * * Parameters: JSON response from Zabbix trapper * @@ -750,8 +740,6 @@ static int check_response(char *response) /****************************************************************************** * * - * Function: send_buffer * - * * * Purpose: Send value stored in the buffer to Zabbix server * * * * Parameters: addrs - [IN] vector with a pair of Zabbix server IP or * @@ -932,8 +920,6 @@ ret: /****************************************************************************** * * - * Function: process_value * - * * * Purpose: Buffer new value or send the whole buffer to the server * * * * Parameters: addrs - vector with a pair of Zabbix server IP or * @@ -1176,8 +1162,6 @@ out: #if !defined(_WINDOWS) && !defined(__MINGW32__) /****************************************************************************** * * - * Function: zbx_minimal_init_prep_vec_data * - * * * Purpose: initialize an element of preparation vector with available data * * * * Parameters: lastlogsize - [IN] lastlogize value to write into persistent * @@ -1344,8 +1328,6 @@ static void process_active_checks(zbx_vector_ptr_t *addrs) /****************************************************************************** * * - * Function: update_schedule * - * * * Purpose: update active check and send buffer schedule by the specified * * time delta * * * diff --git a/src/zabbix_agent/cpustat.c b/src/zabbix_agent/cpustat.c index 4bd75fbacc9..513fd6edbe9 100644 --- a/src/zabbix_agent/cpustat.c +++ b/src/zabbix_agent/cpustat.c @@ -1308,8 +1308,6 @@ static int get_cpu_status(int pc_status) /****************************************************************************** * * - * Function: get_cpus * - * * * Purpose: Retrieve list of available CPUs in the collector * * * * Parameters: vector [OUT] - vector for CPUNUM/STATUS pairs * diff --git a/src/zabbix_agent/eventlog.c b/src/zabbix_agent/eventlog.c index d34af6ee31a..ca987b4e5dc 100644 --- a/src/zabbix_agent/eventlog.c +++ b/src/zabbix_agent/eventlog.c @@ -173,8 +173,6 @@ static void zbx_close_eventlog(HANDLE eventlog_handle) /****************************************************************************** * * - * Function: zbx_get_message_files * - * * * Purpose: gets event message and parameter translation files from registry * * * * Parameters: szLogName - [IN] the log name * @@ -221,8 +219,6 @@ static void zbx_get_message_files(const wchar_t *szLogName, const wchar_t *szSou /****************************************************************************** * * - * Function: zbx_load_message_file * - * * * Purpose: load the specified message file, expanding environment variables * * in the file name if necessary * * * @@ -259,8 +255,6 @@ static HINSTANCE zbx_load_message_file(const wchar_t *szFileName) /****************************************************************************** * * - * Function: zbx_format_message * - * * * Purpose: extracts the specified message from a message file * * * * Parameters: hLib - [IN] the message file handle * @@ -296,8 +290,6 @@ static char *zbx_format_message(HINSTANCE hLib, DWORD dwMessageId, wchar_t **pIn /****************************************************************************** * * - * Function: zbx_translate_message_params * - * * * Purpose: translates message by replacing parameters %%<id> with translated * * values * * * @@ -700,8 +692,6 @@ cleanup: /****************************************************************************** * * - * Function: zbx_parse_eventlog_message6 * - * * * Purpose: details parse of a single EventLog record * * * * Parameters: wsource - [IN] EventLog file name * @@ -846,8 +836,6 @@ out: /****************************************************************************** * * - * Function: process_eventslog6 * - * * * Purpose: batch processing of Event Log file * * * * Parameters: server - [IN] IP or Hostname of Zabbix server * @@ -1135,8 +1123,6 @@ int finalize_eventlog6(EVT_HANDLE *render_context, EVT_HANDLE *query) /****************************************************************************** * * - * Function: seek_eventlog * - * * * Purpose: try to set reading position in event log * * * * Parameters: eventlog_handle - [IN] the handle to the event log to be read * @@ -1266,8 +1252,6 @@ static int seek_eventlog(HANDLE *eventlog_handle, zbx_uint64_t FirstID, DWORD Re /****************************************************************************** * * - * Function: zbx_parse_eventlog_message * - * * * Purpose: details parse of a single Event Log record * * * * Parameters: wsource - [IN] EventLog file name * @@ -1377,8 +1361,6 @@ static void zbx_parse_eventlog_message(const wchar_t *wsource, const EVENTLOGREC /****************************************************************************** * * - * Function: process_eventslog * - * * * Purpose: batch processing of Event Log file * * * * Parameters: server - [IN] IP or Hostname of Zabbix server * diff --git a/src/zabbix_agent/logfiles/logfiles.c b/src/zabbix_agent/logfiles/logfiles.c index e0f51c8ab36..2641bf74507 100644 --- a/src/zabbix_agent/logfiles/logfiles.c +++ b/src/zabbix_agent/logfiles/logfiles.c @@ -48,8 +48,6 @@ extern ZBX_THREAD_LOCAL char *CONFIG_HOSTNAME; /****************************************************************************** * * - * Function: split_string * - * * * Purpose: separates given string to two parts by given delimiter in string * * * * Parameters: * @@ -102,8 +100,6 @@ out: /****************************************************************************** * * - * Function: split_filename * - * * * Purpose: separates full-path file name into directory and file name regexp * * parts * * * @@ -237,8 +233,6 @@ out: /****************************************************************************** * * - * Function: file_part_md5 * - * * * Purpose: calculate the MD5 sum of the specified part of the file * * * * Parameters: * @@ -300,8 +294,6 @@ static int file_part_md5(int f, size_t offset, int length, md5_byte_t *md5buf, c #if defined(_WINDOWS) || defined(__MINGW32__) /****************************************************************************** * * - * Function: file_id * - * * * Purpose: get Microsoft Windows file device ID, 64-bit FileIndex or * * 128-bit FileId * * * @@ -380,8 +372,6 @@ static int file_id(int f, int use_ino, zbx_uint64_t *dev, zbx_uint64_t *ino_lo, /****************************************************************************** * * - * Function: set_use_ino_by_fs_type * - * * * Purpose: find file system type and set 'use_ino' parameter * * * * Parameters: * @@ -440,8 +430,6 @@ static int set_use_ino_by_fs_type(const char *path, int *use_ino, char **err_msg /****************************************************************************** * * - * Function: print_logfile_list * - * * * Purpose: write logfile list into log for debugging * * * * Parameters: * @@ -476,8 +464,6 @@ static void print_logfile_list(const struct st_logfile *logfiles, int logfiles_n /****************************************************************************** * * - * Function: compare_file_places * - * * * Purpose: compare device numbers and inode numbers of 2 files * * * * Parameters: old_file - [IN] details of the 1st log file * @@ -509,8 +495,6 @@ static int compare_file_places(const struct st_logfile *old_file, const struct s /****************************************************************************** * * - * Function: open_file_helper * - * * * Purpose: open specified file for reading * * * * Parameters: pathname - [IN] full pathname of file * @@ -531,8 +515,6 @@ static int open_file_helper(const char *pathname, char **err_msg) /****************************************************************************** * * - * Function: close_file_helper * - * * * Purpose: close specified file * * * * Parameters: fd - [IN] file descriptor to close * @@ -557,8 +539,6 @@ static int close_file_helper(int fd, const char *pathname, char **err_msg) /****************************************************************************** * * - * Function: examine_md5_and_place * - * * * Purpose: from MD5 sums of blocks and places of 2 files make a conclusion * * is it the same file, a pair 'original/copy' or 2 different files * * * @@ -594,8 +574,6 @@ static int examine_md5_and_place(const md5_byte_t *buf1, const md5_byte_t *buf2, /****************************************************************************** * * - * Function: is_same_file_logcpt * - * * * Purpose: find out if a file from the old list and a file from the new list * * could be the same file or copy in case of copy/truncate rotation * * * @@ -811,8 +789,6 @@ clean3: /****************************************************************************** * * - * Function: is_same_file_logrt * - * * * Purpose: find out if a file from the old list and a file from the new list * * could be the same file in case of simple rotation * * * @@ -1026,8 +1002,6 @@ clean: /****************************************************************************** * * - * Function: cross_out * - * * * Purpose: fill the given row and column with '0' except the element at the * * cross point and protected columns and protected rows * * * @@ -1081,8 +1055,6 @@ static void cross_out(char *arr, int n_rows, int n_cols, int row, int col, const /****************************************************************************** * * - * Function: is_uniq_row * - * * * Purpose: check if there is only one element '1' or '2' in the given row * * * * Parameters: * @@ -1123,8 +1095,6 @@ static int is_uniq_row(const char * const arr, int n_cols, int row) /****************************************************************************** * * - * Function: is_uniq_col * - * * * Purpose: check if there is only one element '1' or '2' in the given column * * * * Parameters: * @@ -1166,8 +1136,6 @@ static int is_uniq_col(const char * const arr, int n_rows, int n_cols, int col) /****************************************************************************** * * - * Function: is_old2new_unique_mapping * - * * * Purpose: check if 'old2new' array has only unique mappings * * * * Parameters: * @@ -1205,8 +1173,6 @@ static int is_old2new_unique_mapping(const char * const old2new, int num_old, in /****************************************************************************** * * - * Function: resolve_old2new * - * * * Purpose: resolve non-unique mappings * * * * Parameters: * @@ -1360,8 +1326,6 @@ static void resolve_old2new(char *old2new, int num_old, int num_new) /****************************************************************************** * * - * Function: create_old2new_and_copy_of * - * * * Purpose: allocate and fill an array of possible mappings from the old log * * files to the new log files * * * @@ -1445,8 +1409,6 @@ static char *create_old2new_and_copy_of(zbx_log_rotation_options_t rotation_type /****************************************************************************** * * - * Function: find_old2new * - * * * Purpose: find a mapping from old to new file * * * * Parameters: * @@ -1476,8 +1438,6 @@ static int find_old2new(const char * const old2new, int num_new, int i_old) /****************************************************************************** * * - * Function: add_logfile * - * * * Purpose: adds information of a logfile to the list of logfiles * * * * Parameters: logfiles - pointer to the list of logfiles * @@ -1580,8 +1540,6 @@ out: /****************************************************************************** * * - * Function: destroy_logfile_list * - * * * Purpose: release resources allocated to a logfile list * * * * Parameters: * @@ -1608,8 +1566,6 @@ void destroy_logfile_list(struct st_logfile **logfiles, int *logfiles_alloc, int /****************************************************************************** * * - * Function: pick_logfile * - * * * Purpose: checks if the specified file meets requirements and adds it to * * the logfile list * * * @@ -1653,8 +1609,6 @@ static void pick_logfile(const char *directory, const char *filename, int mtime, /****************************************************************************** * * - * Function: pick_logfiles * - * * * Purpose: find logfiles in a directory and put them into a list * * * * Parameters: * @@ -1754,8 +1708,6 @@ clean: /****************************************************************************** * * - * Function: compile_filename_regexp * - * * * Purpose: compile regular expression * * * * Parameters: * @@ -1784,8 +1736,6 @@ static int compile_filename_regexp(const char *filename_regexp, zbx_regexp_t **r /****************************************************************************** * * - * Function: fill_file_details * - * * * Purpose: fill-in MD5 sums, device and inode numbers for files in the list * * * * Parameters: * @@ -1852,8 +1802,6 @@ clean: /****************************************************************************** * * - * Function: make_logfile_list * - * * * Purpose: select log files to be analyzed and make a list, set 'use_ino' * * parameter * * * @@ -2072,8 +2020,6 @@ static int zbx_match_log_rec(const zbx_vector_ptr_t *regexps, const char *value, /****************************************************************************** * * - * Function: zbx_read2 * - * * * Comments: Thread-safe * * * ******************************************************************************/ @@ -2418,8 +2364,6 @@ out: /****************************************************************************** * * - * Function: process_log * - * * * Purpose: Match new records in logfile with regexp, transmit matching * * records to Zabbix server * * * @@ -2614,8 +2558,6 @@ static void ensure_order_if_mtimes_equal(const struct st_logfile *logfiles_old, /****************************************************************************** * * - * Function: files_have_same_blocks_md5 * - * * * Purpose: compare MD5 sums of first and last blocks between 2 files. If MD5 * * sums have been calculated for blocks of different sizes or * * offsets then open the log file with larger size of blocks and get * @@ -2819,8 +2761,6 @@ static zbx_uint64_t max_processed_size_in_copies(const struct st_logfile *logfil /****************************************************************************** * * - * Function: calculate_delay * - * * * Purpose: calculate delay based on number of processed and remaining bytes, * * and processing time * * * @@ -2903,8 +2843,6 @@ static void jump_remaining_bytes_logrt(struct st_logfile *logfiles, int logfiles /****************************************************************************** * * - * Function: adjust_position_after_jump * - * * * Purpose: * * After jumping over a number of bytes we "land" most likely somewhere in * * the middle of log file line. This function tries to adjust position to * @@ -3074,8 +3012,6 @@ out: /****************************************************************************** * * - * Function: jump_ahead * - * * * Purpose: move forward to a new position in the log file list * * * * Parameters: * @@ -3239,8 +3175,6 @@ static void transfer_for_copytruncate(const struct st_logfile *logfiles_old, int /****************************************************************************** * * - * Function: update_new_list_from_old * - * * * Comments: Thread-safe * * * ******************************************************************************/ @@ -3289,8 +3223,6 @@ static int update_new_list_from_old(zbx_log_rotation_options_t rotation_type, st /****************************************************************************** * * - * Function: process_logrt * - * * * Purpose: Find new records in logfiles * * * * Parameters: * @@ -3722,8 +3654,6 @@ static int check_number_of_parameters(unsigned char flags, const AGENT_REQUEST * /****************************************************************************** * * - * Function: init_max_lines_per_sec * - * * * Comments: thread-safe if CONFIG_MAX_LINES_PER_SECOND is updated when log * * checks are not running * * * @@ -3888,8 +3818,6 @@ static int init_persistent_dir_parameter(const char *server, unsigned short port /****************************************************************************** * * - * Function: process_log_check * - * * * Comments: Function body is thread-safe if CONFIG_HOSTNAME is not updated * * while log checks are running. Uses callback function * * process_value_cb, so overall thread-safety depends on caller. * diff --git a/src/zabbix_agent/logfiles/persistent_state.c b/src/zabbix_agent/logfiles/persistent_state.c index 7a715029029..b4288fdef6a 100644 --- a/src/zabbix_agent/logfiles/persistent_state.c +++ b/src/zabbix_agent/logfiles/persistent_state.c @@ -53,8 +53,6 @@ static int zbx_persistent_inactive_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: str2file_name_part * - * * * Purpose: for the specified string get the part of persistent storage path * * * * Parameters: * @@ -101,8 +99,6 @@ static char *str2file_name_part(const char *str) /****************************************************************************** * * - * Function: active_server2dir_name_part * - * * * Purpose: calculate the part of persistent storage path for the specified * * server/port pair where the agent is sending active check data * * * @@ -134,8 +130,6 @@ static char *active_server2dir_name_part(const char *server, unsigned short port /****************************************************************************** * * - * Function: make_persistent_server_directory_name * - * * * Purpose: make the name of persistent storage directory for the specified * * server/proxy and port * * * @@ -163,8 +157,6 @@ static char *make_persistent_server_directory_name(const char *base_path, const /****************************************************************************** * * - * Function: check_persistent_directory_exists * - * * * Purpose: check if the directory exists * * * * Parameters: * @@ -195,8 +187,6 @@ static int check_persistent_directory_exists(const char *pathname, char **error) /****************************************************************************** * * - * Function: create_persistent_directory * - * * * Purpose: create directory if it does not exist or check access if it * * exists * * * @@ -228,8 +218,6 @@ static int create_persistent_directory(const char *pathname, char **error) /****************************************************************************** * * - * Function: create_base_path_directories * - * * * Purpose: create all subdirectories in the pathname if they do not exist * * * * Parameters: * @@ -294,8 +282,6 @@ static int create_base_path_directories(const char *pathname, char **error) /****************************************************************************** * * - * Function: zbx_create_persistent_server_directory * - * * * Purpose: create directory if it does not exist or check access if it * * exists. Directory name is derived from host and port. * * * @@ -350,8 +336,6 @@ char *zbx_create_persistent_server_directory(const char *base_path, const char * /****************************************************************************** * * - * Function: zbx_make_persistent_file_name * - * * * Purpose: make the name of persistent storage directory or file * * * * Parameters: * @@ -374,8 +358,6 @@ char *zbx_make_persistent_file_name(const char *persistent_server_dir, const cha /****************************************************************************** * * - * Function: zbx_write_persistent_file * - * * * Purpose: write metric info into persistent file * * * * Parameters: * @@ -422,8 +404,6 @@ static int zbx_write_persistent_file(const char *filename, const char *data, cha /****************************************************************************** * * - * Function: zbx_read_persistent_file * - * * * Purpose: read metric info from persistent file. One line is read. * * * * Parameters: * @@ -468,8 +448,6 @@ out: /****************************************************************************** * * - * Function: zbx_remove_persistent_file * - * * * Purpose: remove the specified file * * * * Parameters: * @@ -653,8 +631,6 @@ static int zbx_pre_persistent_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: zbx_find_or_create_prep_vec_element * - * * * Purpose: search preparation vector to find element with the specified key. * * If not found then create the element. * * * @@ -728,8 +704,6 @@ void zbx_update_prep_vec_data(const struct st_logfile *logfile, zbx_uint64_t pro /****************************************************************************** * * - * Function: zbx_restore_file_details * - * * * Purpose: create the 'old log file list' and restore log file attributes * * from JSON string which was read from persistent file * * * diff --git a/src/zabbix_agent/perfstat.c b/src/zabbix_agent/perfstat.c index c39cba96f3c..e60ea012cd4 100644 --- a/src/zabbix_agent/perfstat.c +++ b/src/zabbix_agent/perfstat.c @@ -164,8 +164,6 @@ out: /****************************************************************************** * * - * Function: extend_perf_counter_interval * - * * * Purpose: extends the performance counter buffer to store the new data * * interval * * * @@ -212,8 +210,6 @@ static void free_object_names(void) /****************************************************************************** * * - * Function: set_object_names * - * * * Purpose: obtains PDH object localized names and associates them with * * English names, to be used by perf_instance_en.discovery * * * @@ -627,8 +623,6 @@ out: /****************************************************************************** * * - * Function: get_perf_counter_value_by_name * - * * * Purpose: gets average named performance counter value * * * * Parameters: name - [IN] the performance counter name * @@ -706,8 +700,6 @@ out: /****************************************************************************** * * - * Function: get_perf_counter_value_by_path * - * * * Purpose: gets average performance counter value * * * * Parameters: counterpath - [IN] the performance counter path * @@ -778,8 +770,6 @@ out: /****************************************************************************** * * - * Function: get_perf_counter_value * - * * * Purpose: gets average value of the specified performance counter interval * * * * Parameters: counter - [IN] the performance counter * @@ -879,8 +869,6 @@ static wchar_t *get_object_name(char *eng_name) /****************************************************************************** * * - * Function: get_object_name_local * - * * * Purpose: get localized name of the object * * * * Parameters: eng_name - [IN] english name * diff --git a/src/zabbix_agent/procstat.c b/src/zabbix_agent/procstat.c index 793a18f873e..bd7024cc320 100644 --- a/src/zabbix_agent/procstat.c +++ b/src/zabbix_agent/procstat.c @@ -190,8 +190,6 @@ static int procstat_snapshot_num; /****************************************************************************** * * - * Function: procstat_dshm_has_enough_space * - * * * Purpose: check if the procstat shared memory segment has at least * * the specified amount of free bytes in the segment * * * @@ -214,8 +212,6 @@ static int procstat_dshm_has_enough_space(void *base, size_t size) /****************************************************************************** * * - * Function: procstat_dshm_used_size * - * * * Purpose: calculate the actual shared memory size used by procstat * * * * Parameters: base - [IN] the procstat shared memory segment * @@ -252,8 +248,6 @@ static size_t procstat_dshm_used_size(void *base) /****************************************************************************** * * - * Function: procstat_queries_num * - * * * Purpose: calculate the number of active queries * * * * Parameters: base - [IN] the procstat shared memory segment * @@ -279,8 +273,6 @@ static int procstat_queries_num(void *base) /****************************************************************************** * * - * Function: procstat_alloc * - * * * Purpose: allocates memory in the shared memory segment, * * calls exit() if segment is too small * * * @@ -312,8 +304,6 @@ static int procstat_alloc(void *base, size_t size) /****************************************************************************** * * - * Function: procstat_strdup * - * * * Purpose: allocates required memory in procstat memory segment and copies * * the specified string (calls exit() if segment is too small) * * * @@ -343,8 +333,6 @@ static size_t procstat_strdup(void *base, const char *str) /****************************************************************************** * * - * Function: procstat_reattach * - * * * Purpose: reattaches the procstat_ref to the shared memory segment if it * * was 'resized' (a new segment created and the old data copied) by * * other process. * @@ -367,8 +355,6 @@ static void procstat_reattach(void) /****************************************************************************** * * - * Function: procstat_copy_data * - * * * Purpose: copies procstat data to a new shared memory segment * * * * Parameters: dst - [OUT] the destination segment * @@ -416,8 +402,6 @@ static void procstat_copy_data(void *dst, size_t size_dst, const void *src) /****************************************************************************** * * - * Function: procstat_running * - * * * Purpose: checks if processor statistics collector is running (at least one * * one process statistics query has been made). * * * @@ -432,8 +416,6 @@ static int procstat_running(void) /****************************************************************************** * * - * Function: procstat_get_query * - * * * Purpose: get process statistics query based on process name, user name * * and command line * * * @@ -472,8 +454,6 @@ static zbx_procstat_query_t *procstat_get_query(void *base, const char *procname /****************************************************************************** * * - * Function: procstat_add * - * * * Purpose: adds a new query to process statistics collector * * * * Parameters: procname - [IN] the process name * @@ -555,8 +535,6 @@ static void procstat_add(const char *procname, const char *username, const char /****************************************************************************** * * - * Function: procstat_free_query_data * - * * * Purpose: frees the query data structure used to store queries locally * * * ******************************************************************************/ @@ -568,8 +546,6 @@ static void procstat_free_query_data(zbx_procstat_query_data_t *data) /****************************************************************************** * * - * Function: procstat_try_compress * - * * * Purpose: try to compress (remove inactive queries) the procstat shared * * memory segment once per day * * * @@ -605,8 +581,6 @@ static void procstat_try_compress(void *base) /****************************************************************************** * * - * Function: procstat_build_local_query_vector * - * * * Purpose: builds a local copy of the process cpu utilization queries and * * removes expired (not used during last 24 hours) queries * * * @@ -695,8 +669,6 @@ out: /****************************************************************************** * * - * Function: procstat_scan_query_pids * - * * * Purpose: for every query gets the pids of processes matching query * * attributes * * * @@ -725,8 +697,6 @@ static int procstat_scan_query_pids(zbx_vector_ptr_t *queries, const zbx_vector_ /****************************************************************************** * * - * Function: procstat_get_monitored_pids * - * * * Purpose: creates a list of unique pids that are monitored by current data * * gathering cycle * * * @@ -761,8 +731,6 @@ static void procstat_get_monitored_pids(zbx_vector_uint64_t *pids, const zbx_vec /****************************************************************************** * * - * Function: procstat_get_cpu_util_snapshot_for_pids * - * * * Purpose: gets cpu utilization data snapshot for the monitored processes * * * * Parameters: stats - [OUT] current reading of the per-pid cpu usage * @@ -791,8 +759,6 @@ static zbx_timespec_t procstat_get_cpu_util_snapshot_for_pids(zbx_procstat_util_ /****************************************************************************** * * - * Function: procstat_util_compare * - * * * Purpose: compare process utilization data by their pids * * * ******************************************************************************/ @@ -808,8 +774,6 @@ static int procstat_util_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: procstat_calculate_cpu_util_for_queries * - * * * Purpose: calculates the cpu utilization for queries since the previous * * snapshot * * * @@ -868,8 +832,6 @@ static void procstat_calculate_cpu_util_for_queries(zbx_vector_ptr_t *queries, /****************************************************************************** * * - * Function: procstat_update_query_statistics * - * * * Purpose: updates cpu utilization and saves the new snapshot for queries in * * shared memory segment * * * @@ -950,8 +912,6 @@ static void procstat_update_query_statistics(zbx_vector_ptr_t *queries, int runi /****************************************************************************** * * - * Function: zbx_procstat_collector_started * - * * * Purpose: checks if processor statistics collector is enabled (the main * * collector has been initialized) * * * @@ -966,8 +926,6 @@ int zbx_procstat_collector_started(void) /****************************************************************************** * * - * Function: zbx_procstat_init * - * * * Purpose: initializes process statistics collector * * * * Return value: This function calls exit() on shared memory errors. * @@ -991,8 +949,6 @@ void zbx_procstat_init(void) /****************************************************************************** * * - * Function: zbx_procstat_destroy * - * * * Purpose: destroys process statistics collector * * * ******************************************************************************/ @@ -1012,8 +968,6 @@ void zbx_procstat_destroy(void) /****************************************************************************** * * - * Function: zbx_procstat_get_util * - * * * Purpose: gets process cpu utilization * * * * Parameters: procname - [IN] the process name, NULL - all * @@ -1103,8 +1057,6 @@ out: /****************************************************************************** * * - * Function: zbx_procstat_collect * - * * * Purpose: performs process statistics collection * * * ******************************************************************************/ diff --git a/src/zabbix_agent/stats.c b/src/zabbix_agent/stats.c index 377c7c75bc7..8cdd817eb46 100644 --- a/src/zabbix_agent/stats.c +++ b/src/zabbix_agent/stats.c @@ -56,8 +56,6 @@ zbx_mutex_t diskstats_lock = ZBX_MUTEX_NULL; /****************************************************************************** * * - * Function: zbx_get_cpu_num * - * * * Purpose: returns the number of processors which are currently online * * (i.e., available). * * * @@ -130,8 +128,6 @@ return_one: /****************************************************************************** * * - * Function: init_collector_data * - * * * Purpose: Allocate memory for collector * * * * Author: Eugene Grigorjev * @@ -223,8 +219,6 @@ out: /****************************************************************************** * * - * Function: free_collector_data * - * * * Purpose: Free memory allocated for collector * * * * Author: Eugene Grigorjev * @@ -265,8 +259,6 @@ void free_collector_data(void) /****************************************************************************** * * - * Function: diskstat_shm_init * - * * * Purpose: Allocate shared memory for collecting disk statistics * * * ******************************************************************************/ @@ -302,8 +294,6 @@ void diskstat_shm_init(void) /****************************************************************************** * * - * Function: diskstat_shm_reattach * - * * * Purpose: If necessary, reattach to disk statistics shared memory segment. * * * ******************************************************************************/ @@ -344,8 +334,6 @@ void diskstat_shm_reattach(void) /****************************************************************************** * * - * Function: diskstat_shm_extend * - * * * Purpose: create a new, larger disk statistics shared memory segment and * * copy data from the old one. * * * @@ -417,8 +405,6 @@ void diskstat_shm_extend(void) /****************************************************************************** * * - * Function: collector_thread * - * * * Purpose: Collect system information * * * * Author: Eugene Grigorjev * diff --git a/src/zabbix_agent/vmstats.c b/src/zabbix_agent/vmstats.c index 706a3770fe9..5adc57292c9 100644 --- a/src/zabbix_agent/vmstats.c +++ b/src/zabbix_agent/vmstats.c @@ -76,8 +76,6 @@ static zbx_uint64_t last_rblks = 0; /* 512 bytes blocks read from all disks */ /****************************************************************************** * * - * Function: update_vmstat * - * * * Purpose: update vmstat values at most once per second * * * * Parameters: vmstat - a structure containing vmstat data * diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c index 4163f66e049..324c6cbd172 100644 --- a/src/zabbix_agent/zabbix_agentd.c +++ b/src/zabbix_agent/zabbix_agentd.c @@ -553,8 +553,6 @@ out: /****************************************************************************** * * - * Function: set_defaults * - * * * Purpose: set configuration defaults * * * * Author: Vladimir Levijev, Rudolfs Kreicbergs * @@ -619,8 +617,6 @@ static void set_defaults(void) /****************************************************************************** * * - * Function: zbx_validate_config_hostnames * - * * * Purpose: validate listed host names * * * ******************************************************************************/ @@ -649,8 +645,6 @@ static void zbx_validate_config_hostnames(zbx_vector_str_t *hostnames) /****************************************************************************** * * - * Function: zbx_validate_config * - * * * Purpose: validate configuration parameters * * * * Author: Vladimir Levijev * @@ -793,8 +787,6 @@ static void parse_hostnames(const char *hostname_param, zbx_vector_str_t *hostna /****************************************************************************** * * - * Function: load_enable_remote_commands * - * * * Purpose: aliases EnableRemoteCommands parameter to * * Allow/DenyKey=system.run[*] * * * @@ -825,8 +817,6 @@ static int load_enable_remote_commands(const char *value, const struct cfg_line /****************************************************************************** * * - * Function: zbx_load_config * - * * * Purpose: load configuration from config file * * * * Parameters: requirement - produce error if config file missing or not * @@ -1006,8 +996,6 @@ static void zbx_load_config(int requirement, ZBX_TASK_EX *task) /****************************************************************************** * * - * Function: zbx_free_config * - * * * Purpose: free configuration memory * * * * Author: Vladimir Levijev * @@ -1275,8 +1263,6 @@ int MAIN_ZABBIX_ENTRY(int flags) /****************************************************************************** * * - * Function: zbx_free_service_resources * - * * * Purpose: free service resources allocated by main thread * * * ******************************************************************************/ diff --git a/src/zabbix_agent/zbxconf.c b/src/zabbix_agent/zbxconf.c index e9b3c517573..758a40ac162 100644 --- a/src/zabbix_agent/zbxconf.c +++ b/src/zabbix_agent/zbxconf.c @@ -31,8 +31,6 @@ /****************************************************************************** * * - * Function: load_aliases * - * * * Purpose: load aliases from configuration * * * * Parameters: lines - aliases from configuration file * @@ -75,8 +73,6 @@ void load_aliases(char **lines) /****************************************************************************** * * - * Function: load_user_parameters * - * * * Purpose: load user parameters from configuration * * * * Parameters: lines - user parameter entries from configuration file * @@ -117,8 +113,6 @@ int load_user_parameters(char **lines, char **err) /****************************************************************************** * * - * Function: load_key_access_rule * - * * * Purpose: Adds key access rule from configuration * * * * Parameters: value - [IN] key access rule parameter value * @@ -147,8 +141,6 @@ int load_key_access_rule(const char *value, const struct cfg_line *cfg) #ifdef _WINDOWS /****************************************************************************** * * - * Function: load_perf_counters * - * * * Purpose: load performance counters from configuration * * * * Parameters: def_lines - array of PerfCounter configuration entries * @@ -239,8 +231,6 @@ void load_perf_counters(const char **def_lines, const char **eng_lines) #else /****************************************************************************** * * - * Function: load_config_user_params * - * * * Purpose: load user parameters from configuration file * * * ******************************************************************************/ @@ -260,8 +250,6 @@ static int load_config_user_params(void) /****************************************************************************** * * - * Function: reload_user_parameters * - * * * Purpose: reload user parameters * * * * Parameters: process_type - process type * diff --git a/src/zabbix_agent/zbxkstat.c b/src/zabbix_agent/zbxkstat.c index 90dc6fe8ee7..bb7529a2877 100644 --- a/src/zabbix_agent/zbxkstat.c +++ b/src/zabbix_agent/zbxkstat.c @@ -36,8 +36,6 @@ static zbx_mutex_t kstat_lock = ZBX_MUTEX_NULL; /****************************************************************************** * * - * Function: zbx_kstat_refresh * - * * * Purpose: refreshes kstat environment * * * * Parameters: error - [OUT] the error message * @@ -70,8 +68,6 @@ static int zbx_kstat_refresh(char **error) /****************************************************************************** * * - * Function: zbx_kstat_init * - * * * Purpose: initialize kstat environment * * * * Parameters: kstat - [IN] the kstat data storage * @@ -124,8 +120,6 @@ void zbx_kstat_destroy(void) /****************************************************************************** * * - * Function: zbx_kstat_collect * - * * * Purpose: collect kstat stats * * * * Comments: This function is called every second to collect statistics. * @@ -158,8 +152,6 @@ void zbx_kstat_collect(zbx_kstat_t *kstat) /****************************************************************************** * * - * Function: zbx_kstat_get_freemem * - * * * Purpose: get free memory size * * * * Parameters: value - [OUT] the free memory size in bytes * diff --git a/src/zabbix_get/zabbix_get.c b/src/zabbix_get/zabbix_get.c index b79ad7b0419..ad5f5e1fc3b 100644 --- a/src/zabbix_get/zabbix_get.c +++ b/src/zabbix_get/zabbix_get.c @@ -221,8 +221,6 @@ static char shortopts[] = "s:p:k:I:t:hV"; /****************************************************************************** * * - * Function: get_signal_handler * - * * * Purpose: process signals * * * * Parameters: sig - signal ID * @@ -251,8 +249,6 @@ static void get_signal_handler(int sig) /****************************************************************************** * * - * Function: get_value * - * * * Purpose: connect to Zabbix agent, receive and print value * * * * Parameters: host - server name or IP address * @@ -330,8 +326,6 @@ static int get_value(const char *source_ip, const char *host, unsigned short por /****************************************************************************** * * - * Function: main * - * * * Purpose: main function * * * * Parameters: * diff --git a/src/zabbix_proxy/datasender/datasender.c b/src/zabbix_proxy/datasender/datasender.c index e61dcf8b03e..554db42e824 100644 --- a/src/zabbix_proxy/datasender/datasender.c +++ b/src/zabbix_proxy/datasender/datasender.c @@ -56,8 +56,6 @@ extern unsigned int configured_tls_connect_mode; /****************************************************************************** * * - * Function: get_hist_upload_state * - * * * Purpose: Get current history upload state (disabled/enabled) * * * * Parameters: buffer - [IN] the contents of a packet (JSON) * @@ -85,8 +83,6 @@ static void get_hist_upload_state(const char *buffer, int *state) /****************************************************************************** * * - * Function: proxy_data_sender * - * * * Purpose: collects host availability, history, discovery, autoregistration * * data and sends 'proxy data' request * * * @@ -265,8 +261,6 @@ clean: /****************************************************************************** * * - * Function: main_datasender_loop * - * * * Purpose: periodically sends history and events to the server * * * ******************************************************************************/ diff --git a/src/zabbix_proxy/heart/heart.c b/src/zabbix_proxy/heart/heart.c index eec728a8441..f2b383ed822 100644 --- a/src/zabbix_proxy/heart/heart.c +++ b/src/zabbix_proxy/heart/heart.c @@ -40,8 +40,6 @@ extern unsigned int configured_tls_connect_mode; /****************************************************************************** * * - * Function: send_heartbeat * - * * ******************************************************************************/ static int send_heartbeat(void) { @@ -89,8 +87,6 @@ clean: /****************************************************************************** * * - * Function: main_heart_loop * - * * * Purpose: periodically send heartbeat message to the server * * * ******************************************************************************/ diff --git a/src/zabbix_proxy/housekeeper/housekeeper.c b/src/zabbix_proxy/housekeeper/housekeeper.c index 1bce57a1853..41b6bec3bf5 100644 --- a/src/zabbix_proxy/housekeeper/housekeeper.c +++ b/src/zabbix_proxy/housekeeper/housekeeper.c @@ -51,8 +51,6 @@ static void zbx_housekeeper_sigusr_handler(int flags) /****************************************************************************** * * - * Function: delete_history * - * * * Purpose: remove outdated information from historical table * * * * Parameters: now - current timestamp * @@ -130,8 +128,6 @@ rollback: /****************************************************************************** * * - * Function: housekeeping_history * - * * * Purpose: remove outdated information from history * * * * Parameters: now - current timestamp * diff --git a/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c index e0bfbf2f8ae..5f93bd3fdab 100644 --- a/src/zabbix_proxy/proxy.c +++ b/src/zabbix_proxy/proxy.c @@ -449,8 +449,6 @@ int get_process_info_by_thread(int local_server_num, unsigned char *local_proces /****************************************************************************** * * - * Function: zbx_set_defaults * - * * * Purpose: set configuration defaults * * * * Author: Rudolfs Kreicbergs * @@ -557,8 +555,6 @@ static void zbx_set_defaults(void) /****************************************************************************** * * - * Function: zbx_validate_config * - * * * Purpose: validate configuration parameters * * * * Author: Alexei Vladishev, Rudolfs Kreicbergs * @@ -687,8 +683,6 @@ static int proxy_add_serveractive_host_cb(const zbx_vector_ptr_t *addrs, zbx_vec /****************************************************************************** * * - * Function: zbx_load_config * - * * * Purpose: parse config file and update configuration parameters * * * * Author: Alexei Vladishev * @@ -936,8 +930,6 @@ static void zbx_load_config(ZBX_TASK_EX *task) /****************************************************************************** * * - * Function: zbx_free_config * - * * * Purpose: free configuration memory * * * ******************************************************************************/ @@ -948,8 +940,6 @@ static void zbx_free_config(void) /****************************************************************************** * * - * Function: main * - * * * Purpose: executes proxy processes * * * * Author: Eugene Grigorjev * diff --git a/src/zabbix_proxy/proxyconfig/proxyconfig.c b/src/zabbix_proxy/proxyconfig/proxyconfig.c index 5e209809681..2ccd6a38e55 100644 --- a/src/zabbix_proxy/proxyconfig/proxyconfig.c +++ b/src/zabbix_proxy/proxyconfig/proxyconfig.c @@ -57,8 +57,6 @@ static void zbx_proxyconfig_sigusr_handler(int flags) /****************************************************************************** * * - * Function: process_configuration_sync * - * * ******************************************************************************/ static void process_configuration_sync(size_t *data_size) { @@ -157,8 +155,6 @@ out: /****************************************************************************** * * - * Function: main_proxyconfig_loop * - * * * Purpose: periodically request config data * * * * Parameters: * diff --git a/src/zabbix_proxy/taskmanager/server_tasks.c b/src/zabbix_proxy/taskmanager/server_tasks.c index a2f057b98b6..8f86ad6ddd6 100644 --- a/src/zabbix_proxy/taskmanager/server_tasks.c +++ b/src/zabbix_proxy/taskmanager/server_tasks.c @@ -28,8 +28,6 @@ /****************************************************************************** * * - * Function: zbx_tm_get_remote_tasks * - * * * Purpose: get tasks scheduled to be executed on the server * * * * Parameters: tasks - [OUT] the tasks to execute * diff --git a/src/zabbix_proxy/taskmanager/taskmanager.c b/src/zabbix_proxy/taskmanager/taskmanager.c index 8395593a37f..d0fd8365f37 100644 --- a/src/zabbix_proxy/taskmanager/taskmanager.c +++ b/src/zabbix_proxy/taskmanager/taskmanager.c @@ -45,8 +45,6 @@ static volatile sig_atomic_t snmp_cache_reload_requested; /****************************************************************************** * * - * Function: tm_execute_remote_command * - * * * Purpose: execute remote command task * * * * Parameters: taskid - [IN] the task identifier * @@ -164,8 +162,6 @@ finish: /****************************************************************************** * * - * Function: tm_process_check_now * - * * * Purpose: process check now tasks for item rescheduling * * * * Return value: The number of successfully processed tasks * @@ -219,8 +215,6 @@ static int tm_process_check_now(zbx_vector_uint64_t *taskids) /****************************************************************************** * * - * Function: tm_execute_data_json * - * * * Purpose: process data task with json contents * * * * Return value: SUCCEED - the data task was executed * @@ -253,8 +247,6 @@ static int tm_execute_data_json(int type, const char *data, char **info) /****************************************************************************** * * - * Function: tm_execute_data * - * * * Purpose: process data task * * * * Return value: SUCCEED - the data task was executed * @@ -321,8 +313,6 @@ finish: /****************************************************************************** * * - * Function: tm_process_tasks * - * * * Purpose: process task manager tasks depending on task type * * * * Return value: The number of successfully processed tasks * @@ -383,8 +373,6 @@ static int tm_process_tasks(int now) /****************************************************************************** * * - * Function: tm_remove_old_tasks * - * * * Purpose: remove old done/expired tasks * * * ******************************************************************************/ diff --git a/src/zabbix_sender/win32/zabbix_sender.h b/src/zabbix_sender/win32/zabbix_sender.h index d588a38d9fd..d2889811857 100644 --- a/src/zabbix_sender/win32/zabbix_sender.h +++ b/src/zabbix_sender/win32/zabbix_sender.h @@ -50,8 +50,6 @@ zabbix_sender_info_t; /****************************************************************************** * * - * Function: zabbix_sender_send_values * - * * * Purpose: send values to Zabbix server/proxy * * * * Parameters: address - [IN] zabbix server/proxy address * @@ -74,8 +72,6 @@ ZBX_API int zabbix_sender_send_values(const char *address, unsigned short port, /****************************************************************************** * * - * Function: zabbix_sender_parse_result * - * * * Purpose: parses the result returned from zabbix_sender_send_values() * * function * * * @@ -97,8 +93,6 @@ ZBX_API int zabbix_sender_parse_result(const char *result, int *response, zabbix /****************************************************************************** * * - * Function: zabbix_sender_free_result * - * * * Purpose: free data allocated by zabbix_sender_send_values() function * * * * Parameters: ptr - [IN] pointer to the data to free * diff --git a/src/zabbix_sender/zabbix_sender.c b/src/zabbix_sender/zabbix_sender.c index 95eb1d9fbaf..1c94b022543 100644 --- a/src/zabbix_sender/zabbix_sender.c +++ b/src/zabbix_sender/zabbix_sender.c @@ -452,8 +452,6 @@ static void zbx_thread_handle_pipe_response(ZBX_THREAD_SENDVAL_ARGS *sendval_arg /****************************************************************************** * * - * Function: sender_threads_wait * - * * * Purpose: waits until the "threads" are in the signalled state and manages * * exit status updates * * * @@ -530,8 +528,6 @@ static int sender_threads_wait(ZBX_THREAD_HANDLE *threads, zbx_thread_args_t *th /****************************************************************************** * * - * Function: get_string * - * * * Purpose: get current string from the quoted or unquoted string list, * * delimited by blanks * * * @@ -630,8 +626,6 @@ static const char *get_string(const char *p, char *buf, size_t bufsize) /****************************************************************************** * * - * Function: check_response * - * * * Purpose: Check whether JSON response is SUCCEED * * * * Parameters: JSON response from Zabbix trapper * @@ -795,8 +789,6 @@ static ZBX_THREAD_ENTRY(send_value, args) /****************************************************************************** * * - * Function: perform_data_sending * - * * * Purpose: Send data to all destinations each in a separate thread and wait * * till threads have completed their task * * * @@ -860,8 +852,6 @@ static int perform_data_sending(ZBX_THREAD_SENDVAL_ARGS *sendval_args, int old_s /****************************************************************************** * * - * Function: sender_add_serveractive_host_cb * - * * * Purpose: add server or proxy to the list of destinations * * * * Parameters: * @@ -1462,8 +1452,6 @@ static void parse_commandline(int argc, char **argv) /****************************************************************************** * * - * Function: zbx_fgets_alloc * - * * * Purpose: reads a line from file * * * * Parameters: buffer - [IN/OUT] the output buffer * diff --git a/src/zabbix_server/actions.c b/src/zabbix_server/actions.c index c2b05b2afb0..2a44dd44027 100644 --- a/src/zabbix_server/actions.c +++ b/src/zabbix_server/actions.c @@ -32,8 +32,6 @@ /****************************************************************************** * * - * Function: compare_events * - * * * Purpose: compare events by objectid * * * * Parameters: d1 - [IN] event structure to compare to d2 * @@ -56,8 +54,6 @@ static int compare_events(const void *d1, const void *d2) /****************************************************************************** * * - * Function: add_condition_match * - * * * Purpose: save eventids that match condition * * * * Parameters: esc_events - [IN] events to check * @@ -103,8 +99,6 @@ static void add_condition_match(const zbx_vector_ptr_t *esc_events, zbx_conditio /****************************************************************************** * * - * Function: get_object_ids * - * * * Purpose: get objectids of escalation events * * * * Parameters: esc_events [IN] - events to check * @@ -130,8 +124,6 @@ static void get_object_ids(const zbx_vector_ptr_t *esc_events, zbx_vector_uint64 /****************************************************************************** * * - * Function: check_host_group_condition * - * * * Purpose: check host group condition * * * * Parameters: esc_events - [IN] events to check * @@ -216,8 +208,6 @@ static int check_host_group_condition(const zbx_vector_ptr_t *esc_events, zbx_co /****************************************************************************** * * - * Function: trigger_parents_sql_alloc * - * * * Purpose: mapping between discovered triggers and their prototypes * * * * Parameters: sql [IN/OUT] - allocated sql query * @@ -241,8 +231,6 @@ static void trigger_parents_sql_alloc(char **sql, size_t *sql_alloc, zbx_vector_ /****************************************************************************** * * - * Function: objectids_to_pair * - * * * Purpose: copy objects to pair, for hierarchy checks * * * * Parameters: objectids [IN] - objects * @@ -265,8 +253,6 @@ static void objectids_to_pair(zbx_vector_uint64_t *objectids, zbx_vector_uint64_ /****************************************************************************** * * - * Function: check_object_hierarchy * - * * * Purpose: there can be multiple levels of templates, that need * * resolving in order to compare to condition * * * @@ -404,8 +390,6 @@ static void check_object_hierarchy(int object, const zbx_vector_ptr_t *esc_event /****************************************************************************** * * - * Function: check_host_template_condition * - * * * Purpose: check host template condition * * * * Parameters: esc_events - [IN] events to check * @@ -470,8 +454,6 @@ static int check_host_template_condition(const zbx_vector_ptr_t *esc_events, zbx /****************************************************************************** * * - * Function: check_host_condition * - * * * Purpose: check host condition * * * * Parameters: esc_events - [IN] events to check * @@ -534,8 +516,6 @@ static int check_host_condition(const zbx_vector_ptr_t *esc_events, zbx_conditio /****************************************************************************** * * - * Function: check_trigger_id_condition * - * * * Purpose: check trigger id condition * * * * Parameters: esc_events - [IN] events to check * @@ -594,8 +574,6 @@ static int check_trigger_id_condition(const zbx_vector_ptr_t *esc_events, zbx_co /****************************************************************************** * * - * Function: check_trigger_name_condition * - * * * Purpose: check trigger name condition * * * * Parameters: esc_events - [IN] events to check * @@ -635,8 +613,6 @@ static int check_trigger_name_condition(const zbx_vector_ptr_t *esc_events, zbx_ /****************************************************************************** * * - * Function: check_trigger_severity_condition * - * * * Purpose: check trigger severity condition * * * * Parameters: esc_events - [IN] events to check * @@ -686,8 +662,6 @@ static int check_trigger_severity_condition(const zbx_vector_ptr_t *esc_events, /****************************************************************************** * * - * Function: check_time_period_condition * - * * * Purpose: check time period condition * * * * Parameters: esc_events - [IN] events to check * @@ -824,8 +798,6 @@ static int check_acknowledged_condition(const zbx_vector_ptr_t *esc_events, zbx_ /****************************************************************************** * * - * Function: check_condition_event_tag * - * * * Purpose: check condition event tag * * * * Parameters: esc_events - [IN] events to check * @@ -863,8 +835,6 @@ static void check_condition_event_tag(const zbx_vector_ptr_t *esc_events, zbx_co /****************************************************************************** * * - * Function: check_condition_event_tag_value * - * * * Purpose: check condition event tag value * * * * Parameters: esc_events - [IN] events to check * @@ -903,8 +873,6 @@ static void check_condition_event_tag_value(const zbx_vector_ptr_t *esc_events, /****************************************************************************** * * - * Function: check_trigger_condition * - * * * Purpose: check if event matches single condition * * * * Parameters: event - trigger event to check * @@ -976,8 +944,6 @@ static void check_trigger_condition(const zbx_vector_ptr_t *esc_events, zbx_cond /****************************************************************************** * * - * Function: get_object_ids_discovery * - * * * Purpose: get objectids for dhost * * * * Parameters: esc_events - [IN] events to check * @@ -1005,8 +971,6 @@ static void get_object_ids_discovery(const zbx_vector_ptr_t *esc_events, zbx_vec } /****************************************************************************** * * - * Function: check_drule_condition * - * * * Purpose: check discovery rule condition * * * * Parameters: esc_events - [IN] events to check * @@ -1103,8 +1067,6 @@ static int check_drule_condition(const zbx_vector_ptr_t *esc_events, zbx_conditi /****************************************************************************** * * - * Function: check_dcheck_condition * - * * * Purpose: check discovery check condition * * * * Parameters: esc_events - [IN] events to check * @@ -1178,8 +1140,6 @@ static int check_dcheck_condition(const zbx_vector_ptr_t *esc_events, zbx_condit /****************************************************************************** * * - * Function: check_dobject_condition * - * * * Purpose: check discovery object condition * * * * Parameters: esc_events - [IN] events to check * @@ -1210,8 +1170,6 @@ static int check_dobject_condition(const zbx_vector_ptr_t *esc_events, zbx_condi /****************************************************************************** * * - * Function: check_proxy_condition * - * * * Purpose: check proxy condition for discovery event * * * * Parameters: esc_events - [IN] events to check * @@ -1304,8 +1262,6 @@ static int check_proxy_condition(const zbx_vector_ptr_t *esc_events, zbx_conditi /****************************************************************************** * * - * Function: check_dvalue_condition * - * * * Purpose: check discovery value condition * * * * Parameters: esc_events - [IN] events to check * @@ -1407,8 +1363,6 @@ static int check_dvalue_condition(const zbx_vector_ptr_t *esc_events, zbx_condit /****************************************************************************** * * - * Function: check_dhost_ip_condition * - * * * Purpose: check host ip condition for discovery event * * * * Parameters: esc_events - [IN] events to check * @@ -1498,8 +1452,6 @@ static int check_dhost_ip_condition(const zbx_vector_ptr_t *esc_events, zbx_cond /****************************************************************************** * * - * Function: check_dservice_type_condition * - * * * Purpose: check service type condition for discovery event * * * * Parameters: esc_events - [IN] events to check * @@ -1580,8 +1532,6 @@ static int check_dservice_type_condition(const zbx_vector_ptr_t *esc_events, zbx /****************************************************************************** * * - * Function: check_dstatus_condition * - * * * Purpose: check discovery status condition * * * * Parameters: esc_events - [IN] events to check * @@ -1620,8 +1570,6 @@ static int check_dstatus_condition(const zbx_vector_ptr_t *esc_events, zbx_condi /****************************************************************************** * * - * Function: check_duptime_condition * - * * * Purpose: check uptime condition for discovery * * * * Parameters: esc_events - [IN] events to check * @@ -1716,8 +1664,6 @@ static int check_duptime_condition(const zbx_vector_ptr_t *esc_events, zbx_condi /****************************************************************************** * * - * Function: check_dservice_port_condition * - * * * Purpose: check service port condition for discovery * * * * Parameters: esc_events - [IN] events to check * @@ -1792,8 +1738,6 @@ static int check_dservice_port_condition(const zbx_vector_ptr_t *esc_events, zbx /****************************************************************************** * * - * Function: check_discovery_condition * - * * * Purpose: check if event matches single condition * * * * Parameters: event - discovery event to check * @@ -1860,8 +1804,6 @@ static void check_discovery_condition(const zbx_vector_ptr_t *esc_events, zbx_co /****************************************************************************** * * - * Function: check_hostname_metadata_condition * - * * * Purpose: check metadata or host condition for auto registration * * * * Parameters: esc_events - [IN] events to check * @@ -1947,8 +1889,6 @@ static int check_hostname_metadata_condition(const zbx_vector_ptr_t *esc_events, /****************************************************************************** * * - * Function: check_areg_proxy_condition * - * * * Purpose: check proxy condition for auto registration * * * * Parameters: esc_events - [IN] events to check * @@ -2017,8 +1957,6 @@ static int check_areg_proxy_condition(const zbx_vector_ptr_t *esc_events, zbx_co /****************************************************************************** * * - * Function: check_autoregistration_condition * - * * * Purpose: check if event matches single condition * * * * Parameters: event - autoregistration event to check * @@ -2063,8 +2001,6 @@ static void check_autoregistration_condition(const zbx_vector_ptr_t *esc_events, /****************************************************************************** * * - * Function: is_supported_event_object * - * * * Purpose: not all event objects are supported for internal events * * * * Parameters: events - [IN] events to check * @@ -2081,8 +2017,6 @@ static int is_supported_event_object(const DB_EVENT *event) /****************************************************************************** * * - * Function: check_intern_event_type_condition * - * * * Purpose: check event type condition for internal events * * * * Parameters: esc_events - [IN] events to check * @@ -2135,8 +2069,6 @@ static int check_intern_event_type_condition(const zbx_vector_ptr_t *esc_events, /****************************************************************************** * * - * Function: get_object_ids_internal * - * * * Purpose: get objectids of escalation internal events * * * * Parameters: esc_events - [IN] events to check * @@ -2175,8 +2107,6 @@ static void get_object_ids_internal(const zbx_vector_ptr_t *esc_events, zbx_vect /****************************************************************************** * * - * Function: check_intern_host_group_condition * - * * * Purpose: check host group condition for internal events * * * * Parameters: esc_events - [IN] events to check * @@ -2292,8 +2222,6 @@ static int check_intern_host_group_condition(const zbx_vector_ptr_t *esc_events, /****************************************************************************** * * - * Function: item_parents_sql_alloc * - * * * Purpose: get parent id from item discovery * * * * Parameters: sql [IN/OUT] - allocated sql query * @@ -2320,8 +2248,6 @@ static void item_parents_sql_alloc(char **sql, size_t *sql_alloc, zbx_vector_uin /****************************************************************************** * * - * Function: check_intern_host_template_condition * - * * * Purpose: check host template condition for internal events * * * * Parameters: esc_events - [IN] events to check * @@ -2415,8 +2341,6 @@ static int check_intern_host_template_condition(const zbx_vector_ptr_t *esc_even /****************************************************************************** * * - * Function: check_intern_host_condition * - * * * Purpose: check host condition for internal events * * * * Parameters: esc_events - [IN] events to check * @@ -2514,8 +2438,6 @@ static int check_intern_host_condition(const zbx_vector_ptr_t *esc_events, zbx_c /****************************************************************************** * * - * Function: check_internal_condition * - * * * Purpose: check if internal event matches single condition * * * * Parameters: event - [IN] trigger event to check * @@ -2569,8 +2491,6 @@ static void check_internal_condition(const zbx_vector_ptr_t *esc_events, zbx_con /****************************************************************************** * * - * Function: check_events_condition * - * * * Purpose: check if multiple events matches single condition * * * * Parameters: esc_events - [IN] events to check * @@ -2611,8 +2531,6 @@ static void check_events_condition(const zbx_vector_ptr_t *esc_events, unsigned /****************************************************************************** * * - * Function: check_action_condition * - * * * Purpose: check if event matches single condition * * * * Parameters: event - event to check * @@ -2649,8 +2567,6 @@ int check_action_condition(const DB_EVENT *event, zbx_condition_t *condition) /****************************************************************************** * * - * Function: check_action_conditions * - * * * Purpose: check if action have to be processed for the event * * (check all conditions of the action) * * * @@ -2758,8 +2674,6 @@ clean: /****************************************************************************** * * - * Function: execute_operations * - * * * Purpose: execute host, group, template operations linked to the action * * * * Parameters: action - action to execute operations for * @@ -2916,8 +2830,6 @@ zbx_escalation_new_t; /****************************************************************************** * * - * Function: is_recovery_event * - * * * Purpose: checks if the event is recovery event * * * * Parameters: event - [IN] the event to check * @@ -2957,8 +2869,6 @@ static int is_recovery_event(const DB_EVENT *event) /****************************************************************************** * * - * Function: is_escalation_event * - * * * Purpose: to determine if event needs condition checks * * * * Parameters: event - [IN] event to validate * @@ -2984,8 +2894,6 @@ static int is_escalation_event(const DB_EVENT *event) /****************************************************************************** * * - * Function: uniq_conditions_compare_func * - * * * Purpose: compare to find equal conditions * * * * Parameters: d1 - [IN] condition structure to compare to d2 * @@ -3014,8 +2922,6 @@ static int uniq_conditions_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: uniq_conditions_hash_func * - * * * Purpose: generate hash based on condition values * * * * Parameters: data - [IN] condition structure * @@ -3039,8 +2945,6 @@ static zbx_hash_t uniq_conditions_hash_func(const void *data) /****************************************************************************** * * - * Function: get_escalation_events * - * * * Purpose: add events that have escalation possible and skip others, also * * adds according to source * * * @@ -3064,8 +2968,6 @@ static void get_escalation_events(const zbx_vector_ptr_t *events, zbx_vector_ptr /****************************************************************************** * * - * Function: db_condition_clean * - * * * Purpose: cleans condition data structure * * * * Parameters: condition - [IN] the condition data to free * @@ -3080,8 +2982,6 @@ static void db_condition_clean(zbx_condition_t *condition) /****************************************************************************** * * - * Function: zbx_conditions_eval_clean * - * * * Purpose: cleans condition data structures from hashset * * * * Parameters: uniq_conditions - [IN] hashset with data structures to clean * @@ -3100,8 +3000,6 @@ static void conditions_eval_clean(zbx_hashset_t *uniq_conditions) /****************************************************************************** * * - * Function: zbx_action_eval_free * - * * * Purpose: frees action evaluation data structure * * * * Parameters: action - [IN] the action evaluation to free * @@ -3118,8 +3016,6 @@ static void zbx_action_eval_free(zbx_action_eval_t *action) /****************************************************************************** * * - * Function: prepare_actions_conditions_eval * - * * * Purpose: make actions to point, to conditions from hashset, where all * * conditions are unique, this ensures that we don't double check * * same conditions. * @@ -3187,8 +3083,6 @@ static void prepare_actions_conditions_eval(zbx_vector_ptr_t *actions, zbx_hashs /****************************************************************************** * * - * Function: process_actions * - * * * Purpose: process all actions of each event in a list * * * * Parameters: events - [IN] events to apply actions for * @@ -3412,8 +3306,6 @@ void process_actions(const zbx_vector_ptr_t *events, const zbx_vector_uint64_pai /****************************************************************************** * * - * Function: process_actions_by_acknowledgements * - * * * Purpose: process actions for each acknowledgement in the array * * * * Parameters: event_ack - [IN] vector for eventid/ackid pairs * @@ -3575,8 +3467,6 @@ out: /****************************************************************************** * * - * Function: get_actions_info * - * * * Purpose: reads actions from database * * * * Parameters: actionids - [IN] requested action ids * diff --git a/src/zabbix_server/alerter/alert_manager.c b/src/zabbix_server/alerter/alert_manager.c index 40b6cb04629..4e1d029a626 100644 --- a/src/zabbix_server/alerter/alert_manager.c +++ b/src/zabbix_server/alerter/alert_manager.c @@ -354,8 +354,6 @@ static void shared_str_release(zbx_shared_str_t str) /****************************************************************************** * * - * Function: am_dispatch_free * - * * ******************************************************************************/ static void am_dispatch_free(zbx_am_dispatch_t *dispatch) { @@ -369,8 +367,6 @@ static void am_dispatch_free(zbx_am_dispatch_t *dispatch) /****************************************************************************** * * - * Function: am_get_mediatype * - * * * Purpose: gets media type object * * * * Parameters: manager - [IN] the alert manager * @@ -386,8 +382,6 @@ static zbx_am_mediatype_t *am_get_mediatype(zbx_am_t *manager, zbx_uint64_t medi /****************************************************************************** * * - * Function: zbx_am_update_webhook * - * * * Purpose: updates additional webhook media type fields * * * ******************************************************************************/ @@ -420,8 +414,6 @@ static void zbx_am_update_webhook(zbx_am_t *manager, zbx_am_mediatype_t *mediaty /****************************************************************************** * * - * Function: am_update_mediatype * - * * * Purpose: updates media type object, creating one if necessary * * * * Parameters: manager - [IN] the alert manager * @@ -493,8 +485,6 @@ static void am_update_mediatype(zbx_am_t *manager, zbx_uint64_t mediatypeid, uns /****************************************************************************** * * - * Function: am_push_mediatype * - * * * Purpose: pushes media type into manager media type queue * * * * Parameters: manager - [IN] the alert manager * @@ -528,8 +518,6 @@ static void am_push_mediatype(zbx_am_t *manager, zbx_am_mediatype_t *mediatype) /****************************************************************************** * * - * Function: am_pop_mediatype * - * * * Purpose: gets the next media type from queue * * * * Parameters: manager - [IN] the alert manager * @@ -556,8 +544,6 @@ static zbx_am_mediatype_t *am_pop_mediatype(zbx_am_t *manager) /****************************************************************************** * * - * Function: am_remove_mediatype * - * * ******************************************************************************/ static void am_remove_mediatype(zbx_am_t *manager, zbx_am_mediatype_t *mediatype) { @@ -581,8 +567,6 @@ static void am_remove_mediatype(zbx_am_t *manager, zbx_am_mediatype_t *mediatype /****************************************************************************** * * - * Function: am_release_mediatype * - * * ******************************************************************************/ static int am_release_mediatype(zbx_am_t *manager, zbx_am_mediatype_t *mediatype) { @@ -597,8 +581,6 @@ static int am_release_mediatype(zbx_am_t *manager, zbx_am_mediatype_t *mediatype /****************************************************************************** * * - * Function: am_calc_alertpoolid * - * * * Purpose: calculate alert pool id from event source, object and objectid * * * * Parameters: source - [IN] the event source * @@ -629,8 +611,6 @@ static zbx_uint64_t am_calc_alertpoolid(int source, int object, zbx_uint64_t obj /****************************************************************************** * * - * Function: am_get_alertpool * - * * * Purpose: gets alert pool object, creating one if the object with specified * * identifiers was not found * * * @@ -665,8 +645,6 @@ static zbx_am_alertpool_t *am_get_alertpool(zbx_am_t *manager, zbx_uint64_t medi /****************************************************************************** * * - * Function: am_push_alertpool * - * * * Purpose: pushes alert pool into media type alert pool queue * * * * Parameters: mediatype - [IN] the media type * @@ -694,8 +672,6 @@ static void am_push_alertpool(zbx_am_mediatype_t *mediatype, zbx_am_alertpool_t /****************************************************************************** * * - * Function: am_pop_alertpool * - * * * Purpose: gets the next alert pool from queue * * * * Parameters: mediatype - [IN] the media type * @@ -722,8 +698,6 @@ static zbx_am_alertpool_t *am_pop_alertpool(zbx_am_mediatype_t *mediatype) /****************************************************************************** * * - * Function: am_release_alertpool * - * * * Purpose: removes alert pool * * * * Parameters: manager - [IN] the alert manager * @@ -747,8 +721,6 @@ static int am_release_alertpool(zbx_am_t *manager, zbx_am_alertpool_t *alertpool /****************************************************************************** * * - * Function: am_create_alert * - * * * Purpose: creates new alert object * * * * Parameters: ... - [IN] alert data * @@ -797,8 +769,6 @@ static zbx_am_alert_t *am_create_alert(zbx_uint64_t alertid, zbx_uint64_t mediat /****************************************************************************** * * - * Function: am_copy_db_alert * - * * * Purpose: creates new alert object from db alert * * * * Parameters: db_alert - [IN] the db alert object * @@ -841,8 +811,6 @@ static zbx_am_alert_t *am_copy_db_alert(zbx_am_db_alert_t *db_alert) /****************************************************************************** * * - * Function: am_alert_free * - * * * Purpose: frees the alert object * * * * Parameters: alert - [IN] the alert object * @@ -859,8 +827,6 @@ static void am_alert_free(zbx_am_alert_t *alert) /****************************************************************************** * * - * Function: am_push_alert * - * * * Purpose: pushes alert into alert pool alert queue * * * * Parameters: alertpool - [IN] the alert pool * @@ -876,8 +842,6 @@ static void am_push_alert(zbx_am_alertpool_t *alertpool, zbx_am_alert_t *alert) /****************************************************************************** * * - * Function: am_pop_alert * - * * * Purpose: gets the next alert from queue * * * * Parameters: manager - [IN] the manager * @@ -912,8 +876,6 @@ static zbx_am_alert_t *am_pop_alert(zbx_am_t *manager) /****************************************************************************** * * - * Function: am_remove_alert * - * * * Purpose: removes alert and requeues associated alert pool and media type * * * * Parameters: manager - [IN] the alert manager * @@ -947,8 +909,6 @@ static void am_remove_alert(zbx_am_t *manager, zbx_am_alert_t *alert) /****************************************************************************** * * - * Function: am_retry_alert * - * * * Purpose: retries alert if there are attempts left or removes it * * * * Parameters: manager - [IN] the alert manager * @@ -993,8 +953,6 @@ out: /****************************************************************************** * * - * Function: am_alerter_free * - * * * Purpose: frees alerter * * * ******************************************************************************/ @@ -1006,8 +964,6 @@ static void am_alerter_free(zbx_am_alerter_t *alerter) /****************************************************************************** * * - * Function: am_register_alerter * - * * * Purpose: registers alerter * * * * Parameters: manager - [IN] the manager * @@ -1052,8 +1008,6 @@ static void am_register_alerter(zbx_am_t *manager, zbx_ipc_client_t *client, zbx /****************************************************************************** * * - * Function: am_get_alerter_by_client * - * * * Purpose: returns alerter by connected client * * * * Parameters: manager - [IN] the manager * @@ -1089,8 +1043,6 @@ static zbx_am_alerter_t *am_get_alerter_by_client(zbx_am_t *manager, zbx_ipc_cli /****************************************************************************** * * - * Function: am_create_db_alert_message * - * * * Purpose: get and format error message from database when it is unavailable * * * * Return value: full database error message is allocated * @@ -1131,8 +1083,6 @@ static char *am_create_db_alert_message(void) /****************************************************************************** * * - * Function: am_queue_watchdog_alerts * - * * * Purpose: queues 'database down' watchdog alerts * * * * Parameters: manager - [IN] the alert manager * @@ -1188,8 +1138,6 @@ static void am_queue_watchdog_alerts(zbx_am_t *manager) /****************************************************************************** * * - * Function: am_init * - * * * Purpose: initializes alert manager * * * * Parameters: manager - [IN] the manager to initialize * @@ -1236,8 +1184,6 @@ out: /****************************************************************************** * * - * Function: am_destroy * - * * * Purpose: destroys alert manager * * * * Parameters: manager - [IN] the manager to destroy * @@ -1276,8 +1222,6 @@ static void am_destroy(zbx_am_t *manager) /****************************************************************************** * * - * Function: am_db_update_alert * - * * * Purpose: update alert status in local cache to be flushed after reading * * new alerts from database * * * @@ -1323,8 +1267,6 @@ static void am_db_update_alert(zbx_am_t *manager, zbx_am_alert_t *alert, int sta /****************************************************************************** * * - * Function: am_external_alert_send_response * - * * * Purpose: send response to external alert request * * * * Parameters: alerter_service - [IN] the IPC service * @@ -1354,8 +1296,6 @@ static void am_external_alert_send_response(const zbx_ipc_service_t *alerter_ser /****************************************************************************** * * - * Function: am_sync_watchdog * - * * * Purpose: synchronize watchdog alert recipients * * * * Parameters: manager - [IN] the manager * @@ -1423,8 +1363,6 @@ static void am_sync_watchdog(zbx_am_t *manager, zbx_am_media_t **medias, int med /****************************************************************************** * * - * Function: am_prepare_mediatype_exec_command * - * * * Purpose: gets script media type parameters with expanded macros * * * * Parameters: mediatype - [IN] the media type * @@ -1492,8 +1430,6 @@ static int am_prepare_mediatype_exec_command(zbx_am_mediatype_t *mediatype, zbx_ /****************************************************************************** * * - * Function: am_process_alert * - * * * Purpose: sends alert to the alerter * * * * Parameters: manager - [IN] the alert manager * @@ -1607,8 +1543,6 @@ out: /****************************************************************************** * * - * Function: am_process_result * - * * * Purpose: process alerter result * * * * Parameters: manager - [IN] the manager * @@ -1684,8 +1618,6 @@ out: /****************************************************************************** * * - * Function: am_check_queue * - * * * Purpose: checks alert queue if there is an alert that should be sent now * * * * Parameters: manager - [IN] the alert manager * @@ -1728,8 +1660,6 @@ static int am_check_queue(zbx_am_t *manager, int now) /****************************************************************************** * * - * Function: am_update_mediatypes * - * * * Purpose: update cached media types * * * ******************************************************************************/ @@ -1764,8 +1694,6 @@ static void am_update_mediatypes(zbx_am_t *manager, zbx_ipc_message_t *message) /****************************************************************************** * * - * Function: am_queue_alert * - * * * Purpose: queue new alerts * * * ******************************************************************************/ @@ -1795,8 +1723,6 @@ static int am_queue_alert(zbx_am_t *manager, zbx_am_alert_t *alert, int now) /****************************************************************************** * * - * Function: am_queue_alerts * - * * * Purpose: queue new alerts * * * ******************************************************************************/ @@ -1824,8 +1750,6 @@ static void am_queue_alerts(zbx_am_t *manager, zbx_ipc_message_t *message, int n /****************************************************************************** * * - * Function: am_update_watchdog * - * * * Purpose: update 'database down' watchdog alert recipients * * * ******************************************************************************/ @@ -1844,8 +1768,6 @@ static void am_update_watchdog(zbx_am_t *manager, zbx_ipc_message_t *message) /****************************************************************************** * * - * Function: am_drop_mediatypes * - * * * Purpose: remove unused mediatypes * * * ******************************************************************************/ @@ -1873,8 +1795,6 @@ static void am_drop_mediatypes(zbx_am_t *manager, zbx_ipc_message_t *message) /****************************************************************************** * * - * Function: am_flush_results * - * * * Purpose: returns alert sending results * * * ******************************************************************************/ @@ -1926,8 +1846,6 @@ out: /****************************************************************************** * * - * Function: am_process_external_alert_request * - * * * Purpose: process external alert request * * * * Parameters: manager - [IN] the alert manager * @@ -1990,8 +1908,6 @@ static void am_process_external_alert_request(zbx_am_t *manager, zbx_uint64_t id /****************************************************************************** * * - * Function: am_process_begin_dispatch * - * * * Purpose: begin file dispatch * * * * Parameters: manager - [IN] the manager * @@ -2017,8 +1933,6 @@ static void am_process_begin_dispatch(zbx_ipc_client_t *client, const unsigned c /****************************************************************************** * * - * Function: am_prepare_dispatch_message * - * * * Purpose: prepare message to dispatch by attaching dispatch contents for * * supported media types * * * @@ -2057,8 +1971,6 @@ static void am_prepare_dispatch_message(zbx_am_dispatch_t *dispatch, DB_MEDIATYP /****************************************************************************** * * - * Function: am_process_send_dispatch * - * * * Purpose: send dispatch to the specified media type users * * * * Parameters: manager - [IN] the manager * @@ -2125,8 +2037,6 @@ out: /****************************************************************************** * * - * Function: am_process_end_dispatch * - * * * Purpose: finish sending dispatches * * * * Parameters: client - [IN] the connected worker IPC client * @@ -2147,8 +2057,6 @@ static void am_process_end_dispatch(zbx_ipc_client_t *client) /****************************************************************************** * * - * Function: am_remove_unused_mediatypes * - * * * Purpose: remove unused media types * * * ******************************************************************************/ @@ -2167,8 +2075,6 @@ static void am_remove_unused_mediatypes(zbx_am_t *manager) /****************************************************************************** * * - * Function: am_process_diag_stats * - * * * Purpose: process diagnostic statistics request * * * ******************************************************************************/ @@ -2184,8 +2090,6 @@ static void am_process_diag_stats(zbx_am_t *manager, zbx_ipc_client_t *client) /****************************************************************************** * * - * Function: am_compare_mediatype_by_alerts_desc * - * * * Purpose: compare mediatypes by total queued alerts * * * ******************************************************************************/ @@ -2199,8 +2103,6 @@ static int am_compare_mediatype_by_alerts_desc(const void *d1, const void *d2) /****************************************************************************** * * - * Function: am_process_diag_top_mediatypes * - * * * Purpose: processes top mediatypes by queued alerts * * * * Parameters: manager - [IN] the manager * @@ -2274,8 +2176,6 @@ static int am_source_compare_func(const void *d1, const void *d2) } /****************************************************************************** * * - * Function: am_process_diag_top_sources * - * * * Purpose: processes top alert sources by queued alerts * * * * Parameters: manager - [IN] the manager * diff --git a/src/zabbix_server/alerter/alert_syncer.c b/src/zabbix_server/alerter/alert_syncer.c index e022224f727..9ef0265f26c 100644 --- a/src/zabbix_server/alerter/alert_syncer.c +++ b/src/zabbix_server/alerter/alert_syncer.c @@ -53,8 +53,6 @@ zbx_am_db_t; /****************************************************************************** * * - * Function: am_db_create_alert * - * * * Purpose: creates new alert object * * * * Parameters: ... - [IN] alert data * @@ -90,8 +88,6 @@ static zbx_am_db_alert_t *am_db_create_alert(zbx_uint64_t alertid, zbx_uint64_t /****************************************************************************** * * - * Function: am_db_init * - * * ******************************************************************************/ static int am_db_init(zbx_am_db_t *amdb, char **error) { @@ -105,8 +101,6 @@ static int am_db_init(zbx_am_db_t *amdb, char **error) /****************************************************************************** * * - * Function: am_db_clear * - * * ******************************************************************************/ static void am_db_clear(zbx_am_db_t *amdb) { @@ -122,8 +116,6 @@ static void am_db_clear(zbx_am_db_t *amdb) /****************************************************************************** * * - * Function: am_db_get_alerts * - * * * Purpose: reads the new alerts from database * * * * Parameters: alerts - [OUT] the new alerts * @@ -254,8 +246,6 @@ static int am_db_get_alerts(zbx_vector_ptr_t *alerts) /****************************************************************************** * * - * Function: am_db_update_mediatype * - * * * Purpose: updates media type object, creating one if necessary * * * * Return value: Updated mediatype or NULL, if the cached media was up to * @@ -315,8 +305,6 @@ static zbx_am_db_mediatype_t *am_db_update_mediatype(zbx_am_db_t *amdb, time_t n /****************************************************************************** * * - * Function: am_db_update_mediatypes * - * * * Purpose: updates alert manager media types * * * * Parameters: amdb - [IN] the alert manager cache * @@ -388,8 +376,6 @@ static void am_db_update_mediatypes(zbx_am_db_t *amdb, const zbx_uint64_t *media /****************************************************************************** * * - * Function: am_db_queue_alerts * - * * * Purpose: reads alerts/mediatypes from database and queues them in alert * * manager * * * @@ -504,8 +490,6 @@ static void event_tags_free(zbx_event_tags_t *event_tags) /****************************************************************************** * * - * Function: am_db_update_event_tags * - * * * Purpose: adds event tags to sql query * * * * Parameters: eventid - [IN] problem_tag update db event * @@ -604,8 +588,6 @@ out: /****************************************************************************** * * - * Function: am_db_validate_tags_for_update * - * * * Purpose: removes duplicate event tags and checks if problem tags need to * * be updated * * * @@ -692,8 +674,6 @@ static void am_service_add_event_tags(zbx_vector_events_tags_t *events_tags) /****************************************************************************** * * - * Function: am_db_flush_results * - * * * Purpose: retrieves alert updates from alert manager and flushes them into * * database * * * @@ -816,8 +796,6 @@ static int am_db_flush_results(zbx_am_db_t *amdb) } /****************************************************************************** * * - * Function: am_db_remove_expired_mediatypes * - * * * Purpose: removes cached media types used more than a day ago * * * * Parameters: amdb - [IN] the alert manager cache * @@ -864,8 +842,6 @@ static void am_db_remove_expired_mediatypes(zbx_am_db_t *amdb) /****************************************************************************** * * - * Function: am_db_update_watchdog * - * * * Purpose: updates watchdog recipients * * * * Parameters: amdb - [IN] the alert manager cache * diff --git a/src/zabbix_server/alerter/alerter.c b/src/zabbix_server/alerter/alerter.c index 346d094d6ae..099c6fc264a 100644 --- a/src/zabbix_server/alerter/alerter.c +++ b/src/zabbix_server/alerter/alerter.c @@ -44,8 +44,6 @@ static zbx_es_t es_engine; /****************************************************************************** * * - * Function: execute_script_alert * - * * * Purpose: execute script alert type * * * ******************************************************************************/ @@ -66,8 +64,6 @@ static int execute_script_alert(const char *command, char *error, size_t max_err /****************************************************************************** * * - * Function: alerter_register * - * * * Purpose: registers alerter with alert manager * * * * Parameters: socket - [IN] the connections socket * @@ -84,8 +80,6 @@ static void alerter_register(zbx_ipc_socket_t *socket) /****************************************************************************** * * - * Function: alerter_send_result * - * * * Purpose: sends alert sending result to alert manager * * * * Parameters: socket - [IN] the connections socket * @@ -108,8 +102,6 @@ static void alerter_send_result(zbx_ipc_socket_t *socket, const char *value, int /****************************************************************************** * * - * Function: create_email_inreplyto * - * * * Purpose: create email In-Reply_To field value to group related messages * * * ******************************************************************************/ @@ -142,8 +134,6 @@ static char *create_email_inreplyto(zbx_uint64_t mediatypeid, const char *sendto /****************************************************************************** * * - * Function: alerter_process_email * - * * * Purpose: processes email alert * * * * Parameters: socket - [IN] the connections socket * @@ -185,8 +175,6 @@ static void alerter_process_email(zbx_ipc_socket_t *socket, zbx_ipc_message_t *i /****************************************************************************** * * - * Function: alerter_process_sms * - * * * Purpose: processes SMS alert * * * * Parameters: socket - [IN] the connections socket * @@ -214,8 +202,6 @@ static void alerter_process_sms(zbx_ipc_socket_t *socket, zbx_ipc_message_t *ipc /****************************************************************************** * * - * Function: alerter_process_exec * - * * * Purpose: processes script alert * * * * Parameters: socket - [IN] the connections socket * @@ -240,8 +226,6 @@ static void alerter_process_exec(zbx_ipc_socket_t *socket, zbx_ipc_message_t *ip /****************************************************************************** * * - * Function: alerter_process_webhook * - * * * Purpose: processes webhook alert * * * * Parameters: socket - [IN] the connections socket * @@ -297,8 +281,6 @@ static void alerter_process_webhook(zbx_ipc_socket_t *socket, zbx_ipc_message_t /****************************************************************************** * * - * Function: main_alerter_loop * - * * * Purpose: periodically check table alerts and send notifications if needed * * * * Author: Alexei Vladishev * diff --git a/src/zabbix_server/alerter/alerter_protocol.c b/src/zabbix_server/alerter/alerter_protocol.c index f359e3575fa..ad4619e4c54 100644 --- a/src/zabbix_server/alerter/alerter_protocol.c +++ b/src/zabbix_server/alerter/alerter_protocol.c @@ -44,8 +44,6 @@ void zbx_am_db_mediatype_clear(zbx_am_db_mediatype_t *mediatype) /****************************************************************************** * * - * Function: zbx_am_db_alert_free * - * * * Purpose: frees the alert object * * * * Parameters: alert - [IN] the alert object * @@ -772,8 +770,6 @@ void zbx_alerter_deserialize_ids(const unsigned char *data, zbx_uint64_t **ids, /****************************************************************************** * * - * Function: zbx_alerter_serialize_diag_stats * - * * ******************************************************************************/ zbx_uint32_t zbx_alerter_serialize_diag_stats(unsigned char **data, zbx_uint64_t alerts_num) { @@ -788,8 +784,6 @@ zbx_uint32_t zbx_alerter_serialize_diag_stats(unsigned char **data, zbx_uint64_t /****************************************************************************** * * - * Function: zbx_alerter_deserialize_diag_stats * - * * ******************************************************************************/ static void zbx_alerter_deserialize_diag_stats(const unsigned char *data, zbx_uint64_t *alerts_num) { @@ -798,8 +792,6 @@ static void zbx_alerter_deserialize_diag_stats(const unsigned char *data, zbx_ui /****************************************************************************** * * - * Function: zbx_alerter_serialize_top_request * - * * ******************************************************************************/ static zbx_uint32_t zbx_alerter_serialize_top_request(unsigned char **data, int limit) { @@ -813,8 +805,6 @@ static zbx_uint32_t zbx_alerter_serialize_top_request(unsigned char **data, int /****************************************************************************** * * - * Function: zbx_alerter_deserialize_top_request * - * * ******************************************************************************/ void zbx_alerter_deserialize_top_request(const unsigned char *data, int *limit) { @@ -823,8 +813,6 @@ void zbx_alerter_deserialize_top_request(const unsigned char *data, int *limit) /****************************************************************************** * * - * Function: zbx_alerter_serialize_top_mediatypes_result * - * * ******************************************************************************/ zbx_uint32_t zbx_alerter_serialize_top_mediatypes_result(unsigned char **data, zbx_am_mediatype_t **mediatypes, int mediatypes_num) @@ -857,8 +845,6 @@ zbx_uint32_t zbx_alerter_serialize_top_mediatypes_result(unsigned char **data, z /****************************************************************************** * * - * Function: zbx_alerter_deserialize_top_mediatypes_result * - * * ******************************************************************************/ static void zbx_alerter_deserialize_top_mediatypes_result(const unsigned char *data, zbx_vector_uint64_pair_t *mediatypes) @@ -886,8 +872,6 @@ static void zbx_alerter_deserialize_top_mediatypes_result(const unsigned char *d /****************************************************************************** * * - * Function: zbx_alerter_serialize_top_sources_result * - * * ******************************************************************************/ zbx_uint32_t zbx_alerter_serialize_top_sources_result(unsigned char **data, zbx_am_source_stats_t **sources, int sources_num) @@ -924,8 +908,6 @@ zbx_uint32_t zbx_alerter_serialize_top_sources_result(unsigned char **data, zbx_ /****************************************************************************** * * - * Function: zbx_alerter_deserialize_top_sources_result * - * * ******************************************************************************/ static void zbx_alerter_deserialize_top_sources_result(const unsigned char *data, zbx_vector_ptr_t *sources) { @@ -953,8 +935,6 @@ static void zbx_alerter_deserialize_top_sources_result(const unsigned char *data /****************************************************************************** * * - * Function: zbx_alerter_get_diag_stats * - * * * Purpose: get alerter manager diagnostic statistics * * * ******************************************************************************/ @@ -976,8 +956,6 @@ int zbx_alerter_get_diag_stats(zbx_uint64_t *alerts_num, char **error) /****************************************************************************** * * - * Function: zbx_alerter_get_top_mediatypes * - * * * Purpose: get the top N mediatypes by the number of queued alerts * * * * Parameters limit - [IN] the number of top records to retrieve * @@ -1012,8 +990,6 @@ out: /****************************************************************************** * * - * Function: zbx_alerter_get_top_sources * - * * * Purpose: get the top N sources by the number of queued alerts * * * * Parameters limit - [IN] the number of top records to retrieve * @@ -1172,8 +1148,6 @@ void zbx_alerter_deserialize_send_dispatch(const unsigned char *data, DB_MEDIATY /****************************************************************************** * * - * Function: zbx_alerter_begin_dispatch * - * * * Purpose: begin data dispatch * * * * Parameters: dispatch - [IN] the dispatcher * @@ -1235,8 +1209,6 @@ out: /****************************************************************************** * * - * Function: zbx_alerter_send_dispatch * - * * * Purpose: dispatch data * * * * Parameters: dispatch - [IN] the dispatcher * @@ -1279,8 +1251,6 @@ out: /****************************************************************************** * * - * Function: zbx_alerter_end_dispatch * - * * * Purpose: finish data dispatch * * * * Parameters: dispatch - [IN] the dispatcher * diff --git a/src/zabbix_server/dbconfig/dbconfig.c b/src/zabbix_server/dbconfig/dbconfig.c index e8c0f13761e..537a8cc4e55 100644 --- a/src/zabbix_server/dbconfig/dbconfig.c +++ b/src/zabbix_server/dbconfig/dbconfig.c @@ -64,8 +64,6 @@ static void zbx_dbconfig_sigusr_handler(int flags) /****************************************************************************** * * - * Function: main_dbconfig_loop * - * * * Purpose: periodically synchronises database data with memory cache * * * * Parameters: * diff --git a/src/zabbix_server/dbsyncer/dbsyncer.c b/src/zabbix_server/dbsyncer/dbsyncer.c index 65aa4bfa6f0..dbe45000702 100644 --- a/src/zabbix_server/dbsyncer/dbsyncer.c +++ b/src/zabbix_server/dbsyncer/dbsyncer.c @@ -37,8 +37,6 @@ static sigset_t orig_mask; /****************************************************************************** * * - * Function: zbx_db_flush_timer_queue * - * * * Purpose: flush timer queue to the database * * * ******************************************************************************/ @@ -81,8 +79,6 @@ static void db_trigger_queue_cleanup(void) /****************************************************************************** * * - * Function: main_dbsyncer_loop * - * * * Purpose: periodically synchronises data in memory cache with database * * * * Author: Alexei Vladishev * diff --git a/src/zabbix_server/discoverer/discoverer.c b/src/zabbix_server/discoverer/discoverer.c index 40be2d13daf..83d454710d9 100644 --- a/src/zabbix_server/discoverer/discoverer.c +++ b/src/zabbix_server/discoverer/discoverer.c @@ -47,8 +47,6 @@ static volatile sig_atomic_t snmp_cache_reload_requested; /****************************************************************************** * * - * Function: proxy_update_service * - * * * Purpose: process new service status * * * * Parameters: service - service info * @@ -74,8 +72,6 @@ static void proxy_update_service(zbx_uint64_t druleid, zbx_uint64_t dcheckid, co /****************************************************************************** * * - * Function: proxy_update_host * - * * * Purpose: process new service status * * * * Parameters: service - service info * @@ -98,8 +94,6 @@ static void proxy_update_host(zbx_uint64_t druleid, const char *ip, const char * /****************************************************************************** * * - * Function: discover_service * - * * * Purpose: check if service is available * * * * Parameters: service type, ip address, port number * @@ -337,8 +331,6 @@ static int discover_service(const DB_DCHECK *dcheck, char *ip, int port, char ** /****************************************************************************** * * - * Function: process_check * - * * * Purpose: check if service is available and update database * * * * Parameters: service - service info * @@ -407,8 +399,6 @@ static void process_check(const DB_DCHECK *dcheck, int *host_status, char *ip, i /****************************************************************************** * * - * Function: process_checks * - * * ******************************************************************************/ static void process_checks(const DB_DRULE *drule, int *host_status, char *ip, int unique, int now, zbx_vector_ptr_t *services, zbx_vector_uint64_t *dcheckids) @@ -463,8 +453,6 @@ static void process_checks(const DB_DRULE *drule, int *host_status, char *ip, in /****************************************************************************** * * - * Function: process_services * - * * ******************************************************************************/ static int process_services(const DB_DRULE *drule, DB_DHOST *dhost, const char *ip, const char *dns, int now, const zbx_vector_ptr_t *services, zbx_vector_uint64_t *dcheckids) @@ -504,8 +492,6 @@ fail: /****************************************************************************** * * - * Function: process_rule * - * * * Purpose: process single discovery rule * * * ******************************************************************************/ @@ -644,8 +630,6 @@ out: /****************************************************************************** * * - * Function: discovery_clean_services * - * * * Purpose: clean dservices and dhosts not presenting in drule * * * ******************************************************************************/ @@ -876,8 +860,6 @@ static void zbx_discoverer_sigusr_handler(int flags) /****************************************************************************** * * - * Function: discoverer_thread * - * * * Purpose: periodically try to find new hosts and services * * * ******************************************************************************/ diff --git a/src/zabbix_server/escalator/escalator.c b/src/zabbix_server/escalator/escalator.c index 5b28d283861..957fea7be15 100644 --- a/src/zabbix_server/escalator/escalator.c +++ b/src/zabbix_server/escalator/escalator.c @@ -154,8 +154,6 @@ static int get_user_info(zbx_uint64_t userid, zbx_uint64_t *roleid, char **user_ /****************************************************************************** * * - * Function: get_hostgroups_permission * - * * * Purpose: Return user permissions for access to the host * * * * Parameters: * @@ -199,8 +197,6 @@ out: /****************************************************************************** * * - * Function: check_tag_based_permission * - * * * Purpose: Check user access to event by tags * * * * Parameters: userid - user id * @@ -293,8 +289,6 @@ static int check_tag_based_permission(zbx_uint64_t userid, zbx_vector_uint64_t * /****************************************************************************** * * - * Function: get_trigger_permission * - * * * Purpose: Return user permissions for access to trigger * * * * Return value: PERM_DENY - if host or user not found, * @@ -350,8 +344,6 @@ out: /****************************************************************************** * * - * Function: get_item_permission * - * * * Purpose: Return user permissions for access to item * * * * Return value: PERM_DENY - if host or user not found, * @@ -575,8 +567,6 @@ static void zbx_db_cache_service_role(zbx_service_role_t *role) /****************************************************************************** * * - * Function: get_service_permission * - * * * Purpose: Return user permissions for access to services * * * * Return value: PERM_DENY - if host or user not found, * @@ -889,8 +879,6 @@ clean: /****************************************************************************** * * - * Function: add_sentusers_msg * - * * * Purpose: adds message to be sent to all recipients of messages previously * * generated by action operations or acknowledgement operations, * * which is related with an event or recovery event * @@ -993,8 +981,6 @@ clean: /****************************************************************************** * * - * Function: add_sentusers_msg_esc_cancel * - * * * Purpose: adds message for the canceled escalation to be sent to all * * recipients of messages previously generated by action operations * * or acknowledgement operations, which is related with an event or * @@ -1094,8 +1080,6 @@ clean: /****************************************************************************** * * - * Function: add_sentusers_ack_msg * - * * * Purpose: adds message to be sent to all who added acknowlegment and * * involved in discussion * * * @@ -1209,8 +1193,6 @@ static void add_command_alert(zbx_db_insert_t *db_insert, int alerts_num, zbx_ui /****************************************************************************** * * - * Function: get_operation_groupids * - * * * Purpose: get groups (including nested groups) used by an operation * * * * Parameters: operationid - [IN] the operation id * @@ -1776,8 +1758,6 @@ err_alert: /****************************************************************************** * * - * Function: check_operation_conditions * - * * * Purpose: * * * * Parameters: event - event to check * @@ -1987,8 +1967,6 @@ static void escalation_execute_operations(DB_ESCALATION *escalation, const DB_EV /****************************************************************************** * * - * Function: escalation_execute_recovery_operations * - * * * Purpose: execute escalation recovery operations * * * * Parameters: event - [IN] the event * @@ -2054,8 +2032,6 @@ static void escalation_execute_recovery_operations(const DB_EVENT *event, const /****************************************************************************** * * - * Function: escalation_execute_update_operations * - * * * Purpose: execute escalation update operations * * * * Parameters: event - [IN] the event * @@ -2126,8 +2102,6 @@ static void escalation_execute_update_operations(const DB_EVENT *event, const DB /****************************************************************************** * * - * Function: check_escalation_trigger * - * * * Purpose: check whether the escalation trigger and related items, hosts are * * not deleted or disabled. * * * @@ -2293,8 +2267,6 @@ static int check_unfinished_alerts(const DB_ESCALATION *escalation) /****************************************************************************** * * - * Function: check_escalation * - * * * Purpose: check whether escalation must be cancelled, deleted, skipped or * * processed. * * * @@ -2411,8 +2383,6 @@ out: /****************************************************************************** * * - * Function: escalation_log_cancel_warning * - * * * Purpose: write escalation cancellation warning message into log file * * * * Parameters: escalation - [IN] the escalation * @@ -2427,8 +2397,6 @@ static void escalation_log_cancel_warning(const DB_ESCALATION *escalation, const /****************************************************************************** * * - * Function: escalation_cancel * - * * * Purpose: cancel escalation with the specified error message * * * * Parameters: escalation - [IN/OUT] the escalation to cancel * @@ -2462,8 +2430,6 @@ static void escalation_cancel(DB_ESCALATION *escalation, const DB_ACTION *action /****************************************************************************** * * - * Function: escalation_execute * - * * * Purpose: execute next escalation step * * * * Parameters: escalation - [IN/OUT] the escalation to execute * @@ -2484,8 +2450,6 @@ static void escalation_execute(DB_ESCALATION *escalation, const DB_ACTION *actio /****************************************************************************** * * - * Function: escalation_recover * - * * * Purpose: process escalation recovery * * * * Parameters: escalation - [IN/OUT] the escalation to recovery * @@ -2510,8 +2474,6 @@ static void escalation_recover(DB_ESCALATION *escalation, const DB_ACTION *actio /****************************************************************************** * * - * Function: escalation_acknowledge * - * * * Purpose: process escalation acknowledge * * * * Parameters: escalation - [IN/OUT] the escalation to recovery * @@ -2559,8 +2521,6 @@ static void escalation_acknowledge(DB_ESCALATION *escalation, const DB_ACTION *a /****************************************************************************** * * - * Function: escalation_update * - * * * Purpose: process update escalation * * * * Parameters: escalation - [IN/OUT] the escalation to recovery * @@ -2642,8 +2602,6 @@ static void escalation_update_diff(const DB_ESCALATION *escalation, zbx_escalati /****************************************************************************** * * - * Function: add_ack_escalation_r_eventids * - * * * Purpose: check if acknowledgement events of current escalation has related * * recovery events and add those recovery event IDs to array of * * event IDs if this escalation * @@ -3250,8 +3208,6 @@ out: /****************************************************************************** * * - * Function: process_escalations * - * * * Purpose: execute escalation steps and recovery operations; * * postpone escalations during maintenance and due to trigger dep.; * * delete completed escalations from the database; * @@ -3417,8 +3373,6 @@ static int process_escalations(int now, int *nextcheck, unsigned int escalation_ /****************************************************************************** * * - * Function: main_escalator_loop * - * * * Purpose: periodically check table escalations and generate alerts * * * * Parameters: * diff --git a/src/zabbix_server/events.c b/src/zabbix_server/events.c index a3fdc92e03b..45a3a2ff7c1 100644 --- a/src/zabbix_server/events.c +++ b/src/zabbix_server/events.c @@ -66,8 +66,6 @@ static zbx_correlation_rules_t correlation_rules; /****************************************************************************** * * - * Function: validate_event_tag * - * * * Purpose: Check that tag name is not empty and that tag is not duplicate. * * * ******************************************************************************/ @@ -169,8 +167,6 @@ static void get_item_tags_by_expression(const DB_TRIGGER *trigger, zbx_vector_pt /****************************************************************************** * * - * Function: zbx_add_event * - * * * Purpose: add event to an array * * * * Parameters: source - [IN] event source (EVENT_SOURCE_*) * @@ -312,8 +308,6 @@ DB_EVENT *zbx_add_event(unsigned char source, unsigned char object, zbx_uint64_t /****************************************************************************** * * - * Function: close_trigger_event * - * * * Purpose: add closing OK event for the specified problem event to an array * * * * Parameters: eventid - [IN] the problem eventid * @@ -362,8 +356,6 @@ static DB_EVENT *close_trigger_event(zbx_uint64_t eventid, zbx_uint64_t objectid /****************************************************************************** * * - * Function: save_events * - * * * Purpose: flushes the events into a database * * * ******************************************************************************/ @@ -442,8 +434,6 @@ static int save_events(void) /****************************************************************************** * * - * Function: save_problems * - * * * Purpose: generates problems from problem events (trigger and internal * * event sources) * * * @@ -553,8 +543,6 @@ static void save_problems(void) /****************************************************************************** * * - * Function: save_event_recovery * - * * * Purpose: saves event recovery data and removes recovered events from * * problem table * * * @@ -617,8 +605,6 @@ static void save_event_recovery(void) /****************************************************************************** * * - * Function: get_event_index_by_source_object_id * - * * * Purpose: find event index by its source object * * * * Parameters: source - [IN] the event source * @@ -646,8 +632,6 @@ static DB_EVENT *get_event_by_source_object_id(int source, int object, zbx_uint6 /****************************************************************************** * * - * Function: correlation_match_event_hostgroup * - * * * Purpose: checks if the event matches the specified host group * * (including nested groups) * * * @@ -695,8 +679,6 @@ static int correlation_match_event_hostgroup(const DB_EVENT *event, zbx_uint64_t /****************************************************************************** * * - * Function: correlation_condition_match_new_event * - * * * Purpose: checks if the correlation condition matches the new event * * * * Parameters: condition - [IN] the correlation condition to check * @@ -777,8 +759,6 @@ static const char *correlation_condition_match_new_event(zbx_corr_condition_t *c /****************************************************************************** * * - * Function: correlation_match_new_event * - * * * Purpose: checks if the correlation rule might match the new event * * * * Parameters: correlation - [IN] the correlation rule to check * @@ -848,8 +828,6 @@ out: /****************************************************************************** * * - * Function: correlation_has_old_event_operation * - * * * Purpose: checks if correlation has operations to change old events * * * * Parameters: correlation - [IN] the correlation to check * @@ -879,8 +857,6 @@ static int correlation_has_old_event_operation(const zbx_correlation_t *correlat /****************************************************************************** * * - * Function: correlation_condition_add_tag_match * - * * * Purpose: adds sql statement to match tag according to the defined * * matching operation * * * @@ -933,8 +909,6 @@ static void correlation_condition_add_tag_match(char **sql, size_t *sql_alloc, s /****************************************************************************** * * - * Function: correlation_condition_get_event_filter * - * * * Purpose: creates sql filter to find events matching a correlation * * condition * * * @@ -1025,8 +999,6 @@ static char *correlation_condition_get_event_filter(zbx_corr_condition_t *condit /****************************************************************************** * * - * Function: correlation_add_event_filter * - * * * Purpose: add sql statement to filter out correlation conditions and * * matching events * * * @@ -1090,8 +1062,6 @@ out: /****************************************************************************** * * - * Function: correlation_execute_operations * - * * * Purpose: execute correlation operations for the new event and matched * * old eventid * * * @@ -1176,8 +1146,6 @@ zbx_problem_state_t; /****************************************************************************** * * - * Function: correlate_event_by_global_rules * - * * * Purpose: find problem events that must be recovered by global correlation * * rules and check if the new event must be closed * * * @@ -1325,8 +1293,6 @@ static void correlate_event_by_global_rules(DB_EVENT *event, zbx_problem_state_t /****************************************************************************** * * - * Function: correlate_events_by_global_rules * - * * * Purpose: add events to the closing queue according to global correlation * * rules * * * @@ -1373,8 +1339,6 @@ out: /****************************************************************************** * * - * Function: flush_correlation_queue * - * * * Purpose: try flushing correlation close events queue, generated by * * correlation rules * * * @@ -1538,8 +1502,6 @@ out: /****************************************************************************** * * - * Function: update_trigger_problem_count * - * * * Purpose: update number of open problems * * * * Parameters: trigger_diff - [IN/OUT] the changeset of triggers that * @@ -1617,8 +1579,6 @@ out: /****************************************************************************** * * - * Function: update_trigger_changes * - * * * Purpose: update trigger value, problem count fields depending on problem * * and recovered events * * * @@ -1680,8 +1640,6 @@ static void update_trigger_changes(zbx_vector_ptr_t *trigger_diff) /****************************************************************************** * * - * Function: zbx_initialize_events * - * * * Purpose: initializes the data structures required for event processing * * * ******************************************************************************/ @@ -1696,8 +1654,6 @@ void zbx_initialize_events(void) /****************************************************************************** * * - * Function: zbx_uninitialize_events * - * * * Purpose: uninitializes the data structures required for event processing * * * ******************************************************************************/ @@ -1712,8 +1668,6 @@ void zbx_uninitialize_events(void) /****************************************************************************** * * - * Function: zbx_reset_event_recovery * - * * * Purpose: reset event_recovery data * * * ******************************************************************************/ @@ -1724,8 +1678,6 @@ void zbx_reset_event_recovery(void) /****************************************************************************** * * - * Function: zbx_clean_event * - * * * Purpose: cleans single event * * * ******************************************************************************/ @@ -1750,8 +1702,6 @@ static void zbx_clean_event(DB_EVENT *event) /****************************************************************************** * * - * Function: zbx_clean_events * - * * * Purpose: cleans all events and events recoveries * * * ******************************************************************************/ @@ -1764,8 +1714,6 @@ void zbx_clean_events(void) /****************************************************************************** * * - * Function: db_trigger_get_hosts * - * * * Purpose: get hosts that are associated with trigger expression/recovery * * expression * * * @@ -1782,8 +1730,6 @@ static void db_trigger_get_hosts(zbx_hashset_t *hosts, DB_TRIGGER *trigger) /****************************************************************************** * * - * Function: zbx_export_events * - * * * Purpose: export events * * * ******************************************************************************/ @@ -1962,8 +1908,6 @@ void zbx_events_update_itservices(void) /****************************************************************************** * * - * Function: add_event_suppress_data * - * * * Purpose: adds event suppress data for problem events matching active * * maintenance periods * * * @@ -2050,8 +1994,6 @@ static void add_event_suppress_data(zbx_vector_ptr_t *event_refs, zbx_vector_uin /****************************************************************************** * * - * Function: save_event_suppress_data * - * * * Purpose: retrieve running maintenances for each event and saves it in * * event_suppress table * * * @@ -2097,8 +2039,6 @@ out: /****************************************************************************** * * - * Function: flush_events * - * * * Purpose: flushes local event cache to database * * * ******************************************************************************/ @@ -2134,8 +2074,6 @@ static int flush_events(void) /****************************************************************************** * * - * Function: recover_event * - * * * Purpose: recover an event * * * * Parameters: eventid - [IN] the event to recover * @@ -2176,8 +2114,6 @@ static void recover_event(zbx_uint64_t eventid, int source, int object, zbx_uint /****************************************************************************** * * - * Function: process_internal_ok_events * - * * * Purpose: process internal recovery events * * * * Parameters: ok_events - [IN] the recovery events to process * @@ -2281,8 +2217,6 @@ out: /****************************************************************************** * * - * Function: process_internal_events_without_actions * - * * * Purpose: do not generate unnecessary internal events if there are no * * internal actions and no problem recovery from when actions were * * enabled * @@ -2314,8 +2248,6 @@ static void process_internal_events_without_actions(zbx_vector_ptr_t *internal_p /****************************************************************************** * * - * Function: get_open_problems * - * * * Purpose: gets open problems created by the specified triggers * * * * Parameters: triggerids - [IN] the trigger identifiers (sorted) * @@ -2395,8 +2327,6 @@ static void get_open_problems(const zbx_vector_uint64_t *triggerids, zbx_vector_ /****************************************************************************** * * - * Function: event_problem_free * - * * * Purpose: frees cached problem event * * * ******************************************************************************/ @@ -2409,8 +2339,6 @@ static void event_problem_free(zbx_event_problem_t *problem) /****************************************************************************** * * - * Function: trigger_dep_free * - * * * Purpose: frees trigger dependency * * * ******************************************************************************/ @@ -2423,8 +2351,6 @@ static void trigger_dep_free(zbx_trigger_dep_t *dep) /****************************************************************************** * * - * Function: event_check_dependency * - * * * Purpose: check event dependency based on cached and actual trigger values * * * * Parameters: event - [IN] the event to check * @@ -2473,8 +2399,6 @@ static int event_check_dependency(const DB_EVENT *event, const zbx_vector_ptr_t /****************************************************************************** * * - * Function: match_tag * - * * * Purpose: checks if the two tag sets have matching tag * * * * Parameters: name - [IN] the name of tag to match * @@ -2512,8 +2436,6 @@ static int match_tag(const char *name, const zbx_vector_ptr_t *tags1, const zbx_ /****************************************************************************** * * - * Function: process_trigger_events * - * * * Purpose: processes trigger events * * * * Parameters: trigger_events - [IN] the trigger events to process * @@ -2670,8 +2592,6 @@ static void process_trigger_events(zbx_vector_ptr_t *trigger_events, zbx_vector_ /****************************************************************************** * * - * Function: process_internal_events_dependency * - * * * Purpose: process internal trigger events * * to avoid trigger dependency * * * @@ -2741,8 +2661,6 @@ static void process_internal_events_dependency(zbx_vector_ptr_t *internal_events /****************************************************************************** * * - * Function: zbx_process_events * - * * * Purpose: processes cached events * * * * Parameters: trigger_diff - [IN/OUT] the changeset of triggers that * @@ -2860,8 +2778,6 @@ int zbx_process_events(zbx_vector_ptr_t *trigger_diff, zbx_vector_uint64_t *trig /****************************************************************************** * * - * Function: zbx_close_problem * - * * * Purpose: closes problem event * * * * Parameters: triggerid - [IN] the source trigger id * diff --git a/src/zabbix_server/ha/ha_manager.c b/src/zabbix_server/ha/ha_manager.c index 4b675f98f89..664a796a7df 100644 --- a/src/zabbix_server/ha/ha_manager.c +++ b/src/zabbix_server/ha/ha_manager.c @@ -105,8 +105,6 @@ static int ha_db_execute(zbx_ha_info_t *info, const char *sql, ...) __zbx_attr_f /****************************************************************************** * * - * Function: ha_manager_send_message * - * * * Purpose: connect, send message and receive response in a given timeout * * * * Parameters: service_name - [IN] the IPC service name * @@ -170,8 +168,6 @@ out: /****************************************************************************** * * - * Function: ha_update_parent * - * * * Purpose: update parent process with ha_status and failover delay * * * ******************************************************************************/ @@ -210,8 +206,6 @@ static void ha_update_parent(zbx_ipc_async_socket_t *rtc_socket, zbx_ha_info_t * /****************************************************************************** * * - * Function: ha_send_heartbeat * - * * * Purpose: send heartbeat message to main process * * * ******************************************************************************/ @@ -227,8 +221,6 @@ static void ha_send_heartbeat(zbx_ipc_async_socket_t *rtc_socket) /****************************************************************************** * * - * Function: zbx_ha_set_error * - * * * Purpose: set HA manager error * * * ******************************************************************************/ @@ -256,8 +248,6 @@ static void ha_set_error(zbx_ha_info_t *info, const char *fmt, ...) /****************************************************************************** * * - * Function: ha_db_begin * - * * * Purpose: start database transaction * * * * Comments: Sets error status on non-recoverable database error * @@ -279,8 +269,6 @@ static int ha_db_begin(zbx_ha_info_t *info) /****************************************************************************** * * - * Function: ha_db_rollback * - * * * Purpose: roll back database transaction * * * * Comments: Sets error status on non-recoverable database error * @@ -302,8 +290,6 @@ static int ha_db_rollback(zbx_ha_info_t *info) /****************************************************************************** * * - * Function: ha_db_commit * - * * * Purpose: commit/rollback database transaction depending on commit result * * * * Comments: Sets error status on non-recoverable database error * @@ -329,8 +315,6 @@ static int ha_db_commit(zbx_ha_info_t *info) /****************************************************************************** * * - * Function: ha_db_select * - * * * Purpose: perform database select sql query based on current database * * connection status * * * @@ -362,8 +346,6 @@ static DB_RESULT ha_db_select(zbx_ha_info_t *info, const char *sql, ...) /****************************************************************************** * * - * Function: ha_db_select * - * * * Purpose: perform database sql query based on current database * * connection status * * * @@ -385,8 +367,6 @@ static int ha_db_execute(zbx_ha_info_t *info, const char *sql, ...) /****************************************************************************** * * - * Function: ha_db_update_config * - * * * Purpose: update HA configuration from database * * * ******************************************************************************/ @@ -415,8 +395,6 @@ static int ha_db_update_config(zbx_ha_info_t *info) /****************************************************************************** * * - * Function: ha_db_get_nodes * - * * * Purpose: get all nodes from database * * * * Return value: SUCCEED - the nodes were retrieved from database * @@ -463,8 +441,6 @@ static int ha_db_get_nodes(zbx_ha_info_t *info, zbx_vector_ha_node_t *nodes, int /****************************************************************************** * * - * Function: ha_check_registered_node * - * * * Purpose: check if the node is registered in node table and get ID * * * ******************************************************************************/ @@ -483,8 +459,6 @@ static zbx_ha_node_t *ha_find_node_by_name(zbx_vector_ha_node_t *nodes, const ch /****************************************************************************** * * - * Function: ha_get_external_address * - * * * Purpose: get server external address and port from configuration * * * ******************************************************************************/ @@ -495,8 +469,6 @@ static void ha_get_external_address(char **address, unsigned short *port) /****************************************************************************** * * - * Function: ha_db_lock_nodes * - * * * Purpose: lock nodes in database * * * * Comments: To lock ha_node table it must have at least one node * @@ -516,8 +488,6 @@ static int ha_db_lock_nodes(zbx_ha_info_t *info) /****************************************************************************** * * - * Function: ha_is_available * - * * * Purpose: check availability based on lastaccess timestamp, database time * * and failover delay * * * @@ -535,8 +505,6 @@ static int ha_is_available(const zbx_ha_info_t *info, int lastaccess, int db_tim /****************************************************************************** * * - * Function: ha_check_standalone_config * - * * * Purpose: check if server can be started in standalone configuration * * * * Return value: SUCCEED - server can be started in active mode * @@ -568,8 +536,6 @@ static int ha_check_standalone_config(zbx_ha_info_t *info, zbx_vector_ha_node_t /****************************************************************************** * * - * Function: ha_check_cluster_config * - * * * Purpose: check if server can be started in cluster configuration * * * * Parameters: info - [IN] - the HA node information * @@ -625,8 +591,6 @@ static int ha_check_cluster_config(zbx_ha_info_t *info, zbx_vector_ha_node_t *no /****************************************************************************** * * - * Function: ha_db_get_time * - * * * Purpose: get current database time * * * ******************************************************************************/ @@ -658,8 +622,6 @@ out: /****************************************************************************** * * - * Function: ha_flush_audit * - * * * Purpose: flush audit taking in account database connection status * * * ******************************************************************************/ @@ -676,8 +638,6 @@ static void ha_flush_audit(zbx_ha_info_t *info) /****************************************************************************** * * - * Function: ha_db_create_node * - * * * Purpose: add new node record in ha_node table if necessary * * * * Return value: SUCCEED - node exists, was created or database is offline * @@ -761,8 +721,6 @@ finish: /****************************************************************************** * * - * Function: ha_db_register_node * - * * * Purpose: register server node * * * * Return value: SUCCEED - node was registered or database was offline * @@ -883,8 +841,6 @@ finish: /****************************************************************************** * * - * Function: ha_check_standby_nodes * - * * * Purpose: check for standby nodes being unavailable for failrover_delay * * seconds and mark them unavailable * * * @@ -943,8 +899,6 @@ static int ha_check_standby_nodes(zbx_ha_info_t *info, zbx_vector_ha_node_t *nod /****************************************************************************** * * - * Function: ha_check_active_node * - * * * Purpose: check for active nodes being unavailable for failover_delay * * seconds, mark them unavailable and set own status to active * * * @@ -998,8 +952,6 @@ static int ha_check_active_node(zbx_ha_info_t *info, zbx_vector_ha_node_t *nodes /****************************************************************************** * * - * Function: ha_check_nodes * - * * * Purpose: check HA status based on nodes * * * * Comments: Sets error status on critical errors forcing manager to exit * @@ -1113,8 +1065,6 @@ finish: /****************************************************************************** * * - * Function: ha_db_update_lastaccess * - * * * Purpose: update node lastaccess * * * ******************************************************************************/ @@ -1139,8 +1089,6 @@ out: /****************************************************************************** * * - * Function: ha_db_get_nodes_json * - * * * Purpose: get cluster status in lld compatible json format * * * ******************************************************************************/ @@ -1203,8 +1151,6 @@ out: /****************************************************************************** * * - * Function: ha_remove_node_impl * - * * * Purpose: remove node by its cuid or name * * * ******************************************************************************/ @@ -1292,8 +1238,6 @@ out: /****************************************************************************** * * - * Function: ha_report_cluster_status * - * * * Purpose: report cluster status in log file * * * ******************************************************************************/ @@ -1326,8 +1270,6 @@ static void ha_remove_node(zbx_ha_info_t *info, zbx_ipc_client_t *client, const /****************************************************************************** * * - * Function: ha_send_status * - * * * Purpose: reply to ha_status request * * * ******************************************************************************/ @@ -1359,8 +1301,6 @@ static void ha_send_status(zbx_ha_info_t *info, zbx_ipc_client_t *client) /****************************************************************************** * * - * Function: ha_set_failover_delay * - * * * Purpose: set failover delay * * * ******************************************************************************/ @@ -1416,8 +1356,6 @@ out: /****************************************************************************** * * - * Function: ha_get_failover_delay * - * * * Purpose: get failover delay * * * ******************************************************************************/ @@ -1433,8 +1371,6 @@ static void ha_get_failover_delay(zbx_ha_info_t *info, zbx_ipc_client_t *client) } /****************************************************************************** * * - * Function: ha_send_node_list * - * * * Purpose: reply to get nodes request * * * ******************************************************************************/ @@ -1468,8 +1404,6 @@ static void ha_send_node_list(zbx_ha_info_t *info, zbx_ipc_client_t *client) /****************************************************************************** * * - * Function: ha_db_update_exit_status * - * * * Purpose: update node status in database on shutdown * * * ******************************************************************************/ @@ -1502,8 +1436,6 @@ out: /****************************************************************************** * * - * Function: zbx_ha_get_status * - * * * Purpose: get HA manager status * * * ******************************************************************************/ @@ -1557,8 +1489,6 @@ int zbx_ha_get_status(int *ha_status, char **error) /****************************************************************************** * * - * Function: zbx_ha_dispatch_message * - * * * Purpose: handle HA manager notifications * * * * Comments: This function also monitors heartbeat notifications and * @@ -1621,8 +1551,6 @@ out: /****************************************************************************** * * - * Function: zbx_ha_start * - * * * Purpose: start HA manager * * * ******************************************************************************/ @@ -1691,8 +1619,6 @@ out: /****************************************************************************** * * - * Function: zbx_ha_pause * - * * * Purpose: pause HA manager * * * * Comments: HA manager must be paused before stopping it normally * @@ -1716,8 +1642,6 @@ int zbx_ha_pause(char **error) /****************************************************************************** * * - * Function: zbx_ha_stop * - * * * Purpose: stop HA manager * * * * Comments: This function is used to stop HA manager on normal shutdown * @@ -1759,8 +1683,6 @@ out: /****************************************************************************** * * - * Function: zbx_ha_kill * - * * * Purpose: kill HA manager * * * ******************************************************************************/ @@ -1773,8 +1695,6 @@ void zbx_ha_kill(void) /****************************************************************************** * * - * Function: zbx_ha_check_pid * - * * * Purpose: check if the pid is HA manager pid * * * ******************************************************************************/ diff --git a/src/zabbix_server/housekeeper/history_compress.c b/src/zabbix_server/housekeeper/history_compress.c index 68e21744cb7..43c31979de7 100644 --- a/src/zabbix_server/housekeeper/history_compress.c +++ b/src/zabbix_server/housekeeper/history_compress.c @@ -63,8 +63,6 @@ static int compress_older_cache = 0; /****************************************************************************** * * - * Function: hk_check_table_segmentation * - * * * Purpose: check that hypertables are segmented by itemid * * * * Parameters: table_name - [IN] hypertable name * @@ -114,8 +112,6 @@ static void hk_check_table_segmentation(const char *table_name, zbx_compress_tab /****************************************************************************** * * - * Function: hk_get_table_compression_age * - * * * Purpose: returns data compression age configured for hypertable * * * * Parameters: table_name - [IN] hypertable name * @@ -156,8 +152,6 @@ static int hk_get_table_compression_age(const char *table_name) /****************************************************************************** * * - * Function: hk_check_table_compression_age * - * * * Purpose: ensures that table compression is configured to specified age * * * * Parameters: table_name - [IN] hypertable name * @@ -192,8 +186,6 @@ static void hk_check_table_compression_age(const char *table_name, int age) /****************************************************************************** * * - * Function: hk_history_enable_compression * - * * * Purpose: turns table compression on for items older than specified age * * * * Parameters: age - [IN] compression age * @@ -218,8 +210,6 @@ static void hk_history_enable_compression(int age) /****************************************************************************** * * - * Function: hk_history_disable_compression * - * * * Purpose: turns table compression off * * * ******************************************************************************/ @@ -244,8 +234,6 @@ static void hk_history_disable_compression(void) /****************************************************************************** * * - * Function: hk_history_compression_init * - * * * Purpose: initializing compression for history/trends tables * * * ******************************************************************************/ @@ -319,8 +307,6 @@ void hk_history_compression_init(void) /****************************************************************************** * * - * Function: hk_history_compression_update * - * * * Purpose: history compression settings periodic update * * * * Parameters: cfg - [IN] database extension history compression settings * diff --git a/src/zabbix_server/housekeeper/housekeeper.c b/src/zabbix_server/housekeeper/housekeeper.c index f61b14bb34c..3069d269909 100644 --- a/src/zabbix_server/housekeeper/housekeeper.c +++ b/src/zabbix_server/housekeeper/housekeeper.c @@ -202,8 +202,6 @@ static void zbx_housekeeper_sigusr_handler(int flags) /****************************************************************************** * * - * Function: hk_item_update_cache_compare * - * * * Purpose: compare two delete queue items by their itemid * * * * Parameters: d1 - [IN] the first delete queue item to compare * @@ -230,8 +228,6 @@ static int hk_item_update_cache_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: hk_history_delete_queue_append * - * * * Purpose: add item to the delete queue if necessary * * * * Parameters: rule - [IN/OUT] the history housekeeping rule * @@ -273,8 +269,6 @@ static void hk_history_delete_queue_append(zbx_hk_history_rule_t *rule, int now, /****************************************************************************** * * - * Function: hk_history_prepare * - * * * Purpose: prepares history housekeeping rule * * * * Parameters: rule - [IN/OUT] the history housekeeping rule * @@ -319,8 +313,6 @@ static void hk_history_prepare(zbx_hk_history_rule_t *rule) /****************************************************************************** * * - * Function: hk_history_release * - * * * Purpose: releases history housekeeping rule * * * * Parameters: rule - [IN/OUT] the history housekeeping rule * @@ -343,8 +335,6 @@ static void hk_history_release(zbx_hk_history_rule_t *rule) /****************************************************************************** * * - * Function: hk_history_item_update * - * * * Purpose: updates history housekeeping rule with item history setting and * * adds item to the delete queue if necessary * * * @@ -390,8 +380,6 @@ static void hk_history_item_update(zbx_hk_history_rule_t *rules, zbx_hk_history_ /****************************************************************************** * * - * Function: hk_history_update * - * * * Purpose: updates history housekeeping rule with the latest item history * * settings and prepares delete queue * * * @@ -488,8 +476,6 @@ static void hk_history_update(zbx_hk_history_rule_t *rules, int now) /****************************************************************************** * * - * Function: hk_history_delete_queue_prepare_all * - * * * Purpose: prepares history housekeeping delete queues for all defined * * history rules. * * * @@ -534,8 +520,6 @@ static void hk_history_delete_queue_prepare_all(zbx_hk_history_rule_t *rules, in /****************************************************************************** * * - * Function: hk_history_delete_queue_clear * - * * * Purpose: clears the history housekeeping delete queue * * * * Parameters: rule - [IN/OUT] the history housekeeping rule * @@ -551,8 +535,6 @@ static void hk_history_delete_queue_clear(zbx_hk_history_rule_t *rule) /****************************************************************************** * * - * Function: hk_drop_partition_for_rule * - * * * Purpose: drop appropriate partitions from the history and trends tables * * * * Parameters: rules - [IN/OUT] history housekeeping rules * @@ -614,8 +596,6 @@ out: /****************************************************************************** * * - * Function: housekeeping_history_and_trends * - * * * Purpose: performs housekeeping for history and trends tables * * * * Parameters: now - [IN] the current timestamp * @@ -675,8 +655,6 @@ static int housekeeping_history_and_trends(int now) /****************************************************************************** * * - * Function: housekeeping_process_rule * - * * * Purpose: removes old records from a table according to the specified rule * * * * Parameters: now - [IN] the current time in seconds * @@ -777,8 +755,6 @@ static int housekeeping_process_rule(int now, zbx_hk_rule_t *rule) /****************************************************************************** * * - * Function: DBdelete_from_table * - * * * Purpose: delete limited count of rows from table * * * * Return value: number of deleted rows or less than 0 if an error occurred * @@ -835,8 +811,6 @@ static int DBdelete_from_table(const char *tablename, const char *filter, int li /****************************************************************************** * * - * Function: hk_problem_cleanup * - * * * Purpose: perform problem table cleanup * * * * Parameters: table - [IN] the problem table name * @@ -867,8 +841,6 @@ static int hk_problem_cleanup(const char *table, int source, int object, zbx_uin /****************************************************************************** * * - * Function: hk_table_cleanup * - * * * Purpose: perform generic table cleanup * * * * Parameters: table - [IN] the table name * @@ -897,8 +869,6 @@ static int hk_table_cleanup(const char *table, const char *field, zbx_uint64_t i /****************************************************************************** * * - * Function: housekeeping_cleanup * - * * * Purpose: remove deleted items/triggers data * * * * Return value: number of rows deleted * diff --git a/src/zabbix_server/httppoller/httpmacro.c b/src/zabbix_server/httppoller/httpmacro.c index a70e2b81c30..db701bbb7e4 100644 --- a/src/zabbix_server/httppoller/httpmacro.c +++ b/src/zabbix_server/httppoller/httpmacro.c @@ -30,8 +30,6 @@ /****************************************************************************** * * - * Function: httpmacro_cmp_func * - * * * Purpose: compare two macros by name * * * * Parameters: d1 - [IN] the first macro * @@ -54,8 +52,6 @@ static int httpmacro_cmp_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: httpmacro_append_pair * - * * * Purpose: appends key/value pair to the http test macro cache. * * If the value format is 'regex:<pattern>', then regular expression * * match is performed against the supplied data value and specified * @@ -168,8 +164,6 @@ out: /****************************************************************************** * * - * Function: http_substitute_variables * - * * * Purpose: substitute variables in input string with their values from http * * test config * * * @@ -266,8 +260,6 @@ int http_substitute_variables(const zbx_httptest_t *httptest, char **data) /****************************************************************************** * * - * Function: http_process_variables * - * * * Purpose: parses http test/step variable string and stores results into * * httptest macro cache. * * The variables are specified as {<key>}=><value> pairs * diff --git a/src/zabbix_server/httppoller/httppoller.c b/src/zabbix_server/httppoller/httppoller.c index a9590d256f0..234e97ec448 100644 --- a/src/zabbix_server/httppoller/httppoller.c +++ b/src/zabbix_server/httppoller/httppoller.c @@ -34,8 +34,6 @@ extern ZBX_THREAD_LOCAL int server_num, process_num; /****************************************************************************** * * - * Function: get_minnextcheck * - * * * Purpose: calculate when we have to process earliest httptest * * * * Return value: timestamp of earliest check or -1 if not found * @@ -78,8 +76,6 @@ static int get_minnextcheck(void) /****************************************************************************** * * - * Function: main_httppoller_loop * - * * * Purpose: main loop of processing of httptests * * * * Parameters: * diff --git a/src/zabbix_server/httppoller/httptest.c b/src/zabbix_server/httppoller/httptest.c index 1cb995c1efe..32a2423c2eb 100644 --- a/src/zabbix_server/httppoller/httptest.c +++ b/src/zabbix_server/httppoller/httptest.c @@ -85,8 +85,6 @@ static size_t curl_ignore_cb(void *ptr, size_t size, size_t nmemb, void *userdat /****************************************************************************** * * - * Function: httptest_remove_macros * - * * * Purpose: remove all macro variables cached during http test execution * * * * Parameters: httptest - [IN] the http test data * @@ -203,8 +201,6 @@ static void process_test_data(zbx_uint64_t httptestid, int lastfailedstep, doubl /****************************************************************************** * * - * Function: httpstep_pairs_join * - * * * Purpose: performs concatenation of vector of pairs into delimited string * * * * Parameters: str - [IN/OUT] result string * @@ -238,8 +234,6 @@ static void httpstep_pairs_join(char **str, size_t *alloc_len, size_t *offset, c /****************************************************************************** * * - * Function: httppairs_free * - * * * Purpose: frees memory allocated for vector of pairs * * * * Parameters: pairs - [IN] vector of pairs * @@ -346,8 +340,6 @@ static void process_step_data(zbx_uint64_t httpstepid, zbx_httpstat_t *stat, zbx /****************************************************************************** * * - * Function: httpstep_load_pairs * - * * * Purpose: loads http fields of web scenario step * * * * Parameters: host - [IN] host to be used in macro expansion * @@ -500,8 +492,6 @@ out: /****************************************************************************** * * - * Function: add_http_headers * - * * * Purpose: adds HTTP headers to curl_slist and prepares cookie header string * * * * Parameters: headers - [IN] HTTP headers as string * @@ -533,8 +523,6 @@ static void add_http_headers(char *headers, struct curl_slist **headers_slist, c /****************************************************************************** * * - * Function: httptest_load_pairs * - * * * Purpose: loads http fields of web scenario * * * * Parameters: host - [IN] host to be used in macro expansion * @@ -623,8 +611,6 @@ out: /****************************************************************************** * * - * Function: process_httptest * - * * * Purpose: process single scenario of http test * * * * Parameters: * @@ -1055,8 +1041,6 @@ httptest_error: /****************************************************************************** * * - * Function: process_httptests * - * * * Purpose: process httptests * * * * Parameters: now - current timestamp * diff --git a/src/zabbix_server/ipmi/checks_ipmi.c b/src/zabbix_server/ipmi/checks_ipmi.c index 3e4e9e21502..160495a9bb4 100644 --- a/src/zabbix_server/ipmi/checks_ipmi.c +++ b/src/zabbix_server/ipmi/checks_ipmi.c @@ -189,8 +189,6 @@ static char *zbx_sensor_id_to_str(char *str, size_t str_sz, const char *id, enum /****************************************************************************** * * - * Function: zbx_get_ipmi_host * - * * * Purpose: Find element in the global list 'hosts' using parameters as * * search criteria * * * @@ -225,8 +223,6 @@ static zbx_ipmi_host_t *zbx_get_ipmi_host(const char *ip, const int port, int au /****************************************************************************** * * - * Function: zbx_allocate_ipmi_host * - * * * Purpose: create a new element in the global list 'hosts' * * * * Return value: pointer to the new list element with host data * @@ -330,8 +326,6 @@ static zbx_ipmi_sensor_t *zbx_get_ipmi_sensor_by_full_name(const zbx_ipmi_host_t /****************************************************************************** * * - * Function: get_domain_offset * - * * * Purpose: Check if an item name starts from domain name and find the domain * * name length * * * @@ -356,8 +350,6 @@ static size_t get_domain_offset(const zbx_ipmi_host_t *h, const char *full_name) } /****************************************************************************** * * - * Function: zbx_get_sensor_id * - * * * Purpose: Converts sensor id to printable string and return id_type * * * * Parameters: sensor - [IN] ipmi sensor * @@ -848,8 +840,6 @@ out: /****************************************************************************** * * - * Function: zbx_perform_openipmi_ops * - * * * Purpose: Pass control to OpenIPMI library to process events * * * * Return value: SUCCEED - no errors * @@ -885,8 +875,6 @@ static int zbx_perform_openipmi_ops(zbx_ipmi_host_t *h, const char *func_name) /****************************************************************************** * * - * Function: zbx_perform_all_openipmi_ops * - * * * Purpose: Pass control to OpenIPMI library to process all internal events * * * * Parameters: timeout - [IN] timeout (in seconds) for processing single * @@ -1683,8 +1671,6 @@ void zbx_delete_inactive_ipmi_hosts(time_t last_check) /****************************************************************************** * * - * Function: has_name_prefix * - * * * Purpose: Check if a string starts with one of predefined prefixes and * * set prefix length * * * diff --git a/src/zabbix_server/ipmi/ipmi.c b/src/zabbix_server/ipmi/ipmi.c index c65aba48df5..ba8098f136b 100644 --- a/src/zabbix_server/ipmi/ipmi.c +++ b/src/zabbix_server/ipmi/ipmi.c @@ -33,8 +33,6 @@ /****************************************************************************** * * - * Function: zbx_ipmi_port_expand_macros * - * * * Purpose: expands user macros in IPMI port value and converts the result to * * to unsigned short value * * * @@ -69,8 +67,6 @@ int zbx_ipmi_port_expand_macros(zbx_uint64_t hostid, const char *port_orig, unsi /****************************************************************************** * * - * Function: zbx_ipmi_execute_command * - * * * Purpose: executes IPMI command * * * * Parameters: host - [IN] the target host * @@ -161,8 +157,6 @@ out: /****************************************************************************** * * - * Function: zbx_ipmi_test_item * - * * * Purpose: test IPMI item * * * * Parameters: item - [IN] IPMI item * diff --git a/src/zabbix_server/ipmi/ipmi_manager.c b/src/zabbix_server/ipmi/ipmi_manager.c index b3d12dc432c..cd464dd810b 100644 --- a/src/zabbix_server/ipmi/ipmi_manager.c +++ b/src/zabbix_server/ipmi/ipmi_manager.c @@ -193,8 +193,6 @@ static int ipmi_request_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: ipmi_request_create * - * * * Purpose: creates an IPMI request * * * * Parameters: hostid - [IN] the target hostid * @@ -215,8 +213,6 @@ static zbx_ipmi_request_t *ipmi_request_create(zbx_uint64_t hostid) /****************************************************************************** * * - * Function: ipmi_request_free * - * * * Purpose: frees IPMI request * * * ******************************************************************************/ @@ -228,8 +224,6 @@ static void ipmi_request_free(zbx_ipmi_request_t *request) /****************************************************************************** * * - * Function: ipmi_poller_pop_request * - * * * Purpose: pops the next queued request from IPMI poller request queue * * * * Parameters: poller - [IN] the IPMI poller * @@ -254,8 +248,6 @@ static zbx_ipmi_request_t *ipmi_poller_pop_request(zbx_ipmi_poller_t *poller) /****************************************************************************** * * - * Function: ipmi_poller_push_request * - * * * Purpose: pushes the requests into IPMI poller request queue * * * * Parameters: poller - [IN] the IPMI poller * @@ -272,8 +264,6 @@ static void ipmi_poller_push_request(zbx_ipmi_poller_t *poller, zbx_ipmi_request /****************************************************************************** * * - * Function: ipmi_poller_send_request * - * * * Purpose: sends request to IPMI poller * * * * Parameters: poller - [IN] the IPMI poller * @@ -294,8 +284,6 @@ static void ipmi_poller_send_request(zbx_ipmi_poller_t *poller, zbx_ipmi_request /****************************************************************************** * * - * Function: ipmi_poller_schedule_request * - * * * Purpose: schedules request to IPMI poller * * * * Parameters: poller - [IN] the IPMI poller * @@ -312,8 +300,6 @@ static void ipmi_poller_schedule_request(zbx_ipmi_poller_t *poller, zbx_ipmi_req /****************************************************************************** * * - * Function: ipmi_poller_free_request * - * * * Purpose: frees the current request processed by IPMI poller * * * * Parameters: poller - [IN] the IPMI poller * @@ -327,8 +313,6 @@ static void ipmi_poller_free_request(zbx_ipmi_poller_t *poller) /****************************************************************************** * * - * Function: ipmi_poller_free * - * * * Purpose: frees IPMI poller * * * ******************************************************************************/ @@ -348,8 +332,6 @@ static void ipmi_poller_free(zbx_ipmi_poller_t *poller) /****************************************************************************** * * - * Function: ipmi_manager_init * - * * * Purpose: initializes IPMI manager * * * * Parameters: manager - [IN] the manager to initialize * @@ -393,8 +375,6 @@ static void ipmi_manager_init(zbx_ipmi_manager_t *manager) /****************************************************************************** * * - * Function: ipmi_manager_destroy * - * * * Purpose: destroys IPMI manager * * * * Parameters: manager - [IN] the manager to destroy * @@ -411,8 +391,6 @@ static void ipmi_manager_destroy(zbx_ipmi_manager_t *manager) /****************************************************************************** * * - * Function: ipmi_manager_host_cleanup * - * * * Purpose: performs cleanup of monitored hosts cache * * * * Parameters: manager - [IN] the manager * @@ -451,8 +429,6 @@ static void ipmi_manager_host_cleanup(zbx_ipmi_manager_t *manager, int now) /****************************************************************************** * * - * Function: ipmi_manager_register_poller * - * * * Purpose: registers IPMI poller * * * * Parameters: manager - [IN] the manager * @@ -495,8 +471,6 @@ static zbx_ipmi_poller_t *ipmi_manager_register_poller(zbx_ipmi_manager_t *manag /****************************************************************************** * * - * Function: ipmi_manager_get_poller_by_client * - * * * Purpose: returns IPMI poller by connected client * * * * Parameters: manager - [IN] the manager * @@ -525,8 +499,6 @@ static zbx_ipmi_poller_t *ipmi_manager_get_poller_by_client(zbx_ipmi_manager_t * /****************************************************************************** * * - * Function: ipmi_manager_get_host_poller * - * * * Purpose: returns IPMI poller to be assigned to a new host * * * * Parameters: manager - [IN] the manager * @@ -554,8 +526,6 @@ static zbx_ipmi_poller_t *ipmi_manager_get_host_poller(zbx_ipmi_manager_t *manag /****************************************************************************** * * - * Function: ipmi_manager_process_poller_queue * - * * * Purpose: processes IPMI poller request queue * * * * Parameters: manager - [IN] the IPMI manager * @@ -605,8 +575,6 @@ static void ipmi_manager_process_poller_queue(zbx_ipmi_manager_t *manager, zbx_i /****************************************************************************** * * - * Function: ipmi_manager_cache_host * - * * * Purpose: caches host to keep local copy of its availability data * * * * Parameters: manager - [IN] the IPMI manager * @@ -638,8 +606,6 @@ static zbx_ipmi_manager_host_t *ipmi_manager_cache_host(zbx_ipmi_manager_t *mana /****************************************************************************** * * - * Function: ipmi_manager_update_host * - * * * Purpose: updates cached host * * * * Parameters: manager - [IN] the IPMI manager * @@ -663,8 +629,6 @@ static void ipmi_manager_update_host(zbx_ipmi_manager_t *manager, const DC_INTER /****************************************************************************** * * - * Function: ipmi_manager_activate_interface * - * * * Purpose: tries to activate item's interface after receiving response * * * * Parameters: manager - [IN] the IPMI manager * @@ -695,8 +659,6 @@ static void ipmi_manager_activate_interface(zbx_ipmi_manager_t *manager, zbx_uin /****************************************************************************** * * - * Function: ipmi_manager_deactivate_interface * - * * * Purpose: tries to deactivate item's interface after receiving * * host level error * * * @@ -730,8 +692,6 @@ static void ipmi_manager_deactivate_interface(zbx_ipmi_manager_t *manager, zbx_u /****************************************************************************** * * - * Function: ipmi_manager_serialize_request * - * * * Purpose: serializes IPMI poll and discovery requests * * * * Parameters: item - [IN] the item to poll * @@ -755,8 +715,6 @@ static void ipmi_manager_serialize_request(const DC_ITEM *item, zbx_ipc_message_ /****************************************************************************** * * - * Function: ipmi_manager_schedule_request * - * * * Purpose: schedules request to the host * * * * Parameters: manager - [IN] the IPMI manager * @@ -776,8 +734,6 @@ static void ipmi_manager_schedule_request(zbx_ipmi_manager_t *manager, zbx_uint6 /****************************************************************************** * * - * Function: ipmi_manager_schedule_requests * - * * * Purpose: either sends or queues IPMI poll requests from configuration * * cache IPMI poller queue * * * @@ -832,8 +788,6 @@ static int ipmi_manager_schedule_requests(zbx_ipmi_manager_t *manager, int now, /****************************************************************************** * * - * Function: ipmi_manager_process_client_request * - * * * Purpose: forwards IPMI request to the poller managing the specified host * * * * Parameters: manager - [IN] the IPMI manager * @@ -863,8 +817,6 @@ static void ipmi_manager_process_client_request(zbx_ipmi_manager_t *manager, zbx /****************************************************************************** * * - * Function: ipmi_manager_process_client_result * - * * * Purpose: forwards result of request to the client * * * * Parameters: manager - [IN] the IPMI manager * @@ -897,8 +849,6 @@ static void ipmi_manager_process_client_result(zbx_ipmi_manager_t *manager, zbx_ /****************************************************************************** * * - * Function: ipmi_manager_process_value_result * - * * * Purpose: processes IPMI check result received from IPMI poller * * * * Parameters: manager - [IN] the IPMI manager * diff --git a/src/zabbix_server/ipmi/ipmi_poller.c b/src/zabbix_server/ipmi/ipmi_poller.c index b2efef12b89..b4f72994ef5 100644 --- a/src/zabbix_server/ipmi/ipmi_poller.c +++ b/src/zabbix_server/ipmi/ipmi_poller.c @@ -40,8 +40,6 @@ extern ZBX_THREAD_LOCAL int server_num, process_num; /****************************************************************************** * * - * Function: ipmi_poller_register * - * * * Purpose: registers IPMI poller with IPMI manager * * * * Parameters: socket - [IN] the connections socket * @@ -58,8 +56,6 @@ static void ipmi_poller_register(zbx_ipc_async_socket_t *socket) /****************************************************************************** * * - * Function: ipmi_poller_send_result * - * * * Purpose: sends IPMI poll result to manager * * * * Parameters: socket - [IN] the connections socket * @@ -84,8 +80,6 @@ static void ipmi_poller_send_result(zbx_ipc_async_socket_t *socket, zbx_uint32_t /****************************************************************************** * * - * Function: ipmi_poller_process_value_request * - * * * Purpose: gets IPMI sensor value from the specified host * * * * Parameters: socket - [IN] the connections socket * @@ -135,8 +129,6 @@ static void ipmi_poller_process_value_request(zbx_ipc_async_socket_t *socket, zb /****************************************************************************** * * - * Function: ipmi_poller_process_command_request * - * * * Purpose:sets IPMI sensor value * * * * Parameters: socket - [IN] the connections socket * diff --git a/src/zabbix_server/lld/lld.c b/src/zabbix_server/lld/lld.c index b5995300683..b6513125a31 100644 --- a/src/zabbix_server/lld/lld.c +++ b/src/zabbix_server/lld/lld.c @@ -63,8 +63,6 @@ lld_override_t; /****************************************************************************** * * - * Function: lld_condition_free * - * * * Purpose: release resources allocated by filter condition * * * * Parameters: condition - [IN] the filter condition * @@ -82,8 +80,6 @@ static void lld_condition_free(lld_condition_t *condition) /****************************************************************************** * * - * Function: lld_conditions_free * - * * * Purpose: release resources allocated by filter conditions * * * * Parameters: conditions - [IN] the filter conditions * @@ -97,8 +93,6 @@ static void lld_conditions_free(zbx_vector_ptr_t *conditions) /****************************************************************************** * * - * Function: lld_condition_compare_by_macro * - * * * Purpose: compare two filter conditions by their macros * * * * Parameters: item1 - [IN] the first filter condition * @@ -115,8 +109,6 @@ static int lld_condition_compare_by_macro(const void *item1, const void *item2) /****************************************************************************** * * - * Function: lld_filter_init * - * * * Purpose: initializes lld filter * * * * Parameters: filter - [IN] the lld filter * @@ -131,8 +123,6 @@ static void lld_filter_init(lld_filter_t *filter) /****************************************************************************** * * - * Function: lld_filter_clean * - * * * Purpose: releases resources allocated by lld filter * * * * Parameters: filter - [IN] the lld filter * @@ -181,8 +171,6 @@ static int lld_filter_condition_add(zbx_vector_ptr_t *conditions, const char *id /****************************************************************************** * * - * Function: lld_filter_load * - * * * Purpose: loads lld filter data * * * * Parameters: filter - [IN] the lld filter * @@ -219,8 +207,6 @@ static int lld_filter_load(lld_filter_t *filter, zbx_uint64_t lld_ruleid, const /****************************************************************************** * * - * Function: filter_condition_match * - * * * Purpose: check if the lld data passes filter evaluation * * * * Parameters: jp_row - [IN] the lld data row * @@ -277,8 +263,6 @@ static int filter_condition_match(const struct zbx_json_parse *jp_row, const zbx /****************************************************************************** * * - * Function: filter_evaluate_and_or * - * * * Purpose: check if the lld data passes filter evaluation by and/or rule * * * * Parameters: filter - [IN] the lld filter * @@ -329,8 +313,6 @@ static int filter_evaluate_and_or(const lld_filter_t *filter, const struct zbx_j /****************************************************************************** * * - * Function: filter_evaluate_and * - * * * Purpose: check if the lld data passes filter evaluation by and rule * * * * Parameters: filter - [IN] the lld filter * @@ -366,8 +348,6 @@ static int filter_evaluate_and(const lld_filter_t *filter, const struct zbx_json /****************************************************************************** * * - * Function: filter_evaluate_or * - * * * Purpose: check if the lld data passes filter evaluation by or rule * * * * Parameters: filter - [IN] the lld filter * @@ -403,8 +383,6 @@ static int filter_evaluate_or(const lld_filter_t *filter, const struct zbx_json_ /****************************************************************************** * * - * Function: filter_evaluate_expression * - * * * Purpose: check if the lld data passes filter evaluation by custom * * expression * * * @@ -463,8 +441,6 @@ static int filter_evaluate_expression(const lld_filter_t *filter, const struct z /****************************************************************************** * * - * Function: filter_evaluate * - * * * Purpose: check if the lld data passes filter evaluation * * * * Parameters: filter - [IN] the lld filter * @@ -1108,8 +1084,6 @@ static void lld_row_free(zbx_lld_row_t *lld_row) /****************************************************************************** * * - * Function: lld_process_discovery_rule * - * * * Purpose: add or update items, triggers and graphs for discovery item * * * * Parameters: lld_ruleid - [IN] discovery item identifier from database * diff --git a/src/zabbix_server/lld/lld_common.c b/src/zabbix_server/lld/lld_common.c index a6b1c77870a..914661252f4 100644 --- a/src/zabbix_server/lld/lld_common.c +++ b/src/zabbix_server/lld/lld_common.c @@ -27,8 +27,6 @@ /****************************************************************************** * * - * Function: lld_field_str_rollback * - * * * Author: Alexander Vladishev * * * ******************************************************************************/ @@ -45,8 +43,6 @@ void lld_field_str_rollback(char **field, char **field_orig, zbx_uint64_t *flags /****************************************************************************** * * - * Function: lld_field_uint64_rollback * - * * * Author: Alexander Vladishev * * * ******************************************************************************/ @@ -62,8 +58,6 @@ void lld_field_uint64_rollback(zbx_uint64_t *field, zbx_uint64_t *field_orig, zb /****************************************************************************** * * - * Function: lld_end_of_life * - * * * Purpose: calculate when to delete lost resources in an overflow-safe way * * * ******************************************************************************/ @@ -74,8 +68,6 @@ int lld_end_of_life(int lastcheck, int lifetime) /****************************************************************************** * * - * Function: lld_remove_lost_objects * - * * * Purpose: updates lastcheck and ts_delete fields; removes lost resources * * * ******************************************************************************/ diff --git a/src/zabbix_server/lld/lld_graph.c b/src/zabbix_server/lld/lld_graph.c index 78de51511d5..bd0dc93384b 100644 --- a/src/zabbix_server/lld/lld_graph.c +++ b/src/zabbix_server/lld/lld_graph.c @@ -165,8 +165,6 @@ static void lld_graphs_free(zbx_vector_ptr_t *graphs) /****************************************************************************** * * - * Function: lld_graphs_get * - * * * Purpose: retrieve graphs which were created by the specified graph * * prototype * * * @@ -277,8 +275,6 @@ static void lld_graphs_get(zbx_uint64_t parent_graphid, zbx_vector_ptr_t *graphs /****************************************************************************** * * - * Function: lld_gitems_get * - * * * Purpose: retrieve graphs_items which are used by the graph prototype and * * by selected graphs * * * @@ -382,8 +378,6 @@ static void lld_gitems_get(zbx_uint64_t parent_graphid, zbx_vector_ptr_t *gitems /****************************************************************************** * * - * Function: lld_items_get * - * * * Purpose: returns the list of items which are related to the graph * * prototype * * * @@ -458,8 +452,6 @@ static void lld_items_get(const zbx_vector_ptr_t *gitems_proto, zbx_uint64_t ymi /****************************************************************************** * * - * Function: lld_graph_by_item * - * * * Purpose: finds already existing graph, using an item * * * * Return value: upon successful completion return pointer to the graph * @@ -492,8 +484,6 @@ static zbx_lld_graph_t *lld_graph_by_item(zbx_vector_ptr_t *graphs, zbx_uint64_t /****************************************************************************** * * - * Function: lld_graph_get * - * * * Purpose: finds already existing graph, using an item prototype and items * * already created by it * * * @@ -518,8 +508,6 @@ static zbx_lld_graph_t *lld_graph_get(zbx_vector_ptr_t *graphs, const zbx_vector /****************************************************************************** * * - * Function: lld_item_get * - * * * Purpose: finds already created item when itemid_proto is an item prototype * * or return itemid_proto as itemid if it's a normal item * * * @@ -669,8 +657,6 @@ out: /****************************************************************************** * * - * Function: lld_graph_make * - * * * Purpose: create a graph based on lld rule and add it to the list * * * ******************************************************************************/ @@ -789,8 +775,6 @@ static void lld_graphs_make(const zbx_vector_ptr_t *gitems_proto, zbx_vector_ptr /****************************************************************************** * * - * Function: lld_validate_graph_field * - * * ******************************************************************************/ static void lld_validate_graph_field(zbx_lld_graph_t *graph, char **field, char **field_orig, zbx_uint64_t flag, size_t field_len, char **error) @@ -829,8 +813,6 @@ static void lld_validate_graph_field(zbx_lld_graph_t *graph, char **field, char /****************************************************************************** * * - * Function: lld_graphs_validate * - * * * Parameters: graphs - [IN] sorted list of graphs * * * ******************************************************************************/ @@ -984,8 +966,6 @@ static void lld_graphs_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *graphs, c /****************************************************************************** * * - * Function: lld_graphs_save * - * * * Purpose: add or update graphs in database based on discovery rule * * * * Return value: SUCCEED - if graphs were successfully saved or saving * @@ -1470,8 +1450,6 @@ static void get_graph_info(const void *object, zbx_uint64_t *id, int *discovery_ /****************************************************************************** * * - * Function: lld_update_graphs * - * * * Purpose: add or update graphs for discovery item * * * * Parameters: hostid - [IN] host identifier from database * diff --git a/src/zabbix_server/lld/lld_host.c b/src/zabbix_server/lld/lld_host.c index fb8792b2a4c..adf4bdae8c9 100644 --- a/src/zabbix_server/lld/lld_host.c +++ b/src/zabbix_server/lld/lld_host.c @@ -331,8 +331,6 @@ static int zbx_ids_names_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: lld_hosts_get_tags * - * * * Purpose: retrieves tags of the existing hosts * * * * Parameters: hosts - [IN/OUT] list of hosts * @@ -400,8 +398,6 @@ out: /****************************************************************************** * * - * Function: lld_hosts_get * - * * * Purpose: retrieves existing hosts for the specified host prototype * * * * Parameters: parent_hostid - [IN] host prototype identifier * @@ -551,8 +547,6 @@ static void lld_hosts_get(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hosts, z /****************************************************************************** * * - * Function: lld_hosts_validate * - * * * Parameters: hosts - [IN] list of hosts; should be sorted by hostid * * * ******************************************************************************/ @@ -973,8 +967,6 @@ out: /****************************************************************************** * * - * Function: lld_simple_groups_get * - * * * Purpose: retrieve list of host groups which should be present on the each * * discovered host * * * @@ -1007,8 +999,6 @@ static void lld_simple_groups_get(zbx_uint64_t parent_hostid, zbx_vector_uint64_ /****************************************************************************** * * - * Function: lld_hostgroups_make * - * * * Parameters: groupids - [IN] sorted list of host group ids which * * should be present on the each * * discovered host (Groups) * @@ -1128,8 +1118,6 @@ static void lld_hostgroups_make(const zbx_vector_uint64_t *groupids, zbx_vector_ /****************************************************************************** * * - * Function: lld_group_prototypes_get * - * * * Purpose: retrieve list of group prototypes * * * * Parameters: parent_hostid - [IN] host prototype identifier * @@ -1169,8 +1157,6 @@ static void lld_group_prototypes_get(zbx_uint64_t parent_hostid, zbx_vector_ptr_ /****************************************************************************** * * - * Function: lld_groups_get * - * * * Purpose: retrieves existing groups for the specified host prototype * * * * Parameters: parent_hostid - [IN] host prototype identifier * @@ -1219,8 +1205,6 @@ static void lld_groups_get(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *groups) /****************************************************************************** * * - * Function: lld_group_make * - * * ******************************************************************************/ static zbx_lld_group_t *lld_group_make(zbx_vector_ptr_t *groups, zbx_uint64_t group_prototypeid, const char *name_proto, const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macros) @@ -1321,8 +1305,6 @@ out: /****************************************************************************** * * - * Function: lld_groups_make * - * * ******************************************************************************/ static void lld_groups_make(zbx_lld_host_t *host, zbx_vector_ptr_t *groups, const zbx_vector_ptr_t *group_prototypes, const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macros) @@ -1349,8 +1331,6 @@ static void lld_groups_make(zbx_lld_host_t *host, zbx_vector_ptr_t *groups, cons /****************************************************************************** * * - * Function: lld_validate_group_name * - * * * Purpose: validate group name * * * * Return value: SUCCEED - the group name is valid * @@ -1384,8 +1364,6 @@ static int lld_validate_group_name(const char *name) /****************************************************************************** * * - * Function: lld_groups_validate * - * * * Parameters: groups - [IN] list of groups; should be sorted by groupid * * * ******************************************************************************/ @@ -1540,8 +1518,6 @@ static void lld_groups_validate(zbx_vector_ptr_t *groups, char **error) /****************************************************************************** * * - * Function: lld_group_rights_compare * - * * * Purpose: sorting function to sort group rights vector by name * * * ******************************************************************************/ @@ -1555,8 +1531,6 @@ static int lld_group_rights_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: lld_group_rights_append * - * * * Purpose: append a new item to group rights vector * * * * Return value: Index of the added item. * @@ -1578,8 +1552,6 @@ static int lld_group_rights_append(zbx_vector_ptr_t *group_rights, const char *n /****************************************************************************** * * - * Function: lld_group_rights_free * - * * * PUrpose: frees group rights data * * * ******************************************************************************/ @@ -1592,8 +1564,6 @@ static void lld_group_rights_free(zbx_lld_group_rights_t *rights) /****************************************************************************** * * - * Function: lld_groups_save_rights * - * * * Parameters: groups - [IN] list of new groups * * * ******************************************************************************/ @@ -1736,8 +1706,6 @@ out: /****************************************************************************** * * - * Function: lld_groups_save * - * * * Parameters: groups - [IN/OUT] list of groups; should be sorted * * by groupid * * group_prototypes - [IN] list of group prototypes; should be * @@ -1915,8 +1883,6 @@ out: /****************************************************************************** * * - * Function: lld_masterhostmacros_get * - * * * Purpose: retrieve list of host macros which should be present on the each * * discovered host * * * @@ -1961,8 +1927,6 @@ static void lld_masterhostmacros_get(zbx_uint64_t lld_ruleid, zbx_vector_ptr_t * /****************************************************************************** * * - * Function: macro_str_compare_func * - * * * Purpose: compare the name of host macros for search in vector * * * * Parameters: d1 - [IN] first zbx_lld_hostmacro_t * @@ -1981,8 +1945,6 @@ static int macro_str_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: lld_hostmacros_get * - * * * Purpose: retrieve list of host macros which should be present on the each * * discovered host * * * @@ -2052,8 +2014,6 @@ static void lld_hostmacros_get(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *mas /****************************************************************************** * * - * Function: lld_hostmacro_make * - * * ******************************************************************************/ static void lld_hostmacro_make(zbx_vector_ptr_t *hostmacros, zbx_uint64_t hostmacroid, const char *macro, const char *value, const char *description, unsigned char type) @@ -2105,8 +2065,6 @@ static void lld_hostmacro_make(zbx_vector_ptr_t *hostmacros, zbx_uint64_t hostma /****************************************************************************** * * - * Function: lld_hostmacros_make * - * * * Parameters: hostmacros - [IN] list of host macros which * * should be present on the each * * discovered host * @@ -2207,8 +2165,6 @@ static void lld_hostmacros_make(const zbx_vector_ptr_t *hostmacros, zbx_vector_p /****************************************************************************** * * - * Function: lld_tags_get * - * * * Purpose: retrieve list of host tags which should be present on the each * * discovered host * * * @@ -2243,8 +2199,6 @@ static void lld_proto_tags_get(zbx_uint64_t parent_hostid, zbx_vector_db_tag_ptr /****************************************************************************** * * - * Function: lld_tag_validate_field * - * * * Purpose: validate host tag field * * * * Parameters: name - [IN] the field name (tag, value) * @@ -2278,8 +2232,6 @@ static int lld_tag_validate_field(const char *name, const char *field, size_t fi /****************************************************************************** * * - * Function: lld_tag_validate * - * * * Purpose: validate host tag * * * * Parameters: tags - [IN] the current host tags * @@ -2321,8 +2273,6 @@ static int lld_tag_validate(zbx_db_tag_t **tags, int tags_num, const char *name, /****************************************************************************** * * - * Function: lld_host_update_tags * - * * * Purpose: update host tags * * * * Parameters: host - [IN] a host with existing tags, sorted by tag + * @@ -2428,8 +2378,6 @@ static void lld_host_update_tags(zbx_lld_host_t *host, const zbx_vector_db_tag_p /****************************************************************************** * * - * Function: lld_templates_make * - * * * Purpose: gets templates from a host prototype * * * * Parameters: parent_hostid - [IN] host prototype identifier * @@ -2548,8 +2496,6 @@ static void lld_templates_make(zbx_uint64_t parent_hostid, zbx_vector_ptr_t *hos /****************************************************************************** * * - * Function: lld_interface_snmp_prepare_sql * - * * * Purpose: prepare sql for update record of interface_snmp table * * * * Parameters: hostid - [IN] host identifier * @@ -2671,8 +2617,6 @@ static void lld_interface_snmp_prepare_sql(zbx_uint64_t hostid, const zbx_uint64 /****************************************************************************** * * - * Function: lld_hosts_save * - * * * Parameters: parent_hostid - [IN] parent host id * * hosts - [IN] list of hosts; * * host_proto - [IN] host proto * @@ -3571,8 +3515,6 @@ out: /****************************************************************************** * * - * Function: lld_templates_link * - * * ******************************************************************************/ static void lld_templates_link(const zbx_vector_ptr_t *hosts, char **error) { @@ -3614,8 +3556,6 @@ static void lld_templates_link(const zbx_vector_ptr_t *hosts, char **error) /****************************************************************************** * * - * Function: lld_hosts_remove * - * * * Purpose: updates host_discovery.lastcheck and host_discovery.ts_delete * * fields; removes lost resources * * * @@ -3749,8 +3689,6 @@ static void lld_hosts_remove(const zbx_vector_ptr_t *hosts, int lifetime, int la /****************************************************************************** * * - * Function: lld_groups_remove * - * * * Purpose: updates group_discovery.lastcheck and group_discovery.ts_delete * * fields; removes lost resources * * * @@ -3852,8 +3790,6 @@ static void lld_groups_remove(const zbx_vector_ptr_t *groups, int lifetime, int /****************************************************************************** * * - * Function: lld_interfaces_get * - * * * Purpose: retrieves either the list of interfaces from the lld rule's host * * or the list of custom interfaces defined for the host prototype * * * @@ -3954,8 +3890,6 @@ static void lld_interfaces_get(zbx_uint64_t id, zbx_vector_ptr_t *interfaces, un /****************************************************************************** * * - * Function: lld_interface_make * - * * ******************************************************************************/ static void lld_interface_make(zbx_vector_ptr_t *interfaces, zbx_uint64_t parent_interfaceid, zbx_uint64_t interfaceid, unsigned char type, unsigned char main, unsigned char useip, const char *ip, @@ -4107,8 +4041,6 @@ static void lld_interface_make(zbx_vector_ptr_t *interfaces, zbx_uint64_t parent /****************************************************************************** * * - * Function: lld_interfaces_make * - * * * Parameters: interfaces - [IN] sorted list of interfaces which * * should be present on the each * * discovered host * @@ -4283,8 +4215,6 @@ static void lld_interfaces_make(const zbx_vector_ptr_t *interfaces, zbx_vector_p /****************************************************************************** * * - * Function: another_main_interface_exists * - * * * Return value: SUCCEED if interface with same type exists in the list of * * interfaces; FAIL - otherwise * * * @@ -4319,8 +4249,6 @@ static int another_main_interface_exists(const zbx_vector_ptr_t *interfaces, con /****************************************************************************** * * - * Function: lld_interfaces_validate * - * * * Parameters: hosts - [IN/OUT] list of hosts * * * ******************************************************************************/ @@ -4495,8 +4423,6 @@ static void lld_interfaces_validate(zbx_vector_ptr_t *hosts, char **error) /****************************************************************************** * * - * Function: lld_update_hosts * - * * * Purpose: add or update low-level discovered hosts * * * ******************************************************************************/ diff --git a/src/zabbix_server/lld/lld_item.c b/src/zabbix_server/lld/lld_item.c index 61449dc40fd..21673529d2a 100644 --- a/src/zabbix_server/lld/lld_item.c +++ b/src/zabbix_server/lld/lld_item.c @@ -364,8 +364,6 @@ static void lld_item_free(zbx_lld_item_t *item) /****************************************************************************** * * - * Function: lld_items_get * - * * * Purpose: retrieves existing items for the specified item prototypes * * * * Parameters: item_prototypes - [IN] item prototypes * @@ -788,8 +786,6 @@ out: /****************************************************************************** * * - * Function: is_user_macro * - * * * Purpose: checks if string is user macro * * * * Parameters: str - [IN] string to validate * @@ -815,8 +811,6 @@ static int is_user_macro(const char *str) /****************************************************************************** * * - * Function: lld_validate_item_param * - * * ******************************************************************************/ static int lld_validate_item_param(zbx_uint64_t itemid, int type, size_t len, char *param, char **error) { @@ -846,8 +840,6 @@ static int lld_validate_item_param(zbx_uint64_t itemid, int type, size_t len, ch /****************************************************************************** * * - * Function: lld_validate_item_tag * - * * ******************************************************************************/ static int lld_validate_item_tag(zbx_uint64_t itemid, int type, char *tag, char **error) { @@ -885,8 +877,6 @@ static int lld_validate_item_tag(zbx_uint64_t itemid, int type, char *tag, char /****************************************************************************** * * - * Function: lld_validate_item_field * - * * ******************************************************************************/ static void lld_validate_item_field(zbx_lld_item_t *item, char **field, char **field_orig, zbx_uint64_t flag, size_t field_len, char **error) @@ -996,8 +986,6 @@ static void lld_validate_item_field(zbx_lld_item_t *item, char **field, char **f /****************************************************************************** * * - * Function: lld_item_dependence_add * - * * * Purpose: add a new dependency * * * * Parameters: item_dependencies - [IN\OUT] list of dependencies * @@ -1027,8 +1015,6 @@ static zbx_item_dependence_t *lld_item_dependence_add(zbx_vector_ptr_t *item_dep /****************************************************************************** * * - * Function: lld_item_dependencies_get * - * * * Purpose: recursively get dependencies with dependent items taking into * * account item prototypes * * * @@ -1161,8 +1147,6 @@ static void lld_item_dependencies_get(const zbx_vector_ptr_t *item_prototypes, z /****************************************************************************** * * - * Function: lld_item_dependencies_count * - * * * Purpose: recursively count the number of dependencies * * * * Parameters: itemid - [IN] item ID to be checked * @@ -1232,8 +1216,6 @@ out: /****************************************************************************** * * - * Function: lld_item_dependencies_check * - * * * Purpose: check the limits of dependent items * * * * Parameters: item - [IN] discovered item * @@ -1313,8 +1295,6 @@ out: /****************************************************************************** * * - * Function: lld_items_preproc_step_validate * - * * * Purpose: validation of a item preprocessing step expressions for discovery * * process * * * @@ -1517,8 +1497,6 @@ static int lld_items_preproc_step_validate(const zbx_lld_item_preproc_t * pp, zb /****************************************************************************** * * - * Function: lld_items_validate * - * * * Parameters: hostid - [IN] host id * * items - [IN] list of items * * item_prototypes - [IN] the item prototypes * @@ -1875,8 +1853,6 @@ static void lld_items_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *items, zbx /****************************************************************************** * * - * Function: substitute_formula_macros * - * * * Purpose: substitutes lld macros in calculated item formula expression * * * * Parameters: data - [IN/OUT] the expression * @@ -1902,8 +1878,6 @@ static int substitute_formula_macros(char **data, const struct zbx_json_parse *j /****************************************************************************** * * - * Function: lld_item_make * - * * * Purpose: creates a new item based on item prototype and lld data row * * * * Parameters: item_prototype - [IN] the item prototype * @@ -2134,8 +2108,6 @@ static zbx_lld_item_t *lld_item_make(const zbx_lld_item_prototype_t *item_protot /****************************************************************************** * * - * Function: lld_item_update * - * * * Purpose: updates an existing item based on item prototype and lld data row * * * * Parameters: item_prototype - [IN] the item prototype * @@ -2482,8 +2454,6 @@ static void lld_item_update(const zbx_lld_item_prototype_t *item_prototype, cons /****************************************************************************** * * - * Function: lld_items_make * - * * * Purpose: updates existing items and creates new ones based on item * * item prototypes and lld data * * * @@ -2596,8 +2566,6 @@ static void lld_items_make(const zbx_vector_ptr_t *item_prototypes, zbx_vector_p /****************************************************************************** * * - * Function: substitute_lld_macors_in_preproc_params * - * * * Purpose: escaping of a symbols in items preprocessing steps for discovery * * process * * * @@ -2683,8 +2651,6 @@ static void substitute_lld_macros_in_preproc_params(int type, const zbx_lld_row_ /****************************************************************************** * * - * Function: lld_items_preproc_make * - * * * Purpose: updates existing items preprocessing operations and create new * * based on item item prototypes * * * @@ -2803,8 +2769,6 @@ static void lld_items_preproc_make(const zbx_vector_ptr_t *item_prototypes, /****************************************************************************** * * - * Function: lld_items_param_make * - * * * Purpose: updates existing items parameters and create new based on item * * prototypes * * * @@ -2909,8 +2873,6 @@ static void lld_items_param_make(const zbx_vector_ptr_t *item_prototypes, /****************************************************************************** * * - * Function: lld_items_tags_make * - * * * Purpose: updates existing items tags and create new based on item * * prototypes * * * @@ -3030,8 +2992,6 @@ static void lld_items_tags_make(const zbx_vector_ptr_t *item_prototypes, const z /****************************************************************************** * * - * Function: lld_item_save * - * * * Purpose: recursively prepare LLD item bulk insert if any and * * update dependent items with their masters * * * @@ -3111,8 +3071,6 @@ static void lld_item_save(zbx_uint64_t hostid, const zbx_vector_ptr_t *item_prot /****************************************************************************** * * - * Function: lld_item_prepare_update * - * * * Purpose: prepare sql to update LLD item * * * * Parameters: item_prototype - [IN] item prototype * @@ -3501,8 +3459,6 @@ static void lld_item_prepare_update(const zbx_lld_item_prototype_t *item_prototy /****************************************************************************** * * - * Function: lld_item_discovery_prepare_update * - * * * Purpose: prepare sql to update key in LLD item discovery * * * * Parameters: item_prototype - [IN] item prototype * @@ -3536,8 +3492,6 @@ static void lld_item_discovery_prepare_update(const zbx_lld_item_prototype_t *it /****************************************************************************** * * - * Function: lld_items_save * - * * * Parameters: hostid - [IN] parent host id * * item_prototypes - [IN] item prototypes * * items - [IN/OUT] items to save * @@ -3756,8 +3710,6 @@ out: /****************************************************************************** * * - * Function: lld_items_preproc_save * - * * * Purpose: saves/updates/removes item preprocessing operations * * * * Parameters: hostid - [IN] parent host id * @@ -3971,8 +3923,6 @@ out: /****************************************************************************** * * - * Function: lld_items_param_save * - * * * Purpose: saves/updates/removes item parameters * * * * Parameters: hostid - [IN] parent host id * @@ -4152,8 +4102,6 @@ out: /****************************************************************************** * * - * Function: lld_items_tags_save * - * * * Purpose: saves/updates/removes item tags * * * * Parameters: hostid - [IN] parent host id * @@ -4395,8 +4343,6 @@ void lld_item_links_sort(zbx_vector_ptr_t *lld_rows) /****************************************************************************** * * - * Function: lld_item_prototypes_get * - * * * Purpose: load discovery rule item prototypes * * * * Parameters: lld_ruleid - [IN] the discovery rule id * @@ -4609,8 +4555,6 @@ out: /****************************************************************************** * * - * Function: lld_link_dependent_items * - * * * Purpose: create dependent item index in master item data * * * * Parameters: items - [IN/OUT] the lld items * @@ -4647,8 +4591,6 @@ static void lld_link_dependent_items(zbx_vector_ptr_t *items, zbx_hashset_t *ite /****************************************************************************** * * - * Function: lld_update_items * - * * * Purpose: add or update discovered items * * * * Return value: SUCCEED - if items were successfully added/updated or * diff --git a/src/zabbix_server/lld/lld_manager.c b/src/zabbix_server/lld/lld_manager.c index 06be383ad2c..87ef9a68f42 100644 --- a/src/zabbix_server/lld/lld_manager.c +++ b/src/zabbix_server/lld/lld_manager.c @@ -114,8 +114,6 @@ static int rule_elem_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: lld_data_free * - * * * Purpose: frees LLD data * * * ******************************************************************************/ @@ -128,8 +126,6 @@ static void lld_data_free(zbx_lld_data_t *data) /****************************************************************************** * * - * Function: lld_rule_clear * - * * * Purpose: clears LLD rule * * * ******************************************************************************/ @@ -147,8 +143,6 @@ static void lld_rule_clear(zbx_lld_rule_t *rule) /****************************************************************************** * * - * Function: lld_worker_free * - * * * Purpose: frees LLD worker * * * ******************************************************************************/ @@ -159,8 +153,6 @@ static void lld_worker_free(zbx_lld_worker_t *worker) /****************************************************************************** * * - * Function: lld_manager_init * - * * * Purpose: initializes LLD manager * * * * Parameters: manager - [IN] the manager to initialize * @@ -201,8 +193,6 @@ static void lld_manager_init(zbx_lld_manager_t *manager) /****************************************************************************** * * - * Function: lld_manager_destroy * - * * * Purpose: destroys LLD manager * * * * Parameters: manager - [IN] the manager to destroy * @@ -220,8 +210,6 @@ static void lld_manager_destroy(zbx_lld_manager_t *manager) /****************************************************************************** * * - * Function: lld_get_worker_by_client * - * * * Purpose: returns worker by connected IPC client data * * * * Parameters: manager - [IN] the manager * @@ -248,8 +236,6 @@ static zbx_lld_worker_t *lld_get_worker_by_client(zbx_lld_manager_t *manager, zb /****************************************************************************** * * - * Function: lld_register_worker * - * * * Purpose: registers worker * * * * Parameters: manager - [IN] the manager * @@ -292,8 +278,6 @@ static void lld_register_worker(zbx_lld_manager_t *manager, zbx_ipc_client_t *cl /****************************************************************************** * * - * Function: lld_queue_rule * - * * * Purpose: queues LLD rule * * * * Parameters: manager - [IN] the LLD manager * @@ -309,8 +293,6 @@ static void lld_queue_rule(zbx_lld_manager_t *manager, zbx_lld_rule_t *rule) /****************************************************************************** * * - * Function: lld_queue_request * - * * * Purpose: queues low level discovery request * * * * Parameters: manager - [IN] the LLD manager * @@ -379,8 +361,6 @@ out: /****************************************************************************** * * - * Function: lld_process_next_request * - * * * Purpose: processes next LLD request from queue * * * * Parameters: manager - [IN] the LLD manager * @@ -407,8 +387,6 @@ static void lld_process_next_request(zbx_lld_manager_t *manager, zbx_lld_worker_ /****************************************************************************** * * - * Function: lld_process_queue * - * * * Purpose: sends queued LLD rules to free workers * * * * Parameters: manager - [IN] the LLD manager * @@ -429,8 +407,6 @@ static void lld_process_queue(zbx_lld_manager_t *manager) /****************************************************************************** * * - * Function: lld_process_result * - * * * Purpose: processes LLD worker 'done' response * * * * Parameters: manager - [IN] the LLD manager * @@ -478,8 +454,6 @@ static void lld_process_result(zbx_lld_manager_t *manager, zbx_ipc_client_t *cli /****************************************************************************** * * - * Function: lld_process_diag_stats * - * * * Purpose: processes external diagnostic statistics request * * * * Parameters: manager - [IN] the LLD manager * @@ -498,8 +472,6 @@ static void lld_process_diag_stats(zbx_lld_manager_t *manager, zbx_ipc_client_t /****************************************************************************** * * - * Function: lld_diag_item_compare_values_desc * - * * * Purpose: sort lld manager cache item view by second value * * (number of values) in descending order * * * @@ -514,8 +486,6 @@ static int lld_diag_item_compare_values_desc(const void *d1, const void *d2) /****************************************************************************** * * - * Function: lld_process_diag_top * - * * * Purpose: processes external top items request * * * * Parameters: manager - [IN] the manager * @@ -579,8 +549,6 @@ static void lld_process_top_items(zbx_lld_manager_t *manager, zbx_ipc_client_t * /****************************************************************************** * * - * Function: lld_manager_thread * - * * * Purpose: main processing loop * * * ******************************************************************************/ diff --git a/src/zabbix_server/lld/lld_protocol.c b/src/zabbix_server/lld/lld_protocol.c index 71d79029204..f8ccac0cb10 100644 --- a/src/zabbix_server/lld/lld_protocol.c +++ b/src/zabbix_server/lld/lld_protocol.c @@ -28,8 +28,6 @@ /****************************************************************************** * * - * Function: zbx_lld_serialize_item_value * - * * ******************************************************************************/ zbx_uint32_t zbx_lld_serialize_item_value(unsigned char **data, zbx_uint64_t itemid, zbx_uint64_t hostid, const char *value, const zbx_timespec_t *ts, unsigned char meta, zbx_uint64_t lastlogsize, int mtime, @@ -71,8 +69,6 @@ zbx_uint32_t zbx_lld_serialize_item_value(unsigned char **data, zbx_uint64_t ite /****************************************************************************** * * - * Function: zbx_lld_deserialize_item_value * - * * ******************************************************************************/ void zbx_lld_deserialize_item_value(const unsigned char *data, zbx_uint64_t *itemid, zbx_uint64_t *hostid, char **value, zbx_timespec_t *ts, unsigned char *meta, zbx_uint64_t *lastlogsize, int *mtime, @@ -95,8 +91,6 @@ void zbx_lld_deserialize_item_value(const unsigned char *data, zbx_uint64_t *ite /****************************************************************************** * * - * Function: zbx_lld_serialize_diag_stats * - * * ******************************************************************************/ zbx_uint32_t zbx_lld_serialize_diag_stats(unsigned char **data, zbx_uint64_t items_num, zbx_uint64_t values_num) { @@ -117,8 +111,6 @@ zbx_uint32_t zbx_lld_serialize_diag_stats(unsigned char **data, zbx_uint64_t ite /****************************************************************************** * * - * Function: zbx_lld_deserialize_diag_stats * - * * ******************************************************************************/ static void zbx_lld_deserialize_diag_stats(const unsigned char *data, zbx_uint64_t *items_num, zbx_uint64_t *values_num) { @@ -128,8 +120,6 @@ static void zbx_lld_deserialize_diag_stats(const unsigned char *data, zbx_uint64 /****************************************************************************** * * - * Function: zbx_lld_serialize_top_request * - * * ******************************************************************************/ static zbx_uint32_t zbx_lld_serialize_top_items_request(unsigned char **data, int limit) { @@ -144,8 +134,6 @@ static zbx_uint32_t zbx_lld_serialize_top_items_request(unsigned char **data, in /****************************************************************************** * * - * Function: lld_deserialize_top_request * - * * ******************************************************************************/ void zbx_lld_deserialize_top_items_request(const unsigned char *data, int *limit) { @@ -154,8 +142,6 @@ void zbx_lld_deserialize_top_items_request(const unsigned char *data, int *limit /****************************************************************************** * * - * Function: zbx_lld_serialize_top_items_result * - * * ******************************************************************************/ zbx_uint32_t zbx_lld_serialize_top_items_result(unsigned char **data, const zbx_lld_rule_info_t **rule_infos, int num) @@ -188,8 +174,6 @@ zbx_uint32_t zbx_lld_serialize_top_items_result(unsigned char **data, const zbx_ /****************************************************************************** * * - * Function: zbx_lld_deserialize_top_result * - * * ******************************************************************************/ static void zbx_lld_deserialize_top_items_result(const unsigned char *data, zbx_vector_uint64_pair_t *items) { @@ -216,8 +200,6 @@ static void zbx_lld_deserialize_top_items_result(const unsigned char *data, zbx_ /****************************************************************************** * * - * Function: zbx_lld_process_value * - * * * Purpose: process low level discovery value/error * * * * Parameters: itemid - [IN] the LLD rule id * @@ -255,8 +237,6 @@ void zbx_lld_process_value(zbx_uint64_t itemid, zbx_uint64_t hostid, const char /****************************************************************************** * * - * Function: zbx_lld_process_agent_result * - * * * Purpose: process low level discovery agent result * * * * Parameters: itemid - [IN] the LLD rule id * @@ -293,8 +273,6 @@ void zbx_lld_process_agent_result(zbx_uint64_t itemid, zbx_uint64_t hostid, AGEN /****************************************************************************** * * - * Function: zbx_lld_get_queue_size * - * * * Purpose: get queue size (enqueued value count) of LLD manager * * * * Parameters: size - [OUT] the queue size * @@ -338,8 +316,6 @@ out: /****************************************************************************** * * - * Function: zbx_lld_get_diag_stats * - * * * Purpose: get lld manager diagnostic statistics * * * ******************************************************************************/ @@ -361,8 +337,6 @@ int zbx_lld_get_diag_stats(zbx_uint64_t *items_num, zbx_uint64_t *values_num, ch /****************************************************************************** * * - * Function: zbx_lld_get_top_items * - * * * Purpose: get the top N items by the number of queued values * * * * Parameters field - [IN] the sort field * diff --git a/src/zabbix_server/lld/lld_trigger.c b/src/zabbix_server/lld/lld_trigger.c index 23db73a4297..fbf9f5a1e9e 100644 --- a/src/zabbix_server/lld/lld_trigger.c +++ b/src/zabbix_server/lld/lld_trigger.c @@ -304,8 +304,6 @@ static void lld_trigger_free(zbx_lld_trigger_t *trigger) /****************************************************************************** * * - * Function: lld_trigger_prototypes_get * - * * * Purpose: retrieve trigger prototypes which are inherited from the * * discovery rule * * * @@ -392,8 +390,6 @@ static void lld_trigger_prototypes_get(zbx_uint64_t lld_ruleid, zbx_vector_ptr_t /****************************************************************************** * * - * Function: lld_triggers_get * - * * * Purpose: retrieve triggers which were created by the specified trigger * * prototypes * * * @@ -535,8 +531,6 @@ static void lld_triggers_get(const zbx_vector_ptr_t *trigger_prototypes, zbx_vec /****************************************************************************** * * - * Function: lld_functions_get * - * * * Purpose: retrieve functions which are used by all triggers in the host of * * the trigger prototype * * * @@ -656,8 +650,6 @@ static void lld_functions_get(zbx_vector_ptr_t *trigger_prototypes, zbx_vector_p /****************************************************************************** * * - * Function: lld_dependencies_get * - * * * Purpose: retrieve trigger dependencies * * * ******************************************************************************/ @@ -760,8 +752,6 @@ static void lld_dependencies_get(zbx_vector_ptr_t *trigger_prototypes, zbx_vecto /****************************************************************************** * * - * Function: lld_tags_get * - * * * Purpose: retrieve trigger tags * * * ******************************************************************************/ @@ -865,8 +855,6 @@ static void lld_tags_get(const zbx_vector_ptr_t *trigger_prototypes, zbx_vector_ /****************************************************************************** * * - * Function: lld_items_get * - * * * Purpose: returns the list of items which are related to the trigger * * prototypes * * * @@ -931,8 +919,6 @@ static void lld_items_get(zbx_vector_ptr_t *trigger_prototypes, zbx_vector_ptr_t /****************************************************************************** * * - * Function: lld_trigger_get * - * * * Purpose: finds already existing trigger, using an item prototype and items * * already created by it * * * @@ -961,8 +947,6 @@ static zbx_lld_trigger_t *lld_trigger_get(zbx_uint64_t parent_triggerid, zbx_has /****************************************************************************** * * - * Function: lld_eval_expression_index_functions * - * * * Purpose: set indexes for functionid tokens {<functionid>} from the * * specified function vector * * * @@ -1000,8 +984,6 @@ static void lld_eval_expression_index_functions(zbx_eval_context_t *ctx, zbx_vec /****************************************************************************** * * - * Function: lld_eval_expression_simplify * - * * * Purpose: simplify parsed expression by replacing {<functionid>} with * * {<function index>} * * * @@ -1029,8 +1011,6 @@ static void lld_eval_expression_simplify(zbx_eval_context_t *ctx, char **express /****************************************************************************** * * - * Function: lld_trigger_expression_simplify * - * * * Purpose: simplify trigger expression by replacing {<functionid>} with * * {<function index>} * * * @@ -1065,8 +1045,6 @@ static void lld_trigger_expression_simplify(const zbx_lld_trigger_t *trigger, ch /****************************************************************************** * * - * Function: lld_eval_expression_expand * - * * * Purpose: expand parsed expression function indexes with function strings * * in format itemid:func(params) * * * @@ -1124,8 +1102,6 @@ static char *lld_eval_expression_expand(zbx_eval_context_t *ctx, const zbx_vecto /****************************************************************************** * * - * Function: lld_trigger_expression_expand * - * * * Purpose: expand trigger expression function indexes with function strings * * in format itemid:func(params) * * * @@ -1160,8 +1136,6 @@ static char *lld_trigger_expression_expand(const zbx_lld_trigger_t *trigger, con /****************************************************************************** * * - * Function: lld_trigger_expression_simplify_and_expand * - * * * Purpose: set function indexes and expand them to function strings in * * format itemid:func(params) * * * @@ -1362,8 +1336,6 @@ out: /****************************************************************************** * * - * Function: lld_eval_get_expanded_expression * - * * * Purpose: return copy of the expression with expanded LLD macros * * * ******************************************************************************/ @@ -1416,8 +1388,6 @@ out: /****************************************************************************** * * - * Function: lld_trigger_make * - * * * Purpose: create a trigger based on lld rule and add it to the list * * * ******************************************************************************/ @@ -1713,8 +1683,6 @@ static void lld_triggers_make(const zbx_vector_ptr_t *trigger_prototypes, zbx_ve /****************************************************************************** * * - * Function: lld_trigger_dependency_make * - * * * Purpose: create a trigger dependencies * * * ******************************************************************************/ @@ -1921,8 +1889,6 @@ static void lld_trigger_dependencies_make(const zbx_vector_ptr_t *trigger_protot /****************************************************************************** * * - * Function: lld_trigger_tag_make * - * * * Purpose: create a trigger tag * * * ******************************************************************************/ @@ -2022,8 +1988,6 @@ out: /****************************************************************************** * * - * Function: lld_trigger_tags_make * - * * * Purpose: create a trigger tags * * * ******************************************************************************/ @@ -2095,8 +2059,6 @@ static void lld_trigger_tags_make(const zbx_vector_ptr_t *trigger_prototypes, zb /****************************************************************************** * * - * Function: lld_validate_trigger_field * - * * ******************************************************************************/ static void lld_validate_trigger_field(zbx_lld_trigger_t *trigger, char **field, char **field_orig, zbx_uint64_t flag, size_t field_len, char **error) @@ -2135,8 +2097,6 @@ static void lld_validate_trigger_field(zbx_lld_trigger_t *trigger, char **field, /****************************************************************************** * * - * Function: lld_trigger_changed * - * * * Return value: returns SUCCEED if a trigger description or expression has * * been changed; FAIL - otherwise * * * @@ -2174,8 +2134,6 @@ static int lld_trigger_changed(const zbx_lld_trigger_t *trigger) /****************************************************************************** * * - * Function: lld_triggers_equal * - * * * Return value: returns SUCCEED if descriptions and expressions of * * the triggers are identical; FAIL - otherwise * * * @@ -2210,8 +2168,6 @@ out: /****************************************************************************** * * - * Function: lld_triggers_validate * - * * * Parameters: triggers - [IN] sorted list of triggers * * * ******************************************************************************/ @@ -2427,8 +2383,6 @@ static void lld_triggers_validate(zbx_uint64_t hostid, zbx_vector_ptr_t *trigger /****************************************************************************** * * - * Function: lld_validate_trigger_tag_field * - * * ******************************************************************************/ static void lld_validate_trigger_tag_field(zbx_lld_tag_t *tag, const char *field, zbx_uint64_t flag, size_t field_len, char **error) @@ -2467,8 +2421,6 @@ static void lld_validate_trigger_tag_field(zbx_lld_tag_t *tag, const char *field /****************************************************************************** * * - * Function: lld_trigger_tags_validate * - * * * Purpose: validate created or updated trigger tags * * * ******************************************************************************/ @@ -2526,8 +2478,6 @@ static void lld_trigger_tags_validate(zbx_vector_ptr_t *triggers, char **error) /****************************************************************************** * * - * Function: lld_expression_create * - * * * Purpose: transforms the simple trigger expression to the DB format * * * * Example: * @@ -2609,8 +2559,6 @@ out: /****************************************************************************** * * - * Function: lld_triggers_save * - * * * Purpose: add or update triggers in database based on discovery rule * * * * Parameters: hostid - [IN] parent host id * @@ -3332,8 +3280,6 @@ static int zbx_lld_trigger_node_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: lld_trigger_cache_append * - * * * Purpose: adds a node to trigger cache * * * * Parameters: cache - [IN] the trigger cache * @@ -3361,8 +3307,6 @@ static zbx_lld_trigger_node_t *lld_trigger_cache_append(zbx_hashset_t *cache, zb /****************************************************************************** * * - * Function: lld_trigger_cache_add_trigger_node * - * * * Purpose: add trigger and all triggers related to it to trigger dependency * * validation cache. * * * @@ -3444,8 +3388,6 @@ static void lld_trigger_cache_add_trigger_node(zbx_hashset_t *cache, zbx_lld_tri /****************************************************************************** * * - * Function: lld_trigger_cache_init * - * * * Purpose: initializes trigger cache used to perform trigger dependency * * validation * * * @@ -3625,8 +3567,6 @@ static void lld_trigger_cache_init(zbx_hashset_t *cache, zbx_vector_ptr_t *trigg /****************************************************************************** * * - * Function: zbx_trigger_cache_clean * - * * * Purpose: releases resources allocated by trigger cache * * validation * * * @@ -3650,8 +3590,6 @@ static void zbx_trigger_cache_clean(zbx_hashset_t *cache) /****************************************************************************** * * - * Function: lld_trigger_dependency_delete * - * * * Purpose: removes trigger dependency * * * * Parameters: from - [IN] the reference to dependent trigger * @@ -3714,8 +3652,6 @@ static void lld_trigger_dependency_delete(zbx_lld_trigger_ref_t *from, zbx_lld_t /****************************************************************************** * * - * Function: lld_trigger_dependencies_iter * - * * * Purpose: iterates through trigger dependencies to find dependency loops * * * * Parameters: cache - [IN] the trigger cache * @@ -3792,8 +3728,6 @@ static int lld_trigger_dependencies_iter(zbx_hashset_t *cache, zbx_vector_ptr_t /****************************************************************************** * * - * Function: lld_trigger_dependencies_validate * - * * * Purpose: validate discovered trigger dependencies * * * * Parameters: triggers - [IN] the discovered triggers * @@ -3885,8 +3819,6 @@ static void get_trigger_info(const void *object, zbx_uint64_t *id, int *discover /****************************************************************************** * * - * Function: lld_update_triggers * - * * * Purpose: add or update triggers for discovered items * * * * Return value: SUCCEED - if triggers were successfully added/updated or * diff --git a/src/zabbix_server/lld/lld_worker.c b/src/zabbix_server/lld/lld_worker.c index e1a3aea5f2f..f6e8344be9d 100644 --- a/src/zabbix_server/lld/lld_worker.c +++ b/src/zabbix_server/lld/lld_worker.c @@ -36,8 +36,6 @@ extern ZBX_THREAD_LOCAL int server_num, process_num; /****************************************************************************** * * - * Function: lld_register_worker * - * * * Purpose: registers lld worker with lld manager * * * * Parameters: socket - [IN] the connections socket * @@ -54,8 +52,6 @@ static void lld_register_worker(zbx_ipc_socket_t *socket) /****************************************************************************** * * - * Function: lld_process_task * - * * * Purpose: processes lld task and updates rule state/error in configuration * * cache and database * * * diff --git a/src/zabbix_server/odbc/odbc.c b/src/zabbix_server/odbc/odbc.c index a4ebd87dd26..a95d7149e30 100644 --- a/src/zabbix_server/odbc/odbc.c +++ b/src/zabbix_server/odbc/odbc.c @@ -48,8 +48,6 @@ struct zbx_odbc_query_result /****************************************************************************** * * - * Function: zbx_odbc_rc_str * - * * * Purpose: get human readable representation of ODBC return code * * * * Parameters: rc - [IN] ODBC return code * @@ -83,8 +81,6 @@ static const char *zbx_odbc_rc_str(SQLRETURN rc) /****************************************************************************** * * - * Function: zbx_odbc_diag * - * * * Purpose: diagnose result of ODBC function call * * * * Parameters: h_type - [IN] type of handle call was executed on * @@ -149,8 +145,6 @@ static int zbx_odbc_diag(SQLSMALLINT h_type, SQLHANDLE h, SQLRETURN rc, char **d /****************************************************************************** * * - * Function: zbx_log_odbc_connection_info * - * * * Purpose: log details upon successful connection on behalf of caller * * * * Parameters: function - [IN] caller function name * @@ -205,8 +199,6 @@ static void zbx_log_odbc_connection_info(const char *function, SQLHDBC hdbc) /****************************************************************************** * * - * Function: zbx_odbc_connection_string_append * - * * * Purpose: Appends a new argument to ODBC connection string. * * Connection string is reallocated to fit new value. * * * @@ -232,8 +224,6 @@ static void zbx_odbc_connection_string_append(char **connection_str, const char /****************************************************************************** * * - * Function: zbx_odbc_connect * - * * * Purpose: connect to ODBC data source * * * * Parameters: dsn - [IN] data source name * @@ -344,8 +334,6 @@ out: /****************************************************************************** * * - * Function: zbx_odbc_data_source_free * - * * * Purpose: free resources allocated by successful zbx_odbc_connect() call * * * * Parameters: data_source - [IN] pointer to data source structure * @@ -364,8 +352,6 @@ void zbx_odbc_data_source_free(zbx_odbc_data_source_t *data_source) /****************************************************************************** * * - * Function: zbx_odbc_select * - * * * Purpose: execute a query to ODBC data source * * * * Parameters: data_source - [IN] pointer to data source structure * @@ -444,8 +430,6 @@ out: /****************************************************************************** * * - * Function: zbx_odbc_query_result_free * - * * * Purpose: free resources allocated by successful zbx_odbc_select() call * * * * Parameters: query_result - [IN] pointer to query result structure * @@ -469,8 +453,6 @@ void zbx_odbc_query_result_free(zbx_odbc_query_result_t *query_result) /****************************************************************************** * * - * Function: zbx_odbc_fetch * - * * * Purpose: fetch single row of ODBC query result * * * * Parameters: query_result - [IN] pointer to query result structure * @@ -549,8 +531,6 @@ out: /****************************************************************************** * * - * Function: zbx_odbc_query_result_to_string * - * * * Purpose: extract the first column of the first row of ODBC SQL query * * * * Parameters: query_result - [IN] result of SQL query * @@ -594,8 +574,6 @@ int zbx_odbc_query_result_to_string(zbx_odbc_query_result_t *query_result, char /****************************************************************************** * * - * Function: odbc_query_result_to_json * - * * * Purpose: convert ODBC SQL query result into JSON * * * * Parameters: query_result - [IN] result of SQL query * @@ -717,8 +695,6 @@ out: /****************************************************************************** * * - * Function: zbx_odbc_query_result_to_lld_json * - * * * Purpose: public wrapper for odbc_query_result_to_json * * * *****************************************************************************/ @@ -729,8 +705,6 @@ int zbx_odbc_query_result_to_lld_json(zbx_odbc_query_result_t *query_result, cha /****************************************************************************** * * - * Function: zbx_odbc_query_result_to_json * - * * * Purpose: public wrapper for odbc_query_result_to_json * * * *****************************************************************************/ diff --git a/src/zabbix_server/operations.c b/src/zabbix_server/operations.c index f29cf3007a0..9307d60bf62 100644 --- a/src/zabbix_server/operations.c +++ b/src/zabbix_server/operations.c @@ -39,8 +39,6 @@ zbx_dcheck_source_t; /****************************************************************************** * * - * Function: select_discovered_host * - * * * Purpose: select hostid of discovered host * * * * Parameters: event - [IN] source event data * @@ -130,8 +128,6 @@ exit: /****************************************************************************** * * - * Function: add_discovered_host_groups * - * * * Purpose: add group to host if not added already * * * * Parameters: hostid - [IN] host identifier * @@ -204,8 +200,6 @@ static void add_discovered_host_groups(zbx_uint64_t hostid, zbx_vector_uint64_t /****************************************************************************** * * - * Function: add_discovered_host * - * * * Purpose: add discovered host if it was not added already * * * * Parameters: event - [IN] the source event * @@ -644,8 +638,6 @@ clean: /****************************************************************************** * * - * Function: is_discovery_or_autoregistration * - * * * Purpose: checks if the event is discovery or autoregistration event * * * * Parameters: event - [IN] source event data * @@ -670,8 +662,6 @@ static int is_discovery_or_autoregistration(const DB_EVENT *event) /****************************************************************************** * * - * Function: op_host_add * - * * * Purpose: add discovered host * * * * Parameters: event - [IN] source event data * @@ -694,8 +684,6 @@ out: /****************************************************************************** * * - * Function: op_host_del * - * * * Purpose: delete host * * * * Parameters: event - [IN] source event data * @@ -735,8 +723,6 @@ out: /****************************************************************************** * * - * Function: op_host_enable * - * * * Purpose: enable discovered * * * * Parameters: event - [IN] the source event * @@ -771,8 +757,6 @@ out: /****************************************************************************** * * - * Function: op_host_disable * - * * * Purpose: disable host * * * * Parameters: event - [IN] the source event * @@ -807,8 +791,6 @@ out: /****************************************************************************** * * - * Function: op_host_inventory_mode * - * * * Purpose: sets host inventory mode * * * * Parameters: event - [IN] the source event * @@ -840,8 +822,6 @@ out: /****************************************************************************** * * - * Function: op_groups_add * - * * * Purpose: add groups to discovered host * * * * Parameters: event - [IN] the source event data * @@ -869,8 +849,6 @@ out: /****************************************************************************** * * - * Function: op_groups_del * - * * * Purpose: delete groups from discovered host * * * * Parameters: event - [IN] source event data * @@ -975,8 +953,6 @@ out: /****************************************************************************** * * - * Function: op_template_add * - * * * Purpose: link host with template * * * * Parameters: event - [IN] source event data * @@ -1009,8 +985,6 @@ out: /****************************************************************************** * * - * Function: op_template_del * - * * * Purpose: unlink and clear host from template * * * * Parameters: event - [IN] source event data * diff --git a/src/zabbix_server/pinger/pinger.c b/src/zabbix_server/pinger/pinger.c index 63a3018636e..a708b6f12a3 100644 --- a/src/zabbix_server/pinger/pinger.c +++ b/src/zabbix_server/pinger/pinger.c @@ -43,8 +43,6 @@ extern ZBX_THREAD_LOCAL int server_num, process_num; /****************************************************************************** * * - * Function: process_value * - * * * Purpose: process new item value * * * * Parameters: * @@ -107,8 +105,6 @@ clean: /****************************************************************************** * * - * Function: process_values * - * * * Purpose: process new item values * * * * Parameters: * @@ -394,8 +390,6 @@ static void add_icmpping_item(icmpitem_t **items, int *items_alloc, int *items_c /****************************************************************************** * * - * Function: get_pinger_hosts * - * * * Purpose: creates buffer which contains list of hosts to ping * * * * Parameters: * @@ -506,8 +500,6 @@ static void add_pinger_host(ZBX_FPING_HOST **hosts, int *hosts_alloc, int *hosts /****************************************************************************** * * - * Function: process_pinger_hosts * - * * * Purpose: * * * * Parameters: * @@ -561,8 +553,6 @@ static void process_pinger_hosts(icmpitem_t *items, int items_count) /****************************************************************************** * * - * Function: main_pinger_loop * - * * * Purpose: periodically perform ICMP pings * * * * Parameters: * diff --git a/src/zabbix_server/poller/checks_agent.c b/src/zabbix_server/poller/checks_agent.c index c3591170a60..8152c625920 100644 --- a/src/zabbix_server/poller/checks_agent.c +++ b/src/zabbix_server/poller/checks_agent.c @@ -30,8 +30,6 @@ extern unsigned char program_type; /****************************************************************************** * * - * Function: get_value_agent * - * * * Purpose: retrieve data from Zabbix agent * * * * Parameters: item - item we are interested in * diff --git a/src/zabbix_server/poller/checks_aggregate.c b/src/zabbix_server/poller/checks_aggregate.c index ba4d9178a98..aad6ec9dd96 100644 --- a/src/zabbix_server/poller/checks_aggregate.c +++ b/src/zabbix_server/poller/checks_aggregate.c @@ -33,8 +33,6 @@ /****************************************************************************** * * - * Function: evaluate_history_func_min * - * * * Purpose: calculate minimum value from the history value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -65,8 +63,6 @@ static void evaluate_history_func_min(zbx_vector_history_record_t *values, int v /****************************************************************************** * * - * Function: evaluate_history_func_max * - * * * Purpose: calculate maximum value from the history value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -97,8 +93,6 @@ static void evaluate_history_func_max(zbx_vector_history_record_t *values, int v /****************************************************************************** * * - * Function: evaluate_history_func_sum * - * * * Purpose: calculate sum of values from the history value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -127,8 +121,6 @@ static void evaluate_history_func_sum(zbx_vector_history_record_t *values, int v /****************************************************************************** * * - * Function: evaluate_history_func_avg * - * * * Purpose: calculate average value of values from the history value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -149,8 +141,6 @@ static void evaluate_history_func_avg(zbx_vector_history_record_t *values, int v /****************************************************************************** * * - * Function: evaluate_history_func_count * - * * * Purpose: calculate number of values in value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -170,8 +160,6 @@ static void evaluate_history_func_count(zbx_vector_history_record_t *values, int /****************************************************************************** * * - * Function: evaluate_history_func_last * - * * * Purpose: calculate the last (newest) value in value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -185,8 +173,6 @@ static void evaluate_history_func_last(zbx_vector_history_record_t *values, hist /****************************************************************************** * * - * Function: evaluate_history_func * - * * * Purpose: calculate function with values from value vector * * * * Parameters: values - [IN] a vector containing history values * @@ -228,8 +214,6 @@ static void evaluate_history_func(zbx_vector_history_record_t *values, int value /****************************************************************************** * * - * Function: quote_string * - * * * Purpose: quotes string by enclosing it in double quotes and escaping * * double quotes inside string with '\'. * * * @@ -264,8 +248,6 @@ static void quote_string(char **str, size_t sz_src) /****************************************************************************** * * - * Function: aggregate_quote_groups * - * * * Purpose: quotes the individual groups in the list if necessary * * * ******************************************************************************/ @@ -288,8 +270,6 @@ static void aggregate_quote_groups(char **str, size_t *str_alloc, size_t *str_of /****************************************************************************** * * - * Function: aggregate_get_items * - * * * Purpose: get array of items specified by key for selected groups * * (including nested groups) * * * @@ -378,8 +358,6 @@ out: /****************************************************************************** * * - * Function: evaluate_aggregate * - * * * Parameters: item - [IN] aggregated item * * grp_func - [IN] one of ZBX_GRP_FUNC_* * * groups - [IN] list of host groups * diff --git a/src/zabbix_server/poller/checks_db.c b/src/zabbix_server/poller/checks_db.c index 02f4df4cc80..81c58a6973e 100644 --- a/src/zabbix_server/poller/checks_db.c +++ b/src/zabbix_server/poller/checks_db.c @@ -26,8 +26,6 @@ /****************************************************************************** * * - * Function: get_value_db * - * * * Purpose: retrieve data from database * * * * Parameters: item - [IN] item we are interested in * diff --git a/src/zabbix_server/poller/checks_external.c b/src/zabbix_server/poller/checks_external.c index f4eff03eb44..e2f2a05a568 100644 --- a/src/zabbix_server/poller/checks_external.c +++ b/src/zabbix_server/poller/checks_external.c @@ -27,8 +27,6 @@ extern char *CONFIG_EXTERNALSCRIPTS; /****************************************************************************** * * - * Function: get_value_external * - * * * Purpose: retrieve data from script executed on Zabbix server * * * * Parameters: item - item we are interested in * diff --git a/src/zabbix_server/poller/checks_internal.c b/src/zabbix_server/poller/checks_internal.c index 3c844245eb6..daf36727504 100644 --- a/src/zabbix_server/poller/checks_internal.c +++ b/src/zabbix_server/poller/checks_internal.c @@ -58,8 +58,6 @@ static int compare_interfaces(const void *p1, const void *p2) /****************************************************************************** * * - * Function: zbx_host_interfaces_discovery * - * * * Purpose: get data of all network interfaces for a host from configuration * * cache and pack into JSON for LLD * * * @@ -172,8 +170,6 @@ static int zbx_host_interfaces_discovery(zbx_uint64_t hostid, struct zbx_json *j /****************************************************************************** * * - * Function: get_value_internal * - * * * Purpose: retrieve data from Zabbix server (internally supported items) * * * * Parameters: item - item we are interested in * diff --git a/src/zabbix_server/poller/checks_internal_proxy.c b/src/zabbix_server/poller/checks_internal_proxy.c index fedb1d900fa..b4dd526cd53 100644 --- a/src/zabbix_server/poller/checks_internal_proxy.c +++ b/src/zabbix_server/poller/checks_internal_proxy.c @@ -23,8 +23,6 @@ /****************************************************************************** * * - * Function: zbx_get_value_internal_ext * - * * * Purpose: processes program type (proxy) specific internal checks * * * * Parameters: param1 - [IN] the first parameter * diff --git a/src/zabbix_server/poller/checks_internal_server.c b/src/zabbix_server/poller/checks_internal_server.c index 5c9efac7699..847723d5bc2 100644 --- a/src/zabbix_server/poller/checks_internal_server.c +++ b/src/zabbix_server/poller/checks_internal_server.c @@ -26,8 +26,6 @@ /****************************************************************************** * * - * Function: zbx_get_value_internal_ext * - * * * Purpose: processes program type (server) specific internal checks * * * * Parameters: param1 - [IN] the first parameter * diff --git a/src/zabbix_server/poller/checks_simple.c b/src/zabbix_server/poller/checks_simple.c index 2e5c5413a16..3298347efd4 100644 --- a/src/zabbix_server/poller/checks_simple.c +++ b/src/zabbix_server/poller/checks_simple.c @@ -140,8 +140,6 @@ static zbx_vmcheck_t vmchecks[] = /****************************************************************************** * * - * Function: get_vmware_function * - * * * Purpose: Retrieves a handler of the item key * * * * Parameters: key - [IN] an item key (without parameters) * diff --git a/src/zabbix_server/poller/checks_simple_vmware.c b/src/zabbix_server/poller/checks_simple_vmware.c index 50e944c851b..dd6e1aa11cb 100644 --- a/src/zabbix_server/poller/checks_simple_vmware.c +++ b/src/zabbix_server/poller/checks_simple_vmware.c @@ -60,8 +60,6 @@ static int vmware_set_powerstate_result(AGENT_RESULT *result) /****************************************************************************** * * - * Function: hv_get * - * * * Purpose: return pointer to Hypervisor data from hashset with uuid * * * * Parameters: hvs - [IN] the hashset with all Hypervisors * @@ -86,8 +84,6 @@ static zbx_vmware_hv_t *hv_get(zbx_hashset_t *hvs, const char *uuid) /****************************************************************************** * * - * Function: ds_get * - * * * Purpose: return pointer to Datastore data from vector with id * * * * Parameters: dss - [IN] the vector with all Datastores * @@ -193,8 +189,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_counter_value_by_id * - * * * Purpose: gets vmware performance counter value by its identifier * * * * Parameters: service - [IN] the vmware service * @@ -334,8 +328,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_counter_value_by_path * - * * * Purpose: gets vmware performance counter value by the path * * * * Parameters: service - [IN] the vmware service * @@ -400,8 +392,6 @@ out: /****************************************************************************** * * - * Function: get_vmware_service * - * * * Purpose: gets vmware service object * * * * Parameters: url - [IN] the vmware service URL * @@ -460,8 +450,6 @@ out: /****************************************************************************** * * - * Function: get_vcenter_vmprop * - * * * Purpose: retrieves data from virtual machine details * * * * Parameters: request - [IN] the original request. The first parameter is * @@ -528,8 +516,6 @@ out: /****************************************************************************** * * - * Function: get_vcenter_hvprop * - * * * Purpose: retrieves hypervisor property * * * * Parameters: request - [IN] the original request. The first parameter is * diff --git a/src/zabbix_server/poller/checks_snmp.c b/src/zabbix_server/poller/checks_snmp.c index c93abbe1d90..45920772ac5 100644 --- a/src/zabbix_server/poller/checks_snmp.c +++ b/src/zabbix_server/poller/checks_snmp.c @@ -196,8 +196,6 @@ static char *get_item_security_name(const DC_ITEM *item) /****************************************************************************** * * - * Function: cache_get_snmp_index * - * * * Purpose: retrieve index that matches value from the relevant index cache * * * * Parameters: item - [IN] configuration of Zabbix item, contains * @@ -252,8 +250,6 @@ end: /****************************************************************************** * * - * Function: cache_put_snmp_index * - * * * Purpose: store the index-value pair in the relevant index cache * * * * Parameters: item - [IN] configuration of Zabbix item, contains * @@ -319,8 +315,6 @@ static void cache_put_snmp_index(const DC_ITEM *item, const char *snmp_oid, cons /****************************************************************************** * * - * Function: cache_del_snmp_index_subtree * - * * * Purpose: delete index-value mappings from the specified index cache * * * * Parameters: item - [IN] configuration of Zabbix item, contains * @@ -1028,8 +1022,6 @@ static int zbx_oid_is_new(zbx_hashset_t *hs, size_t root_len, const oid *p_oid, /****************************************************************************** * * - * Function: zbx_snmp_walk * - * * * Purpose: retrieve information by walking an OID tree * * * * Parameters: ss - [IN] SNMP session handle * @@ -1564,8 +1556,6 @@ out: /****************************************************************************** * * - * Function: zbx_snmp_translate * - * * * Purpose: translate well-known object identifiers into numeric form * * * * Author: Alexei Vladishev * @@ -1675,8 +1665,6 @@ static int zbx_snmp_dobject_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: zbx_snmp_ddata_init * - * * * Purpose: initializes snmp discovery data object * * * * Parameters: data - [IN] snmp discovery data object * @@ -1747,8 +1735,6 @@ out: /****************************************************************************** * * - * Function: zbx_snmp_ddata_clean * - * * * Purpose: releases data allocated by snmp discovery * * * * Parameters: data - [IN] snmp discovery data object * diff --git a/src/zabbix_server/poller/poller.c b/src/zabbix_server/poller/poller.c index 563a057eedd..05619581d8c 100644 --- a/src/zabbix_server/poller/poller.c +++ b/src/zabbix_server/poller/poller.c @@ -57,8 +57,6 @@ static volatile sig_atomic_t snmp_cache_reload_requested; /****************************************************************************** * * - * Function: update_interface_availability * - * * * Purpose: write interface availability changes into database * * * * Parameters: data - [IN/OUT] the serialized availability data * @@ -83,8 +81,6 @@ static int update_interface_availability(unsigned char **data, size_t *data_allo /****************************************************************************** * * - * Function: interface_get_availability * - * * * Purpose: get interface availability data * * * * Parameters: dc_interface - [IN] the interface * @@ -107,8 +103,6 @@ static void interface_get_availability(const DC_INTERFACE *dc_interface, zbx_int /******************************************************************************** * * - * Function: interface_set_availability * - * * * Purpose: sets interface availability data * * * * Parameters: dc_interface - [IN/OUT] the interface * @@ -153,8 +147,6 @@ static int interface_availability_by_item_type(unsigned char item_type, unsigned /******************************************************************************** * * - * Function: zbx_activate_item_interface * - * * * Purpose: activate item interface * * * * Parameters: ts - [IN] the timestamp * @@ -208,8 +200,6 @@ out: /******************************************************************************** * * - * Function: zbx_deactivate_item_interface * - * * * Purpose: deactivate item interface * * * * Parameters: ts - [IN] the timestamp * @@ -784,8 +774,6 @@ void zbx_clean_items(DC_ITEM *items, int num, AGENT_RESULT *results) /****************************************************************************** * * - * Function: get_values * - * * * Purpose: retrieve values of metrics from monitored hosts * * * * Parameters: poller_type - [IN] poller type (ZBX_POLLER_TYPE_...) * diff --git a/src/zabbix_server/postinit.c b/src/zabbix_server/postinit.c index 7b9884d3124..91895a30198 100644 --- a/src/zabbix_server/postinit.c +++ b/src/zabbix_server/postinit.c @@ -31,8 +31,6 @@ /****************************************************************************** * * - * Function: get_trigger_count * - * * * Purpose: gets the total number of triggers on system * * * * Parameters: * @@ -58,8 +56,6 @@ static int get_trigger_count(void) /****************************************************************************** * * - * Function: is_historical_macro * - * * * Purpose: checks if this is historical macro that cannot be expanded for * * bulk event name update * * * @@ -81,8 +77,6 @@ static int is_historical_macro(const char *macro) /****************************************************************************** * * - * Function: convert_historical_macro * - * * * Purpose: translates historical macro to lld macro format * * * * Parameters: macro - [IN] the macro type (see ZBX_HIST_MACRO_* defines) * @@ -104,8 +98,6 @@ static const char *convert_historical_macro(int macro) /****************************************************************************** * * - * Function: preprocess_trigger_name * - * * * Purpose: pre-process trigger name(description) by expanding non historical * * macros * * * @@ -216,8 +208,6 @@ static void preprocess_trigger_name(DB_TRIGGER *trigger, int *historical) /****************************************************************************** * * - * Function: process_event_bulk_update * - * * * Purpose: update event/problem names for a trigger with bulk request * * * * Parameters: trigger - [IN] the trigger * @@ -267,8 +257,6 @@ static int process_event_bulk_update(const DB_TRIGGER *trigger, char **sql, size /****************************************************************************** * * - * Function: process_event_update * - * * * Purpose: update event/problem names for a trigger with separate requests * * for each event * * * @@ -352,8 +340,6 @@ static int process_event_update(const DB_TRIGGER *trigger, char **sql, size_t *s /****************************************************************************** * * - * Function: update_event_names * - * * * Purpose: update event names in events and problem tables * * * * Return value: SUCCEED - the update was successful * @@ -437,8 +423,6 @@ out: /****************************************************************************** * * - * Function: zbx_check_postinit_tasks * - * * * Purpose: process post initialization tasks * * * * Return value: SUCCEED - the update was successful * diff --git a/src/zabbix_server/preprocessor/item_preproc.c b/src/zabbix_server/preprocessor/item_preproc.c index 3d2c5222402..7feae968916 100644 --- a/src/zabbix_server/preprocessor/item_preproc.c +++ b/src/zabbix_server/preprocessor/item_preproc.c @@ -36,8 +36,6 @@ extern zbx_es_t es_engine; /****************************************************************************** * * - * Function: item_preproc_numeric_type_hint * - * * * Purpose: returns numeric type hint based on item value type * * * * Parameters: value_type - [IN] the item value type * @@ -60,8 +58,6 @@ static int item_preproc_numeric_type_hint(unsigned char value_type) /****************************************************************************** * * - * Function: item_preproc_convert_value * - * * * Purpose: convert variant value to the requested type * * * * Parameters: value - [IN/OUT] the value to convert * @@ -85,8 +81,6 @@ static int item_preproc_convert_value(zbx_variant_t *value, unsigned char type, /****************************************************************************** * * - * Function: zbx_item_preproc_convert_value_to_numeric * - * * * Purpose: converts variant value to numeric * * * * Parameters: value_num - [OUT] the converted value * @@ -131,8 +125,6 @@ int zbx_item_preproc_convert_value_to_numeric(zbx_variant_t *value_num, const zb /****************************************************************************** * * - * Function: item_preproc_multiplier_variant * - * * * Purpose: execute custom multiplier preprocessing operation on variant * * value type * * * @@ -180,8 +172,6 @@ static int item_preproc_multiplier_variant(unsigned char value_type, zbx_variant /****************************************************************************** * * - * Function: item_preproc_validate_notsupport * - * * * Purpose: executes during notsupported item preprocessing * * * * Return value: FAIL - for further error handling * @@ -195,8 +185,6 @@ static int item_preproc_validate_notsupport(char **errmsg) /****************************************************************************** * * - * Function: item_preproc_multiplier * - * * * Purpose: execute custom multiplier preprocessing operation * * * * Parameters: value_type - [IN] the item type * @@ -232,8 +220,6 @@ static int item_preproc_multiplier(unsigned char value_type, zbx_variant_t *valu /****************************************************************************** * * - * Function: item_preproc_delta_float * - * * * Purpose: execute delta type preprocessing operation * * * * Parameters: value - [IN/OUT] the value to process * @@ -272,8 +258,6 @@ static int item_preproc_delta_float(zbx_variant_t *value, const zbx_timespec_t * /****************************************************************************** * * - * Function: item_preproc_delta_uint64 * - * * * Purpose: execute delta type preprocessing operation * * * * Parameters: value - [IN/OUT] the value to process * @@ -312,8 +296,6 @@ static int item_preproc_delta_uint64(zbx_variant_t *value, const zbx_timespec_t /****************************************************************************** * * - * Function: item_preproc_delta * - * * * Purpose: execute delta type preprocessing operation * * * * Parameters: value_type - [IN] the item value type * @@ -371,8 +353,6 @@ static int item_preproc_delta(unsigned char value_type, zbx_variant_t *value, co /****************************************************************************** * * - * Function: item_preproc_delta_value * - * * * Purpose: execute delta (simple change) preprocessing operation * * * * Parameters: value_type - [IN] the item value type * @@ -407,8 +387,6 @@ static int item_preproc_delta_value(unsigned char value_type, zbx_variant_t *val /****************************************************************************** * * - * Function: item_preproc_delta_speed * - * * * Purpose: execute delta (speed per second) preprocessing operation * * * * Parameters: value_type - [IN] the item value type * @@ -443,8 +421,6 @@ static int item_preproc_delta_speed(unsigned char value_type, zbx_variant_t *val /****************************************************************************** * * - * Function: unescape_param * - * * * Purpose: copy first n chars from in to out, unescape escaped characters * * during copying * * * @@ -496,8 +472,6 @@ static void unescape_param(int op_type, const char *in, int len, char *out) /****************************************************************************** * * - * Function: item_preproc_trim * - * * * Purpose: execute trim type preprocessing operation * * * * Parameters: value - [IN/OUT] the value to process * @@ -529,8 +503,6 @@ static int item_preproc_trim(zbx_variant_t *value, unsigned char op_type, const /****************************************************************************** * * - * Function: item_preproc_rtrim * - * * * Purpose: execute right trim preprocessing operation * * * * Parameters: value - [IN/OUT] the value to process * @@ -560,8 +532,6 @@ static int item_preproc_rtrim(zbx_variant_t *value, const char *params, char **e /****************************************************************************** * * - * Function: item_preproc_ltrim * - * * * Purpose: execute left trim preprocessing operation * * * * Parameters: value - [IN/OUT] the value to process * @@ -591,8 +561,6 @@ static int item_preproc_ltrim(zbx_variant_t *value, const char *params, char **e /****************************************************************************** * * - * Function: item_preproc_lrtrim * - * * * Purpose: execute left and right trim preprocessing operation * * * * Parameters: value - [IN/OUT] the value to process * @@ -622,8 +590,6 @@ static int item_preproc_lrtrim(zbx_variant_t *value, const char *params, char ** /****************************************************************************** * * - * Function: item_preproc_2dec * - * * * Purpose: execute decimal value conversion operation * * * * Parameters: value - [IN/OUT] the value to convert * @@ -687,8 +653,6 @@ static int item_preproc_2dec(zbx_variant_t *value, unsigned char op_type, char * /****************************************************************************** * * - * Function: item_preproc_bool2dec * - * * * Purpose: execute boolean to decimal value conversion operation * * * * Parameters: value - [IN/OUT] the value to convert * @@ -715,8 +679,6 @@ static int item_preproc_bool2dec(zbx_variant_t *value, char **errmsg) /****************************************************************************** * * - * Function: item_preproc_oct2dec * - * * * Purpose: execute octal to decimal value conversion operation * * * * Parameters: value - [IN/OUT] the value to convert * @@ -743,8 +705,6 @@ static int item_preproc_oct2dec(zbx_variant_t *value, char **errmsg) /****************************************************************************** * * - * Function: item_preproc_hex2dec * - * * * Purpose: execute hexadecimal to decimal value conversion operation * * * * Parameters: value - [IN/OUT] the value to convert * @@ -771,8 +731,6 @@ static int item_preproc_hex2dec(zbx_variant_t *value, char **errmsg) /****************************************************************************** * * - * Function: item_preproc_regsub_op * - * * * Purpose: execute regular expression substitution operation * * * * Parameters: value - [IN/OUT] the value to process * @@ -827,8 +785,6 @@ static int item_preproc_regsub_op(zbx_variant_t *value, const char *params, char /****************************************************************************** * * - * Function: item_preproc_regsub * - * * * Purpose: execute regular expression substitution operation * * * * Parameters: value - [IN/OUT] the value to process * @@ -862,8 +818,6 @@ static int item_preproc_regsub(zbx_variant_t *value, const char *params, char ** /****************************************************************************** * * - * Function: item_preproc_jsonpath_op * - * * * Purpose: execute jsonpath query * * * * Parameters: value - [IN/OUT] the value to process * @@ -902,8 +856,6 @@ static int item_preproc_jsonpath_op(zbx_variant_t *value, const char *params, ch /****************************************************************************** * * - * Function: item_preproc_jsonpath * - * * * Purpose: execute jsonpath query * * * * Parameters: value - [IN/OUT] the value to process * @@ -930,8 +882,6 @@ static int item_preproc_jsonpath(zbx_variant_t *value, const char *params, char /****************************************************************************** * * - * Function: item_preproc_xpath * - * * * Purpose: execute xpath query * * * * Parameters: value - [IN/OUT] the value to process * @@ -960,8 +910,6 @@ static int item_preproc_xpath(zbx_variant_t *value, const char *params, char **e /****************************************************************************** * * - * Function: item_preproc_validate_range * - * * * Purpose: validates value to be within the specified range * * Parameters: value_type - [IN] the item type * * value - [IN/OUT] the value to process * @@ -1038,8 +986,6 @@ out: /****************************************************************************** * * - * Function: item_preproc_validate_regex * - * * * Purpose: validates value to match regular expression * * Parameters: value_type - [IN] the item type * * value - [IN/OUT] the value to process * @@ -1095,8 +1041,6 @@ out: /****************************************************************************** * * - * Function: item_preproc_validate_not_regex * - * * * Purpose: validates value to not match regular expression * * Parameters: value_type - [IN] the item type * * value - [IN/OUT] the value to process * @@ -1154,8 +1098,6 @@ out: /****************************************************************************** * * - * Function: item_preproc_get_error_from_json * - * * * Purpose: checks for presence of error field in json data * * * * Parameters: value - [IN/OUT] the value to process * @@ -1210,8 +1152,6 @@ out: /****************************************************************************** * * - * Function: item_preproc_get_error_from_xml * - * * * Purpose: checks for presence of error field in XML data * * * * Parameters: value - [IN/OUT] the value to process * @@ -1316,8 +1256,6 @@ out: /****************************************************************************** * * - * Function: item_preproc_get_error_from_regex * - * * * Purpose: checks for presence of error pattern matching regular expression * * * * Parameters: value - [IN/OUT] the value to process * @@ -1380,8 +1318,6 @@ out: /****************************************************************************** * * - * Function: item_preproc_throttle_value * - * * * Purpose: throttles value by suppressing identical values * * * * Parameters: value - [IN/OUT] the value to process * @@ -1414,8 +1350,6 @@ static int item_preproc_throttle_value(zbx_variant_t *value, const zbx_timespec_ /****************************************************************************** * * - * Function: item_preproc_throttle_timed_value * - * * * Purpose: throttles value by suppressing identical values * * * * Parameters: value - [IN/OUT] the value to process * @@ -1459,8 +1393,6 @@ static int item_preproc_throttle_timed_value(zbx_variant_t *value, const zbx_tim /****************************************************************************** * * - * Function: item_preproc_script * - * * * Purpose: executes script passed with params * * * * Parameters: value - [IN/OUT] the value to process * @@ -1523,8 +1455,6 @@ fail: /****************************************************************************** * * - * Function: item_preproc_prometheus_pattern * - * * * Purpose: parse Prometheus format metrics * * * * Parameters: value - [IN/OUT] the value to process * @@ -1604,8 +1534,6 @@ out: /****************************************************************************** * * - * Function: item_preproc_prometheus_to_json * - * * * Purpose: convert Prometheus format metrics to JSON format * * * * Parameters: value - [IN/OUT] the value to process * @@ -1638,8 +1566,6 @@ static int item_preproc_prometheus_to_json(zbx_variant_t *value, const char *par /****************************************************************************** * * - * Function: item_preproc_csv_to_json_add_field * - * * * Purpose: convert CSV format metrics to JSON format * * * * Parameters: json - [IN/OUT] json object * @@ -1714,8 +1640,6 @@ static int item_preproc_csv_to_json_add_field(struct zbx_json *json, char ***nam /****************************************************************************** * * - * Function: item_preproc_csv_to_json * - * * * Purpose: convert CSV format metrics to JSON format * * * * Parameters: value - [IN/OUT] the value to process * @@ -1972,8 +1896,6 @@ out: /****************************************************************************** * * - * Function: item_preproc_xml_to_json * - * * * Purpose: convert XML format value to JSON format * * * * Parameters: value - [IN/OUT] the value to process * @@ -2001,8 +1923,6 @@ static int item_preproc_xml_to_json(zbx_variant_t *value, char **errmsg) /****************************************************************************** * * - * Function: item_preproc_str_replace * - * * * Purpose: replace substrings in string * * * * Parameters: value - [IN/OUT] the value to process * @@ -2053,8 +1973,6 @@ static int item_preproc_str_replace(zbx_variant_t *value, const char *params, ch /****************************************************************************** * * - * Function: zbx_item_preproc * - * * * Purpose: execute preprocessing operation * * * * Parameters: cache - [IN/OUT] the preprocessing cache * @@ -2174,8 +2092,6 @@ int zbx_item_preproc(zbx_preproc_cache_t *cache, unsigned char value_type, zbx_v /****************************************************************************** * * - * Function: zbx_item_preproc_handle_error * - * * * Purpose: apply 'on fail' preprocessing error handler * * * * Parameters: value - [IN/OUT] the value * @@ -2212,8 +2128,6 @@ int zbx_item_preproc_handle_error(zbx_variant_t *value, const zbx_preproc_op_t * /****************************************************************************** * * - * Function: zbx_item_preproc_test * - * * * Purpose: test preprocessing steps * * * * Parameters: value_type - [IN] the item value type * diff --git a/src/zabbix_server/preprocessor/preproc_cache.c b/src/zabbix_server/preprocessor/preproc_cache.c index 347d5198b6f..674da06cc56 100644 --- a/src/zabbix_server/preprocessor/preproc_cache.c +++ b/src/zabbix_server/preprocessor/preproc_cache.c @@ -26,8 +26,6 @@ ZBX_VECTOR_IMPL(ppcache, zbx_preproc_cache_ref_t); /****************************************************************************** * * - * Function: zbx_preproc_cache_get * - * * * Purpose: get cache by preprocessing step type * * * * Parameters: cache - [IN] the preprocessing cache * @@ -52,8 +50,6 @@ void *zbx_preproc_cache_get(zbx_preproc_cache_t *cache, unsigned char type) /****************************************************************************** * * - * Function: zbx_preproc_cache_put * - * * * Purpose: put preprocessing step cache into preprocessing cache * * * * Parameters: cache - [IN] the preprocessing cache * @@ -76,8 +72,6 @@ void zbx_preproc_cache_put(zbx_preproc_cache_t *cache, unsigned char type, void /****************************************************************************** * * - * Function: zbx_preproc_cache_init * - * * * Purpose: initialize preprocessing cache * * * ******************************************************************************/ @@ -88,8 +82,6 @@ void zbx_preproc_cache_init(zbx_preproc_cache_t *cache) /****************************************************************************** * * - * Function: zbx_preproc_cache_clear * - * * * Purpose: free resources allocated by preprocessing cache * * * ******************************************************************************/ diff --git a/src/zabbix_server/preprocessor/preproc_manager.c b/src/zabbix_server/preprocessor/preproc_manager.c index 250336d23e8..849a6a1fd4b 100644 --- a/src/zabbix_server/preprocessor/preproc_manager.c +++ b/src/zabbix_server/preprocessor/preproc_manager.c @@ -184,8 +184,6 @@ static void request_free_steps(zbx_preprocessing_request_t *request) /****************************************************************************** * * - * Function: preprocessor_sync_configuration * - * * * Purpose: synchronize preprocessing manager with configuration cache data * * * * Parameters: manager - [IN] the manager to be synchronized * @@ -258,8 +256,6 @@ static void preprocessing_ar_to_variant(AGENT_RESULT *ar, zbx_variant_t *value) /****************************************************************************** * * - * Function: preprocessor_create_task * - * * * Purpose: create preprocessing task for request * * * * Parameters: manager - [IN] preprocessing manager * @@ -293,8 +289,6 @@ static zbx_uint32_t preprocessor_create_task(zbx_preprocessing_manager_t *manage /****************************************************************************** * * - * Function: preprocessor_set_request_state_done * - * * * Purpose: set request state to done and handle linked items * * * * Parameters: manager - [IN] preprocessing manager * @@ -338,8 +332,6 @@ static void preprocessor_set_request_state_done(zbx_preprocessing_manager_t *man /****************************************************************************** * * - * Function: preprocessor_create_dep_message * - * * * Purpose: create message(s) for dependent item bulk preprocessing * * * * Parameters: manager - [IN] preprocessing manager * @@ -406,8 +398,6 @@ static int preprocessor_create_dep_message(zbx_preprocessing_manager_t *manager, /****************************************************************************** * * - * Function: preprocessor_dep_request_next_message * - * * * Purpose: returns next dependent item preprocessing message * * * * Parameters: request - [IN] the dependent item preprocessing request * @@ -432,8 +422,6 @@ static int preprocessor_dep_request_next_message(zbx_preprocessing_dep_request_t /****************************************************************************** * * - * Function: preprocessor_get_next_task * - * * * Purpose: gets next task to be sent to worker * * * * Parameters: manager - [IN] preprocessing manager * @@ -525,8 +513,6 @@ out: /****************************************************************************** * * - * Function: preprocessor_get_worker_by_client * - * * * Purpose: get worker data by IPC client * * * * Parameters: manager - [IN] preprocessing manager * @@ -561,8 +547,6 @@ static zbx_preprocessing_worker_t *preprocessor_get_worker_by_client(zbx_preproc /****************************************************************************** * * - * Function: preprocessor_get_free_worker * - * * * Purpose: get worker without active preprocessing task * * * * Parameters: manager - [IN] preprocessing manager * @@ -585,8 +569,6 @@ static zbx_preprocessing_worker_t *preprocessor_get_free_worker(zbx_preprocessin /****************************************************************************** * * - * Function: preprocessor_assign_tasks * - * * * Purpose: assign available queued preprocessing tasks to free workers * * * * Parameters: manager - [IN] preprocessing manager * @@ -618,8 +600,6 @@ static void preprocessor_assign_tasks(zbx_preprocessing_manager_t *manager) /****************************************************************************** * * - * Function: preproc_item_value_clear * - * * * Purpose: frees resources allocated by preprocessor item value * * * * Parameters: value - [IN] value to be freed * @@ -639,8 +619,6 @@ static void preproc_item_value_clear(zbx_preproc_item_value_t *value) /****************************************************************************** * * - * Function: preprocessor_free_request * - * * * Purpose: free preprocessing request * * * * Parameters: base - [IN] request data to be freed * @@ -674,8 +652,6 @@ static void preprocessor_free_request(zbx_preprocessing_request_base_t *base) /****************************************************************************** * * - * Function: preprocessor_free_direct_request * - * * * Purpose: free preprocessing direct request * * * * Parameters: direct_request - [IN] forward data to be freed * @@ -690,8 +666,6 @@ static void preprocessor_free_direct_request(zbx_preprocessing_direct_request_t /****************************************************************************** * * - * Function: preprocessor_flush_value * - * * * Purpose: add new value to the local history cache or send to LLD manager * * * * Parameters: value - [IN] value to be added or sent * @@ -742,8 +716,6 @@ static void preprocessor_flush_dep_results(zbx_preprocessing_manager_t *manager, /****************************************************************************** * * - * Function: preprocessing_flush_queue * - * * * Purpose: add all sequential processed values from beginning of the queue * * to the local history cache * * * @@ -819,8 +791,6 @@ static void preproc_link_nodes(zbx_preprocessing_manager_t *manager, zbx_uint64_ /****************************************************************************** * * - * Function: preprocessor_link_items * - * * * Purpose: create relation between item values within value queue * * * * Parameters: manager - [IN] preprocessing manager * @@ -858,8 +828,6 @@ static void preprocessor_link_items(zbx_preprocessing_manager_t *manager, zbx_li /****************************************************************************** * * - * Function: preprocessor_enqueue_dependent_value * - * * * Purpose: enqueue dependent items (if any) by preproc value * * * * Parameters: manager - [IN] preprocessing manager * @@ -878,8 +846,6 @@ static void preprocessor_enqueue_dependent_value(zbx_preprocessing_manager_t *ma /****************************************************************************** * * - * Function: preprocessor_enqueue * - * * * Purpose: enqueue preprocessing request * * * * Parameters: manage - [IN] preprocessing manager * @@ -1008,8 +974,6 @@ out: /****************************************************************************** * * - * Function: preprocessor_enqueue_dependent * - * * * Purpose: enqueue dependent items (if any) * * * * Parameters: manager - [IN] preprocessing manager * @@ -1072,8 +1036,6 @@ static void preprocessor_enqueue_dependent(zbx_preprocessing_manager_t *manager, /****************************************************************************** * * - * Function: preprocessor_add_request * - * * * Purpose: handle new preprocessing request * * * * Parameters: manager - [IN] preprocessing manager * @@ -1103,8 +1065,6 @@ static void preprocessor_add_request(zbx_preprocessing_manager_t *manager, zbx_i /****************************************************************************** * * - * Function: preprocessor_add_test_request * - * * * Purpose: handle new preprocessing test request * * * * Parameters: manager - [IN] preprocessing manager * @@ -1132,8 +1092,6 @@ static void preprocessor_add_test_request(zbx_preprocessing_manager_t *manager, /****************************************************************************** * * - * Function: preprocessor_set_variant_result * - * * * Purpose: get result data from variant and error message * * * * Parameters: request - [IN/OUT] preprocessing request * @@ -1248,8 +1206,6 @@ out: /****************************************************************************** * * - * Function: preprocessor_add_result * - * * * Purpose: handle preprocessing result * * * * Parameters: manager - [IN] preprocessing manager * @@ -1327,8 +1283,6 @@ static void preprocessor_add_result(zbx_preprocessing_manager_t *manager, zbx_ip /****************************************************************************** * * - * Function: preprocessor_update_history * - * * * Purpose: handle preprocessing result * * * * Parameters: manager - [IN] preprocessing manager * @@ -1403,8 +1357,6 @@ static void preprocessor_finalize_dep_results(zbx_preprocessing_manager_t *manag /****************************************************************************** * * - * Function: preprocessor_add_dep_result * - * * * Purpose: handle dependent item batch preprocessing result * * * * Parameters: manager - [IN] preprocessing manager * @@ -1435,8 +1387,6 @@ static void preprocessor_process_dep_result(zbx_preprocessing_manager_t *manager /****************************************************************************** * * - * Function: preprocessor_add_dep_result * - * * * Purpose: handle next dependent item batch preprocessing result * * * * Parameters: manager - [IN] preprocessing manager * @@ -1467,8 +1417,6 @@ static void preprocessor_process_dep_result_cont(zbx_preprocessing_manager_t *ma /****************************************************************************** * * - * Function: preprocessor_next_dep_request * - * * * Purpose: handle dependent item batch preprocessing result * * * * Parameters: manager - [IN] preprocessing manager * @@ -1500,8 +1448,6 @@ static void preprocessor_next_dep_request(zbx_preprocessing_manager_t *manager, /****************************************************************************** * * - * Function: preprocessor_flush_test_result * - * * * Purpose: handle preprocessing result * * * * Parameters: manager - [IN] preprocessing manager * @@ -1648,8 +1594,6 @@ static void preprocessor_get_items_totals(zbx_preprocessing_manager_t *manager, /****************************************************************************** * * - * Function: preprocessor_get_diag_stats * - * * * Purpose: return diagnostic statistics * * * * Parameters: manager - [IN] preprocessing manager * @@ -1675,8 +1619,6 @@ static void preprocessor_get_diag_stats(zbx_preprocessing_manager_t *manager, zb /****************************************************************************** * * - * Function: preproc_sort_item_by_values_desc * - * * * Purpose: compare item statistics by value * * * ******************************************************************************/ @@ -1748,8 +1690,6 @@ static void preprocessor_get_items_view(zbx_preprocessing_manager_t *manager, zb /****************************************************************************** * * - * Function: preprocessor_get_top_items * - * * * Purpose: return diagnostic top view * * * * Parameters: manager - [IN] preprocessing manager * @@ -1856,8 +1796,6 @@ static int preproc_item_link_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: preprocessor_init_manager * - * * * Purpose: initializes preprocessing manager * * * * Parameters: manager - [IN] the manager to initialize * @@ -1885,8 +1823,6 @@ static void preprocessor_init_manager(zbx_preprocessing_manager_t *manager) /****************************************************************************** * * - * Function: preprocessor_register_worker * - * * * Purpose: registers preprocessing worker * * * * Parameters: manager - [IN] the manager * @@ -1928,8 +1864,6 @@ static void preprocessor_register_worker(zbx_preprocessing_manager_t *manager, z /****************************************************************************** * * - * Function: preprocessor_destroy_manager * - * * * Purpose: destroy preprocessing manager * * * * Parameters: manager - [IN] the manager to destroy * diff --git a/src/zabbix_server/preprocessor/preproc_worker.c b/src/zabbix_server/preprocessor/preproc_worker.c index e5450f415b4..a015b6f9b8b 100644 --- a/src/zabbix_server/preprocessor/preproc_worker.c +++ b/src/zabbix_server/preprocessor/preproc_worker.c @@ -51,8 +51,6 @@ zbx_es_t es_engine; /****************************************************************************** * * - * Function: worker_format_value * - * * * Purpose: formats value in text format * * * * Parameters: value - [IN] the value to format * @@ -93,8 +91,6 @@ static void worker_format_value(const zbx_variant_t *value, char **value_str) /****************************************************************************** * * - * Function: worker_format_result * - * * * Purpose: formats one preprocessing step result * * * * Parameters: step - [IN] the preprocessing step number * @@ -124,8 +120,6 @@ static void worker_format_result(int step, const zbx_preproc_result_t *result, c /****************************************************************************** * * - * Function: worker_format_error * - * * * Purpose: formats preprocessing error message * * * * Parameters: value - [IN] the input value * @@ -203,8 +197,6 @@ static void worker_format_error(const zbx_variant_t *value, zbx_preproc_result_t /****************************************************************************** * * - * Function: worker_item_preproc_execute * - * * * Purpose: execute preprocessing steps * * * * Parameters: cache - [IN/OUT] the preprocessing cache * @@ -296,8 +288,6 @@ static int worker_item_preproc_execute(zbx_preproc_cache_t *cache, unsigned char /****************************************************************************** * * - * Function: worker_preprocess_value * - * * * Purpose: handle item value preprocessing task * * * * Parameters: socket - [IN] IPC socket * @@ -379,8 +369,6 @@ static void worker_preprocess_value(zbx_ipc_socket_t *socket, zbx_ipc_message_t /****************************************************************************** * * - * Function: worker_test_value * - * * * Purpose: handle item value test preprocessing task * * * * Parameters: socket - [IN] IPC socket * @@ -445,8 +433,6 @@ static void worker_test_value(zbx_ipc_socket_t *socket, zbx_ipc_message_t *messa /****************************************************************************** * * - * Function: worker_dep_request_clear * - * * ******************************************************************************/ static void worker_dep_request_clear(zbx_preproc_dep_request_t *request) { @@ -457,8 +443,6 @@ static void worker_dep_request_clear(zbx_preproc_dep_request_t *request) /****************************************************************************** * * - * Function: worker_preprocess_dep_items * - * * * Purpose: preprocess dependent items * * * * Parameters: socket - [IN] IPC socket * @@ -562,8 +546,6 @@ out: /****************************************************************************** * * - * Function: worker_process_dep_request * - * * * Purpose: handle item value preprocessing request * * * * Parameters: socket - [IN] IPC socket * @@ -582,8 +564,6 @@ static void worker_process_dep_request(zbx_ipc_socket_t *socket, zbx_ipc_message /****************************************************************************** * * - * Function: worker_process_dep_request_cont * - * * * Purpose: handle following item value preprocessing request * * * * Parameters: socket - [IN] IPC socket * diff --git a/src/zabbix_server/preprocessor/preprocessing.c b/src/zabbix_server/preprocessor/preprocessing.c index b938432272b..02d661e8bb8 100644 --- a/src/zabbix_server/preprocessor/preprocessing.c +++ b/src/zabbix_server/preprocessor/preprocessing.c @@ -106,8 +106,6 @@ static int message_pack_fields(zbx_ipc_message_t *message, const zbx_packed_fiel /****************************************************************************** * * - * Function: message_pack_data * - * * * Purpose: helper for data packing based on defined format * * * * Parameters: message - [OUT] IPC message, can be NULL for buffer size * @@ -137,8 +135,6 @@ static zbx_uint32_t message_pack_data(zbx_ipc_message_t *message, zbx_packed_fie /****************************************************************************** * * - * Function: preprocessor_pack_value * - * * * Purpose: pack item value data into a single buffer that can be used in IPC * * * * Parameters: message - [OUT] IPC message * @@ -200,8 +196,6 @@ static zbx_uint32_t preprocessor_pack_value(zbx_ipc_message_t *message, zbx_prep /****************************************************************************** * * - * Function: preprocessor_pack_variant * - * * * Purpose: packs variant value for serialization * * * * Parameters: fields - [OUT] the packed fields * @@ -243,8 +237,6 @@ static int preprocessor_pack_variant(zbx_packed_field_t *fields, const zbx_varia /****************************************************************************** * * - * Function: preprocessor_pack_history * - * * * Purpose: packs preprocessing history for serialization * * * * Parameters: fields - [OUT] the packed fields * @@ -277,8 +269,6 @@ static int preprocessor_pack_history(zbx_packed_field_t *fields, const zbx_vecto /****************************************************************************** * * - * Function: preprocessor_pack_step * - * * * Purpose: packs preprocessing step for serialization * * * * Parameters: fields - [OUT] the packed fields * @@ -303,8 +293,6 @@ static int preprocessor_pack_step(zbx_packed_field_t *fields, const zbx_preproc_ /****************************************************************************** * * - * Function: preprocessor_pack_steps * - * * * Purpose: packs preprocessing steps for serialization * * * * Parameters: fields - [OUT] the packed fields * @@ -330,8 +318,6 @@ static int preprocessor_pack_steps(zbx_packed_field_t *fields, const zbx_preproc /****************************************************************************** * * - * Function: preprocesser_unpack_variant * - * * * Purpose: unpacks serialized variant value * * * * Parameters: data - [IN] the serialized data * @@ -371,8 +357,6 @@ static int preprocesser_unpack_variant(const unsigned char *data, zbx_variant_t /****************************************************************************** * * - * Function: preprocesser_unpack_history * - * * * Purpose: unpacks serialized preprocessing history * * * * Parameters: data - [IN] the serialized data * @@ -412,8 +396,6 @@ static int preprocesser_unpack_history(const unsigned char *data, zbx_vector_ptr /****************************************************************************** * * - * Function: preprocessor_unpack_step * - * * * Purpose: unpacks serialized preprocessing step * * * * Parameters: data - [IN] the serialized data * @@ -437,8 +419,6 @@ static int preprocessor_unpack_step(const unsigned char *data, zbx_preproc_op_t /****************************************************************************** * * - * Function: preprocessor_unpack_steps * - * * * Purpose: unpacks serialized preprocessing steps * * * * Parameters: data - [IN] the serialized data * @@ -468,8 +448,6 @@ static int preprocessor_unpack_steps(const unsigned char *data, zbx_preproc_op_t /****************************************************************************** * * - * Function: zbx_preprocessor_pack_task * - * * * Purpose: pack preprocessing task data into a single buffer that can be * * used in IPC * * * @@ -528,8 +506,6 @@ zbx_uint32_t zbx_preprocessor_pack_task(unsigned char **data, zbx_uint64_t itemi /****************************************************************************** * * - * Function: preprocessor_append_packed_message * - * * * Purpose: pack fields into serialized message * * * * Parameters: fields - [IN] the fields to pack * @@ -567,8 +543,6 @@ static int preprocessor_append_packed_message(const zbx_packed_field_t *fields, /****************************************************************************** * * - * Function: zbx_preprocessor_pack_dep_request * - * * * Purpose: pack dependent item preprocessing fields into messages for * * sending to worker * * * @@ -661,8 +635,6 @@ out: /****************************************************************************** * * - * Function: zbx_preprocessor_pack_result * - * * * Purpose: pack preprocessing result data into a single buffer that can be * * used in IPC * * * @@ -704,8 +676,6 @@ zbx_uint32_t zbx_preprocessor_pack_result(unsigned char **data, zbx_variant_t *v /****************************************************************************** * * - * Function: zbx_preprocessor_free_dep_results * - * * * Purpose: free dependent item preprocessing response * * * * Parameters: results - [OUT] the preprocessing results * @@ -835,8 +805,6 @@ void zbx_preprocessor_result_append(zbx_preproc_result_buffer_t *buf, zbx_uint64 /****************************************************************************** * * - * Function: zbx_preprocessor_pack_test_result * - * * * Purpose: pack preprocessing result data into a single buffer that can be * * used in IPC * * * @@ -888,8 +856,6 @@ zbx_uint32_t zbx_preprocessor_pack_test_result(unsigned char **data, const zbx_p /****************************************************************************** * * - * Function: zbx_preprocessor_pack_diag_stats * - * * * Purpose: pack diagnostic statistics data into a single buffer that can be * * used in IPC * * Parameters: data - [OUT] memory buffer for packed data * @@ -933,8 +899,6 @@ zbx_uint32_t zbx_preprocessor_pack_diag_stats(unsigned char **data, int total, i /****************************************************************************** * * - * Function: zbx_preprocessor_pack_top_request * - * * * Purpose: pack top request data into a single buffer that can be used in IPC* * * * Parameters: data - [OUT] memory buffer for packed data * @@ -955,8 +919,6 @@ zbx_uint32_t zbx_preprocessor_pack_top_items_request(unsigned char **data, int l /****************************************************************************** * * - * Function: zbx_preprocessor_pack_top_result * - * * * Purpose: pack top result data into a single buffer that can be used in IPC * * * * Parameters: data - [OUT] memory buffer for packed data * @@ -997,8 +959,6 @@ zbx_uint32_t zbx_preprocessor_pack_top_items_result(unsigned char **data, zbx_pr /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_value * - * * * Purpose: unpack item value data from IPC data buffer * * * * Parameters: value - [OUT] unpacked item value * @@ -1069,8 +1029,6 @@ zbx_uint32_t zbx_preprocessor_unpack_value(zbx_preproc_item_value_t *value, unsi /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_task * - * * * Purpose: unpack preprocessing task data from IPC data buffer * * * * Parameters: itemid - [OUT] itemid * @@ -1112,8 +1070,6 @@ void zbx_preprocessor_unpack_task(zbx_uint64_t *itemid, unsigned char *value_typ /****************************************************************************** * * - * Function: free_steps * - * * * Purpose: free preprocessing steps * * * ******************************************************************************/ @@ -1131,8 +1087,6 @@ void zbx_preprocessor_free_steps(zbx_preproc_op_t *steps, int steps_num) /****************************************************************************** * * - * Function: zbx_preprocessor_free_deps * - * * * Purpose: free dependent item preprocessing request * * * * Parameters: deps - [OUT] the dependent items * @@ -1155,8 +1109,6 @@ void zbx_preprocessor_free_deps(zbx_preproc_dep_t *deps, int deps_num) /****************************************************************************** * * - * Function: preprocessor_unpack_dep * - * * * Purpose: unpack dependent item preprocessing request * * * * Parameters: data - [IN] serialized dependent item preprocessing data * @@ -1180,8 +1132,6 @@ static zbx_uint32_t preprocessor_unpack_dep(const unsigned char *data, zbx_prepr /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_dep_task * - * * * Purpose: unpack initial dependent item preprocessing request * * * * Parameters: ts - [OUT] the value timestamp * @@ -1214,8 +1164,6 @@ void zbx_preprocessor_unpack_dep_task(zbx_timespec_t *ts, zbx_variant_t *value, /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_dep_task_cont * - * * * Purpose: unpack following dependent item preprocessing request * * * * Parameters: ts - [OUT] the value timestamp * @@ -1242,8 +1190,6 @@ void zbx_preprocessor_unpack_dep_task_cont(zbx_preproc_dep_t *deps, int *deps_nu /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_result * - * * * Purpose: unpack preprocessing task data from IPC data buffer * * * * Parameters: value - [OUT] result value * @@ -1266,8 +1212,6 @@ void zbx_preprocessor_unpack_result(zbx_variant_t *value, zbx_vector_ptr_t *hist /****************************************************************************** * * - * Function: agent_result_set_value * - * * * Purpose: convert variant value to AGENT_RESULT * * * * Parameters: value - [IN] the value to convert * @@ -1343,8 +1287,6 @@ static void agent_result_set_value(zbx_variant_t *value, zbx_item_value_type_t v /****************************************************************************** * * - * Function: preprocessor_unpack_dep_result * - * * * Purpose: unpack dependent item preprocessing result * * * * Parameters: data - [IN] IPC data buffer * @@ -1375,8 +1317,6 @@ static zbx_uint32_t preprocessor_unpack_dep_result(const unsigned char *data, zb /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_dep_result * - * * * Purpose: unpack preprocessing results * * * * Parameters: total_num - [OUT] the total number of results * @@ -1403,8 +1343,6 @@ void zbx_preprocessor_unpack_dep_result(int *total_num, int *results_num, zbx_pr /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_dep_result_cont * - * * * Purpose: unpack following preprocessing results * * * * Parameters: results_num - [OUT] the number of results in this batch * @@ -1429,8 +1367,6 @@ void zbx_preprocessor_unpack_dep_result_cont(int *results_num, zbx_preproc_dep_r } /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_test_result * - * * * Purpose: unpack preprocessing test data from IPC data buffer * * * * Parameters: results - [OUT] the preprocessing step results * @@ -1467,8 +1403,6 @@ void zbx_preprocessor_unpack_test_result(zbx_vector_ptr_t *results, zbx_vector_p /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_diag_stats * - * * * Purpose: unpack preprocessing test data from IPC data buffer * * * * Parameters: total - [OUT] the number of values * @@ -1499,8 +1433,6 @@ void zbx_preprocessor_unpack_diag_stats(int *total, int *queued, int *processing /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_top_request * - * * * Purpose: unpack preprocessing test data from IPC data buffer * * * * Parameters: data - [OUT] memory buffer for packed data * @@ -1514,8 +1446,6 @@ void zbx_preprocessor_unpack_top_request(int *limit, const unsigned char *data) /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_top_request * - * * * Purpose: unpack preprocessing test data from IPC data buffer * * * * Parameters: items - [OUT] the item diag data * @@ -1547,8 +1477,6 @@ void zbx_preprocessor_unpack_top_result(zbx_vector_ptr_t *items, const unsigned /****************************************************************************** * * - * Function: preprocessor_send * - * * * Purpose: sends command to preprocessor manager * * * * Parameters: code - [IN] message code * @@ -1587,8 +1515,6 @@ static void preprocessor_send(zbx_uint32_t code, unsigned char *data, zbx_uint32 /****************************************************************************** * * - * Function: zbx_preprocess_item_value * - * * * Purpose: perform item value preprocessing and dependent item processing * * * * Parameters: itemid - [IN] the itemid * @@ -1652,8 +1578,6 @@ void zbx_preprocess_item_value(zbx_uint64_t itemid, zbx_uint64_t hostid, unsigne /****************************************************************************** * * - * Function: zbx_preprocessor_flush * - * * * Purpose: send flush command to preprocessing manager * * * ******************************************************************************/ @@ -1671,8 +1595,6 @@ void zbx_preprocessor_flush(void) /****************************************************************************** * * - * Function: zbx_preprocessor_get_queue_size * - * * * Purpose: get queue size (enqueued value count) of preprocessing manager * * * * Return value: enqueued item count * @@ -1693,8 +1615,6 @@ zbx_uint64_t zbx_preprocessor_get_queue_size(void) /****************************************************************************** * * - * Function: zbx_preproc_op_free * - * * * Purpose: frees preprocessing step * * * ******************************************************************************/ @@ -1707,8 +1627,6 @@ void zbx_preproc_op_free(zbx_preproc_op_t *op) /****************************************************************************** * * - * Function: zbx_preproc_result_free * - * * * Purpose: frees preprocessing step test result * * * ******************************************************************************/ @@ -1721,8 +1639,6 @@ void zbx_preproc_result_free(zbx_preproc_result_t *result) /****************************************************************************** * * - * Function: preprocessor_pack_test_request * - * * * Purpose: packs preprocessing step request for serialization * * * * Return value: The size of packed data * @@ -1767,8 +1683,6 @@ static zbx_uint32_t preprocessor_pack_test_request(unsigned char **data, unsigne /****************************************************************************** * * - * Function: zbx_preprocessor_unpack_test_request * - * * * Purpose: unpack preprocessing test request data from IPC data buffer * * * * Parameters: value_type - [OUT] item value type * @@ -1798,8 +1712,6 @@ void zbx_preprocessor_unpack_test_request(unsigned char *value_type, char **valu /****************************************************************************** * * - * Function: zbx_preprocessor_test * - * * * Purpose: tests item preprocessing with the specified input value and steps * * * ******************************************************************************/ @@ -1832,8 +1744,6 @@ out: /****************************************************************************** * * - * Function: zbx_preprocessor_get_diag_stats * - * * * Purpose: get preprocessing manager diagnostic statistics * * * ******************************************************************************/ @@ -1856,8 +1766,6 @@ int zbx_preprocessor_get_diag_stats(int *total, int *queued, int *processing, in /****************************************************************************** * * - * Function: zbx_preprocessor_get_top_items * - * * * Purpose: get the top N items by the number of queued values * * * ******************************************************************************/ @@ -1885,8 +1793,6 @@ out: /****************************************************************************** * * - * Function: zbx_preprocessor_get_top_items * - * * * Purpose: get the top N items by the number of queued values * * * ******************************************************************************/ @@ -1897,8 +1803,6 @@ int zbx_preprocessor_get_top_items(int limit, zbx_vector_ptr_t *items, char **er /****************************************************************************** * * - * Function: zbx_preprocessor_get_top_oldest_preproc_items * - * * * Purpose: get the oldest items with preprocessing still in queue * * * ******************************************************************************/ diff --git a/src/zabbix_server/proxypoller/proxypoller.c b/src/zabbix_server/proxypoller/proxypoller.c index acfd7efbf99..211726b0d80 100644 --- a/src/zabbix_server/proxypoller/proxypoller.c +++ b/src/zabbix_server/proxypoller/proxypoller.c @@ -135,8 +135,6 @@ static void disconnect_proxy(zbx_socket_t *sock) /****************************************************************************** * * - * Function: get_data_from_proxy * - * * * Purpose: get historical data from proxy * * * * Parameters: proxy - [IN/OUT] proxy data * @@ -242,8 +240,6 @@ out: /****************************************************************************** * * - * Function: proxy_send_configuration * - * * * Purpose: sends configuration data to proxy * * * * Parameters: proxy - [IN/OUT] proxy data * @@ -347,8 +343,6 @@ out: /****************************************************************************** * * - * Function: proxy_process_proxy_data * - * * * Purpose: processes proxy data request * * * * Parameters: proxy - [IN/OUT] proxy data * @@ -413,8 +407,6 @@ out: /****************************************************************************** * * - * Function: proxy_get_data * - * * * Purpose: gets data from proxy ('proxy data' request) * * * * Parameters: proxy - [IN] proxy data * @@ -461,8 +453,6 @@ out: /****************************************************************************** * * - * Function: proxy_get_tasks * - * * * Purpose: gets data from proxy ('proxy data' request) * * * * Parameters: proxy - [IN/OUT] the proxy data * @@ -501,8 +491,6 @@ out: /****************************************************************************** * * - * Function: process_proxy * - * * * Purpose: retrieve values of metrics from monitored hosts * * * * Parameters: * diff --git a/src/zabbix_server/reporter/report_manager.c b/src/zabbix_server/reporter/report_manager.c index 2e0fe6f6a78..eaa25bbe146 100644 --- a/src/zabbix_server/reporter/report_manager.c +++ b/src/zabbix_server/reporter/report_manager.c @@ -176,8 +176,6 @@ zbx_rm_writer_t; /****************************************************************************** * * - * Function: rm_get_writer * - * * * Purpose: return writer with the specified client * * * ******************************************************************************/ @@ -198,8 +196,6 @@ static zbx_rm_writer_t *rm_get_writer(zbx_rm_t *manager, const zbx_ipc_client_t /****************************************************************************** * * - * Function: rm_writer_free * - * * ******************************************************************************/ static void rm_writer_free(zbx_rm_writer_t *writer) { @@ -209,8 +205,6 @@ static void rm_writer_free(zbx_rm_writer_t *writer) /****************************************************************************** * * - * Function: rm_report_compare_nextcheck * - * * ******************************************************************************/ static int rm_report_compare_nextcheck(const void *d1, const void *d2) { @@ -222,8 +216,6 @@ static int rm_report_compare_nextcheck(const void *d1, const void *d2) /****************************************************************************** * * - * Function: rm_report_clean * - * * ******************************************************************************/ static void rm_report_clean(zbx_rm_report_t *report) { @@ -240,8 +232,6 @@ static void rm_report_clean(zbx_rm_report_t *report) /****************************************************************************** * * - * Function: rm_job_free * - * * ******************************************************************************/ static void rm_job_free(zbx_rm_job_t *job) { @@ -260,8 +250,6 @@ static void rm_job_free(zbx_rm_job_t *job) /****************************************************************************** * * - * Function: rm_batch_clean * - * * ******************************************************************************/ static void rm_batch_clean(zbx_rm_batch_t *batch) { @@ -272,8 +260,6 @@ static void rm_batch_clean(zbx_rm_batch_t *batch) /****************************************************************************** * * - * Function: rm_init * - * * * Purpose: initializes report manager * * * * Parameters: manager - [IN] the manager to initialize * @@ -319,8 +305,6 @@ out: /****************************************************************************** * * - * Function: rm_destroy * - * * * Purpose: destroys report manager * * * * Parameters: manager - [IN] the manager to destroy * @@ -361,8 +345,6 @@ static void rm_destroy(zbx_rm_t *manager) /****************************************************************************** * * - * Function: rm_register_writer * - * * * Purpose: registers report writer * * * * Parameters: manager - [IN] the manager * @@ -403,8 +385,6 @@ static void rm_register_writer(zbx_rm_t *manager, zbx_ipc_client_t *client, zbx_ /****************************************************************************** * * - * Function: rm_time_to_urlfield * - * * * Purpose: convert timestamp to range format used in URL query fields * * * * Parameters: tm - [IN] the timestamp * @@ -424,8 +404,6 @@ static char *rm_time_to_urlfield(const struct tm *tm) /****************************************************************************** * * - * Function: report_create_cookie * - * * * Purpose: create zbx_session cookie for frontend authentication * * * * Parameters: manager - [IN] the manager * @@ -463,8 +441,6 @@ static char *report_create_cookie(zbx_rm_t *manager, const char *sessionid) /****************************************************************************** * * - * Function: rm_get_session * - * * * Purpose: get specified user session, creating one if necessary * * * * Parameters: manager - [IN] the manager * @@ -524,8 +500,6 @@ static zbx_rm_session_t *rm_get_session(zbx_rm_t *manager, zbx_uint64_t userid) /****************************************************************************** * * - * Function: rm_db_flush_sessions * - * * * Purpose: flushes session lastaccess changes to database * * * * Parameters: manager - [IN] the manager * @@ -568,8 +542,6 @@ static void rm_db_flush_sessions(zbx_rm_t *manager) /****************************************************************************** * * - * Function: rm_db_flush_reports * - * * * Purpose: flushes report state, lastaccess and error fields * * * * Parameters: manager - [IN] the manager * @@ -659,8 +631,6 @@ out: /****************************************************************************** * * - * Function: rm_get_report_range * - * * * Purpose: calculate report range from report time and period * * * * Parameters: report_time - [IN] the report writing time * @@ -692,8 +662,6 @@ static int rm_get_report_range(int report_time, unsigned char period, struct tm /****************************************************************************** * * - * Function: rm_get_report_name * - * * * Purpose: make report attachment name based on report name and timestamp * * * * Parameters: name - [IN] the report name * @@ -739,8 +707,6 @@ static char *rm_get_report_name(const char *name, int report_time) /****************************************************************************** * * - * Function: rm_create_job * - * * * Purpose: create new job to be processed by report writers * * * * Parameters: manager - [IN] the manager * @@ -814,8 +780,6 @@ static zbx_rm_job_t *rm_create_job(zbx_rm_t *manager, const char *report_name, z /****************************************************************************** * * - * Function: rm_update_report * - * * * Purpose: update report state, lastsent, error in cache * * * * Parameters: manager - [IN] the report manager * @@ -865,8 +829,6 @@ static void rm_update_report(zbx_rm_t *manager, zbx_rm_report_t *report, int sta /****************************************************************************** * * - * Function: rm_report_calc_nextcheck * - * * * Purpose: calculate time when report must be generated * * * * Parameters: report - [IN] the report * @@ -902,8 +864,6 @@ static int rm_report_calc_nextcheck(const zbx_rm_report_t *report, int now, char /****************************************************************************** * * - * Function: rm_report_update_params * - * * * Purpose: update report parameters * * * * Parameters: report - [IN] the report * @@ -961,8 +921,6 @@ static void rm_report_update_params(zbx_rm_report_t *report, zbx_vector_ptr_pair /****************************************************************************** * * - * Function: rm_report_update_users * - * * * Purpose: update report recipient users * * * * Parameters: report - [IN] the report * @@ -983,8 +941,6 @@ static void rm_report_update_users(zbx_rm_report_t *report, const zbx_vector_rec /****************************************************************************** * * - * Function: rm_report_update_usergroups * - * * * Purpose: update report recipient user groups * * * * Parameters: report - [IN] the report * @@ -999,8 +955,6 @@ static void rm_report_update_usergroups(zbx_rm_report_t *report, const zbx_vecto /****************************************************************************** * * - * Function: rm_update_cache_settings * - * * * Purpose: update general settings cache * * * * Parameters: manager - [IN] the manager * @@ -1032,8 +986,6 @@ static void rm_update_cache_settings(zbx_rm_t *manager) /****************************************************************************** * * - * Function: rm_is_report_active * - * * * Purpose: check if the report is active based on the specified time * * * * Parameters: report - [IN] the report * @@ -1056,8 +1008,6 @@ static int rm_is_report_active(const zbx_rm_report_t *report, int now) /****************************************************************************** * * - * Function: rm_dequeue_report * - * * * Purpose: remove report from queue if it was queued * * * * Parameters: manager - [IN] the manager * @@ -1075,8 +1025,6 @@ static void rm_dequeue_report(zbx_rm_t *manager, zbx_rm_report_t *report) /****************************************************************************** * * - * Function: rm_update_cache_reports * - * * * Purpose: update reports cache * * * * Parameters: manager - [IN] the manager * @@ -1234,8 +1182,6 @@ static void rm_update_cache_reports(zbx_rm_t *manager, int now) /****************************************************************************** * * - * Function: rm_update_cache_report_param * - * * * Purpose: update cached report parameters * * * * Parameters: manager - [IN] the manager * @@ -1297,8 +1243,6 @@ static void rm_update_cache_reports_params(zbx_rm_t *manager) /****************************************************************************** * * - * Function: rm_update_cache_reports_users * - * * * Purpose: update cached report recipient users * * * * Parameters: manager - [IN] the manager * @@ -1371,8 +1315,6 @@ static void rm_update_cache_reports_users(zbx_rm_t *manager) /****************************************************************************** * * - * Function: rm_update_cache_reports_usergroups * - * * * Purpose: update cached report recipient user groups * * * * Parameters: manager - [IN] the manager * @@ -1434,8 +1376,6 @@ static void rm_update_cache_reports_usergroups(zbx_rm_t *manager) /****************************************************************************** * * - * Function: rm_dump_cache * - * * * Purpose: dump cached reports into log * * * * Parameters: manager - [IN] the manager * @@ -1523,8 +1463,6 @@ static void rm_dump_cache(zbx_rm_t *manager) /****************************************************************************** * * - * Function: rm_update_cache * - * * * Purpose: update configuration and report cache * * * * Parameters: manager - [IN] the manager * @@ -1566,8 +1504,6 @@ static void zbx_report_dst_free(zbx_report_dst_t *dst) /****************************************************************************** * * - * Function: rm_get_report_dimensions * - * * * Purpose: calculate report dimensions based on dashboard contents * * * * Parameters: dashboardid - [IN] the dashboard id * @@ -1611,8 +1547,6 @@ static void rm_get_report_dimensions(zbx_uint64_t dashboardid, int *width, int * /****************************************************************************** * * - * Function: rm_writer_process_job * - * * * Purpose: process job by sending it to writer * * * * Parameters: writer - [IN] the writer * @@ -1778,8 +1712,6 @@ out: /****************************************************************************** * * - * Function: rm_report_create_jobs * - * * * Purpose: create jobs to process the report * * * * Parameters: manager - [IN] the manager * @@ -1832,8 +1764,6 @@ static int rm_jobs_add_user(zbx_rm_t *manager, zbx_rm_report_t *report, zbx_uint /****************************************************************************** * * - * Function: rm_report_create_usergroup_jobs * - * * * Purpose: create user group based jobs * * * * Parameters: manager - [IN] the manager * @@ -1910,8 +1840,6 @@ out: /****************************************************************************** * * - * Function: rm_report_create_jobs * - * * * Purpose: create jobs to process the report * * * * Parameters: manager - [IN] the manager * @@ -2025,8 +1953,6 @@ out: /****************************************************************************** * * - * Function: rm_schedule_jobs * - * * * Purpose: process queue * * * * Parameters: manager - [IN] the manager * @@ -2089,8 +2015,6 @@ static int rm_schedule_jobs(zbx_rm_t *manager, int now) /****************************************************************************** * * - * Function: rm_finish_job * - * * * Purpose: finish job * * * * Parameters: manager - [IN] the manager * @@ -2180,8 +2104,6 @@ static void rm_finish_job(zbx_rm_t *manager, zbx_rm_job_t *job, int status, cons /****************************************************************************** * * - * Function: rm_send_test_error_result * - * * * Purpose: send error result in response to test request * * * * Parameters: client - [IN] the connected trapper * @@ -2200,8 +2122,6 @@ static void rm_send_test_error_result(zbx_ipc_client_t *client, const char *erro /****************************************************************************** * * - * Function: rm_process_jobs * - * * * Purpose: process queue * * * * Parameters: manager - [IN] the manager * @@ -2252,8 +2172,6 @@ static int rm_process_jobs(zbx_rm_t *manager) /****************************************************************************** * * - * Function: rm_test_report * - * * * Purpose: test report * * * * Parameters: manager - [IN] the manager * @@ -2300,8 +2218,6 @@ static int rm_test_report(zbx_rm_t *manager, zbx_ipc_client_t *client, zbx_ipc_m /****************************************************************************** * * - * Function: rm_process_result * - * * * Purpose: process report result message * * * * Parameters: manager - [IN] the manager * diff --git a/src/zabbix_server/reporter/report_writer.c b/src/zabbix_server/reporter/report_writer.c index ea0fee3bb9b..f1c170b5910 100644 --- a/src/zabbix_server/reporter/report_writer.c +++ b/src/zabbix_server/reporter/report_writer.c @@ -81,8 +81,6 @@ static char *rw_curl_error(CURLcode err) /****************************************************************************** * * - * Function: rw_get_report * - * * * Purpose: get report from web service * * * * Parameters: url - [IN] the report url * @@ -243,8 +241,6 @@ out: /****************************************************************************** * * - * Function: rw_begin_report * - * * * Purpose: begin report dispatch * * * * Parameters: msg - [IN] the begin report request message * @@ -306,8 +302,6 @@ static int rw_begin_report(zbx_ipc_message_t *msg, zbx_alerter_dispatch_t *dispa /****************************************************************************** * * - * Function: rw_send_report * - * * * Purpose: send report to the recipients using specified media type * * * * Parameters: msg - [IN] the send report request message * @@ -348,8 +342,6 @@ static int rw_send_report(zbx_ipc_message_t *msg, zbx_alerter_dispatch_t *dispat /****************************************************************************** * * - * Function: rw_end_report * - * * * Purpose: finish report dispatch * * * * Parameters: dispatch - [IN] the alerter dispatch * @@ -374,8 +366,6 @@ static int rw_end_report(zbx_alerter_dispatch_t *dispatch, char **error) /****************************************************************************** * * - * Function: rw_send_result * - * * * Purpose: send report result back to manager * * * * Parameters: socket - [IN] the report manager IPC socket * @@ -399,8 +389,6 @@ static void rw_send_result(zbx_ipc_socket_t *socket, zbx_alerter_dispatch_t *dis /****************************************************************************** * * - * Function: report_writer_thread * - * * ******************************************************************************/ ZBX_THREAD_ENTRY(report_writer_thread, args) { diff --git a/src/zabbix_server/scripts/scripts.c b/src/zabbix_server/scripts/scripts.c index 04073e839cb..471a11afa27 100644 --- a/src/zabbix_server/scripts/scripts.c +++ b/src/zabbix_server/scripts/scripts.c @@ -284,8 +284,6 @@ void zbx_script_clean(zbx_script_t *script) /****************************************************************************** * * - * Function: zbx_webhook_params_pack_json * - * * * Purpose: pack webhook script parameters into JSON * * * * Parameters: params - [IN] vector of pairs of pointers to parameter * @@ -314,8 +312,6 @@ void zbx_webhook_params_pack_json(const zbx_vector_ptr_pair_t *params, char **pa /*********************************************************************************** * * - * Function: zbx_script_prepare * - * * * Purpose: prepares user script * * * * Parameters: script - [IN] the script to prepare * @@ -380,8 +376,6 @@ out: /****************************************************************************** * * - * Function: DBfetch_webhook_params * - * * * Purpose: fetch webhook parameters * * * * Parameters: scriptid - [IN] the id of script to be executed * @@ -427,8 +421,6 @@ out: /****************************************************************************** * * - * Function: zbx_script_execute * - * * * Purpose: executing user scripts or remote commands * * * * Parameters: script - [IN] the script to be executed * @@ -516,8 +508,6 @@ int zbx_script_execute(const zbx_script_t *script, const DC_HOST *host, const ch /****************************************************************************** * * - * Function: zbx_script_create_task * - * * * Purpose: creates remote command task from a script * * * * Return value: the identifier of the created task or 0 in the case of * diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index 149cee9e7ae..43afdf8e036 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -538,8 +538,6 @@ int get_process_info_by_thread(int local_server_num, unsigned char *local_proces /****************************************************************************** * * - * Function: zbx_set_defaults * - * * * Purpose: set configuration defaults * * * * Author: Vladimir Levijev * @@ -611,8 +609,6 @@ static void zbx_set_defaults(void) /****************************************************************************** * * - * Function: zbx_validate_config * - * * * Purpose: validate configuration parameters * * * * Author: Vladimir Levijev * @@ -740,8 +736,6 @@ static void zbx_validate_config(ZBX_TASK_EX *task) /****************************************************************************** * * - * Function: zbx_load_config * - * * * Purpose: parse config file and update configuration parameters * * * * Parameters: * @@ -992,8 +986,6 @@ static void zbx_load_config(ZBX_TASK_EX *task) /****************************************************************************** * * - * Function: zbx_free_config * - * * * Purpose: free configuration memory * * * ******************************************************************************/ @@ -1004,8 +996,6 @@ static void zbx_free_config(void) /****************************************************************************** * * - * Function: main * - * * * Purpose: executes server processes * * * * Author: Eugene Grigorjev * @@ -1196,8 +1186,6 @@ static void zbx_check_db(void) /****************************************************************************** * * - * Function: server_startup * - * * * Purpose: initialize shared resources and start processes * * * ******************************************************************************/ @@ -1462,8 +1450,6 @@ static int server_restart_logger(char **error) /****************************************************************************** * * - * Function: server_teardown * - * * * Purpose: terminate processes and destroy shared resources * * * ******************************************************************************/ diff --git a/src/zabbix_server/service/service_actions.c b/src/zabbix_server/service/service_actions.c index c96d5b8db7f..afdb999d06f 100644 --- a/src/zabbix_server/service/service_actions.c +++ b/src/zabbix_server/service/service_actions.c @@ -23,8 +23,6 @@ /****************************************************************************** * * - * Function: condition_match_service * - * * * Purpose: match service update by service id * * * ******************************************************************************/ @@ -41,8 +39,6 @@ static int condition_match_service(const zbx_service_action_condition_t *conditi /****************************************************************************** * * - * Function: condition_match_service_name * - * * * Purpose: match service update by service name * * * ******************************************************************************/ @@ -54,8 +50,6 @@ static int condition_match_service_name(const zbx_service_action_condition_t *co /****************************************************************************** * * - * Function: match_tags * - * * * Purpose: match tag/tag+value using the specified operator * * * * Parameters: tags - [IN] the tags to match * @@ -109,8 +103,6 @@ static int match_tags(const zbx_vector_ptr_t *tags, const char *name, const char /****************************************************************************** * * - * Function: condition_match_service_tag * - * * * Purpose: match service update by service tag name * * * ******************************************************************************/ @@ -122,8 +114,6 @@ static int condition_match_service_tag(const zbx_service_action_condition_t *con /****************************************************************************** * * - * Function: condition_match_service_tag_value * - * * * Purpose: match service update by service tag and its value * * * ******************************************************************************/ @@ -135,8 +125,6 @@ static int condition_match_service_tag_value(const zbx_service_action_condition_ /****************************************************************************** * * - * Function: service_update_match_condition * - * * * Purpose: match service update by the specified condition * * * ******************************************************************************/ @@ -169,8 +157,6 @@ static const char *service_update_match_condition(const zbx_service_update_t *up /****************************************************************************** * * - * Function: service_update_match_action * - * * * Purpose: match service update against the specified action * * * ******************************************************************************/ @@ -237,8 +223,6 @@ static int service_update_match_action(const zbx_service_update_t *update, const /****************************************************************************** * * - * Function: service_update_process_actions * - * * * Purpose: match service update against service actions * * * * Parameters: update - [IN] the service update generated when service * diff --git a/src/zabbix_server/service/service_manager.c b/src/zabbix_server/service/service_manager.c index 486cccfcde3..9d3c80a988b 100644 --- a/src/zabbix_server/service/service_manager.c +++ b/src/zabbix_server/service/service_manager.c @@ -1215,8 +1215,6 @@ static void service_problems_index_clean(void *data) /****************************************************************************** * * - * Function: service_get_status * - * * * Purpose: get service status when calculating parent service status * * * * Parameters: service - [IN] the service * @@ -1266,8 +1264,6 @@ int service_get_status(const zbx_service_t *service, int *status) /****************************************************************************** * * - * Function: its_updates_append * - * * * Purpose: adds an update to the queue * * * * Parameters: updates - [OUT] the update queue * @@ -1313,8 +1309,6 @@ static zbx_service_update_t *update_service(zbx_hashset_t *service_updates, zbx_ /****************************************************************************** * * - * Function: its_updates_compare * - * * * Purpose: used to sort service updates by source id * * * ******************************************************************************/ @@ -1327,8 +1321,6 @@ static int its_updates_compare(const zbx_status_update_t **update1, const zbx_st /****************************************************************************** * * - * Function: its_write_status_and_alarms * - * * * Purpose: writes service status changes, generated service alarms, service * * problem changes into database * * * @@ -1521,8 +1513,6 @@ out: /****************************************************************************** * * - * Function: service_get_main_status * - * * * Purpose: get service status by applying the main service status algorithm * * * * Parameters: service - [IN] the service * @@ -1579,8 +1569,6 @@ int service_get_main_status(const zbx_service_t *service) /****************************************************************************** * * - * Function: service_get_children_by_status * - * * * Purpose: get children with status greater or equal to the specified * * * * Parameters: service - [IN] the service * @@ -1615,8 +1603,6 @@ static void service_get_children_by_status(const zbx_service_t *service, int sta /****************************************************************************** * * - * Function: services_get_weight * - * * * Purpose: get total weight of all specified services * * * ******************************************************************************/ @@ -1636,8 +1622,6 @@ static int services_get_weight(const zbx_vector_ptr_t *services) /****************************************************************************** * * - * Function: service_get_rule_status * - * * * Purpose: get service status according to the specified rule * * * * Parameters: service - [IN] the service * @@ -1760,8 +1744,6 @@ static void service_add_cause(zbx_vector_ptr_t *causes, zbx_service_t *service, /****************************************************************************** * * - * Function: service_get_causes * - * * * Purpose: get services that caused the target service to be in the * * specified severity state * * * @@ -1926,8 +1908,6 @@ static void service_get_causes(const zbx_service_t *service, int severity, zbx_v /****************************************************************************** * * - * Function: service_get_rootcause_eventids * - * * * Purpose: get root cause eventids for the service * * * * Parameters: parent - [IN] the service * @@ -1944,8 +1924,6 @@ void service_get_rootcause_eventids(const zbx_service_t *parent, zbx_vector_uint /****************************************************************************** * * - * Function: its_itservice_update_status * - * * * Purpose: updates service and its parents statuses * * * * Parameters: service - [IN] the service to update * @@ -2027,8 +2005,6 @@ static char *service_get_event_name(zbx_service_manager_t *manager, const char * /****************************************************************************** * * - * Function: db_create_service_events * - * * * Purpose: create service events based on service updates * * * * Parameters: manager - [IN] the service manager * @@ -2154,8 +2130,6 @@ static const zbx_service_update_t *get_update_by_serviceid(const zbx_vector_ptr_ /****************************************************************************** * * - * Function: db_get_service_problems * - * * * Purpose: get open problems for the specified services * * * * Parameters: manager - [IN] the service manager * @@ -2206,8 +2180,6 @@ zbx_service_recovery_t; /****************************************************************************** * * - * Function: db_resolve_service_events * - * * * Purpose: resolve service events based on service updates * * * * Parameters: manager - [IN] the service manager * @@ -2355,8 +2327,6 @@ static int compare_uint64_pair_second(const void *d1, const void *d2) /****************************************************************************** * * - * Function: db_update_service_events * - * * * Purpose: create update escalations based on service updates * * * * Parameters: manager - [IN] the service manager * @@ -2446,8 +2416,6 @@ out: /****************************************************************************** * * - * Function: db_manage_service_events * - * * * Purpose: generate and process service events in response to service * * updates * * * @@ -2929,8 +2897,6 @@ static void process_parentlist(const zbx_ipc_message_t *message, zbx_service_man /****************************************************************************** * * - * Function: service_update_event_severity * - * * * Purpose: update cached service problem and queue service for update * * * ******************************************************************************/ @@ -2963,8 +2929,6 @@ static void service_update_event_severity(zbx_service_manager_t *service_manager /****************************************************************************** * * - * Function: db_update_service_problems * - * * * Purpose: update service_problem table with the changed event severities * * * ******************************************************************************/ @@ -3005,8 +2969,6 @@ static int db_update_service_problems(const zbx_vector_ptr_t *event_severities) /****************************************************************************** * * - * Function: process_event_severities * - * * * Purpose: update event severities, service statuses in cache and database * * according to the event severity changes during acknowledgment * * * diff --git a/src/zabbix_server/snmptrapper/snmptrapper.c b/src/zabbix_server/snmptrapper/snmptrapper.c index 2c174e70575..d8c42885d1d 100644 --- a/src/zabbix_server/snmptrapper/snmptrapper.c +++ b/src/zabbix_server/snmptrapper/snmptrapper.c @@ -70,8 +70,6 @@ static void DBupdate_lastsize(void) /****************************************************************************** * * - * Function: process_trap_for_interface * - * * * Purpose: add trap to all matching items for the specified interface * * * * Return value: SUCCEED - a matching item was found * @@ -230,8 +228,6 @@ next: /****************************************************************************** * * - * Function: process_trap * - * * * Purpose: process a single trap * * * * Parameters: addr - [IN] address of the target interface(s) * @@ -277,8 +273,6 @@ static void process_trap(const char *addr, char *begin, char *end) /****************************************************************************** * * - * Function: parse_traps * - * * * Purpose: split traps and process them with process_trap() * * * * Author: Rudolfs Kreicbergs * @@ -387,8 +381,6 @@ static void parse_traps(int flag) /****************************************************************************** * * - * Function: delay_trap_logs * - * * * Purpose: delay SNMP trapper file related issue log entries for 60 seconds * * unless this is the first time this issue has occurred * * * @@ -416,8 +408,6 @@ static void delay_trap_logs(char *error, int log_level) /****************************************************************************** * * - * Function: read_traps * - * * * Purpose: read the traps and then parse them with parse_traps() * * * * Author: Rudolfs Kreicbergs * @@ -463,8 +453,6 @@ out: /****************************************************************************** * * - * Function: close_trap_file * - * * * Purpose: close trap file and reset lastsize * * * * Author: Rudolfs Kreicbergs * @@ -484,8 +472,6 @@ static void close_trap_file(void) /****************************************************************************** * * - * Function: open_trap_file * - * * * Purpose: open the trap file and get it's node number * * * * Return value: file descriptor of the opened file or -1 otherwise * @@ -528,8 +514,6 @@ out: /****************************************************************************** * * - * Function: get_latest_data * - * * * Purpose: Open the latest trap file. If the current file has been rotated, * * process that and then open the latest file. * * * @@ -607,8 +591,6 @@ static int get_latest_data(void) /****************************************************************************** * * - * Function: main_snmptrapper_loop * - * * * Purpose: SNMP trap reader's entry point * * * * Author: Rudolfs Kreicbergs * diff --git a/src/zabbix_server/taskmanager/proxy_tasks.c b/src/zabbix_server/taskmanager/proxy_tasks.c index 2d8b201660c..2730c07b72d 100644 --- a/src/zabbix_server/taskmanager/proxy_tasks.c +++ b/src/zabbix_server/taskmanager/proxy_tasks.c @@ -28,8 +28,6 @@ /****************************************************************************** * * - * Function: zbx_tm_get_remote_tasks * - * * * Purpose: get tasks scheduled to be executed on a proxy * * * * Parameters: tasks - [OUT] the tasks to execute * diff --git a/src/zabbix_server/taskmanager/taskmanager.c b/src/zabbix_server/taskmanager/taskmanager.c index 4d7d958651a..c88768e7289 100644 --- a/src/zabbix_server/taskmanager/taskmanager.c +++ b/src/zabbix_server/taskmanager/taskmanager.c @@ -41,8 +41,6 @@ extern ZBX_THREAD_LOCAL int server_num, process_num; /****************************************************************************** * * - * Function: tm_execute_task_close_problem * - * * * Purpose: close the specified problem event and remove task * * * * Parameters: triggerid - [IN] the source trigger id * @@ -73,8 +71,6 @@ static void tm_execute_task_close_problem(zbx_uint64_t taskid, zbx_uint64_t trig /****************************************************************************** * * - * Function: tm_try_task_close_problem * - * * * Purpose: try to close problem by event acknowledgement action * * * * Parameters: taskid - [IN] the task identifier * @@ -153,8 +149,6 @@ static int tm_try_task_close_problem(zbx_uint64_t taskid) /****************************************************************************** * * - * Function: tm_expire_remote_command * - * * * Purpose: process expired remote command task * * * ******************************************************************************/ @@ -195,8 +189,6 @@ static void tm_expire_remote_command(zbx_uint64_t taskid) /****************************************************************************** * * - * Function: tm_process_remote_command_result * - * * * Purpose: process remote command result task * * * * Return value: SUCCEED - the task was processed successfully * @@ -269,8 +261,6 @@ static int tm_process_remote_command_result(zbx_uint64_t taskid) /****************************************************************************** * * - * Function: tm_process_data_result * - * * * Purpose: process data task result * * * ******************************************************************************/ @@ -310,8 +300,6 @@ static void tm_process_data_result(zbx_uint64_t taskid) } /****************************************************************************** * * - * Function: notify_service_manager * - * * * Purpose: notify service manager about problem severity changes * * * ******************************************************************************/ @@ -353,8 +341,6 @@ static void notify_service_manager(const zbx_vector_ptr_t *ack_tasks) /****************************************************************************** * * - * Function: tm_process_acknowledgements * - * * * Purpose: process acknowledgements for alerts sending * * * * Return value: The number of successfully processed tasks * @@ -435,8 +421,6 @@ static int tm_process_acknowledgements(zbx_vector_uint64_t *ack_taskids) /****************************************************************************** * * - * Function: tm_process_check_now * - * * * Purpose: process check now tasks for item rescheduling * * * * Return value: The number of successfully processed tasks * @@ -581,8 +565,6 @@ static int tm_process_check_now(zbx_vector_uint64_t *taskids) /****************************************************************************** * * - * Function: tm_process_diaginfo * - * * * Purpose: process diaginfo task * * * ******************************************************************************/ @@ -610,8 +592,6 @@ static void tm_process_diaginfo(zbx_uint64_t taskid, const char *data) /****************************************************************************** * * - * Function: tm_process_data * - * * * Purpose: process data tasks * * * * Return value: The number of successfully processed tasks * @@ -689,8 +669,6 @@ static int tm_process_data(zbx_vector_uint64_t *taskids) /****************************************************************************** * * - * Function: tm_expire_generic_tasks * - * * * Purpose: expires tasks that don't require specific expiration handling * * * * Return value: The number of successfully expired tasks * @@ -711,8 +689,6 @@ static int tm_expire_generic_tasks(zbx_vector_uint64_t *taskids) /****************************************************************************** * * - * Function: tm_process_tasks * - * * * Purpose: process task manager tasks depending on task type * * * * Return value: The number of successfully processed tasks * @@ -814,8 +790,6 @@ static int tm_process_tasks(int now) /****************************************************************************** * * - * Function: tm_remove_old_tasks * - * * * Purpose: remove old done/expired tasks * * * ******************************************************************************/ diff --git a/src/zabbix_server/timer/timer.c b/src/zabbix_server/timer/timer.c index 24a99b9ed56..70954d61073 100644 --- a/src/zabbix_server/timer/timer.c +++ b/src/zabbix_server/timer/timer.c @@ -50,8 +50,6 @@ zbx_event_suppress_data_t; /****************************************************************************** * * - * Function: log_host_maintenance_update * - * * * Purpose: log host maintenance changes * * * ******************************************************************************/ @@ -96,8 +94,6 @@ static void log_host_maintenance_update(const zbx_host_maintenance_diff_t* diff) /****************************************************************************** * * - * Function: db_update_host_maintenances * - * * * Purpose: update host maintenance properties in database * * * ******************************************************************************/ @@ -172,8 +168,6 @@ static void db_update_host_maintenances(const zbx_vector_ptr_t *updates) /****************************************************************************** * * - * Function: db_remove_expired_event_suppress_data * - * * * Purpose: remove expired event_suppress records * * * ******************************************************************************/ @@ -186,8 +180,6 @@ static void db_remove_expired_event_suppress_data(int now) /****************************************************************************** * * - * Function: event_suppress_data_free * - * * * Purpose: free event suppress data structure * * * ******************************************************************************/ @@ -199,8 +191,6 @@ static void event_suppress_data_free(zbx_event_suppress_data_t *data) /****************************************************************************** * * - * Function: event_queries_fetch * - * * * Purpose: fetch events that need to be queried for maintenance * * * ******************************************************************************/ @@ -242,8 +232,6 @@ static void event_queries_fetch(DB_RESULT result, zbx_vector_ptr_t *event_querie /****************************************************************************** * * - * Function: db_get_query_events * - * * * Purpose: get open, recently resolved and resolved problems with suppress * * data from database and prepare event query, event data structures * * * @@ -361,8 +349,6 @@ static void db_get_query_events(zbx_vector_ptr_t *event_queries, zbx_vector_ptr_ /****************************************************************************** * * - * Function: db_update_event_suppress_data * - * * * Purpose: create/update event suppress data to reflect latest maintenance * * changes in cache * * * @@ -530,8 +516,6 @@ cleanup: /****************************************************************************** * * - * Function: db_update_host_maintenances * - * * * Purpose: update host maintenance parameters in cache and database * * * ******************************************************************************/ @@ -576,8 +560,6 @@ static int update_host_maintenances(void) /****************************************************************************** * * - * Function: timer_thread * - * * * Purpose: periodically processes maintenance * * * ******************************************************************************/ diff --git a/src/zabbix_server/trapper/active.c b/src/zabbix_server/trapper/active.c index 61a3c9e0e94..2fc072239c9 100644 --- a/src/zabbix_server/trapper/active.c +++ b/src/zabbix_server/trapper/active.c @@ -33,8 +33,6 @@ extern unsigned char program_type; /****************************************************************************** * * - * Function: db_register_host * - * * * Purpose: perform active agent auto registration * * * * Parameters: host - [IN] name of the host to be added or updated * @@ -140,8 +138,6 @@ out: /****************************************************************************** * * - * Function: get_hostid_by_host * - * * * Purpose: check for host name and return hostid * * * * Parameters: sock - [IN] open socket of server-agent connection * @@ -341,8 +337,6 @@ static void get_list_of_active_checks(zbx_uint64_t hostid, zbx_vector_uint64_t * /****************************************************************************** * * - * Function: send_list_of_active_checks * - * * * Purpose: send list of active checks to the host (older version agent) * * * * Parameters: sock - open socket of server-agent connection * @@ -452,8 +446,6 @@ out: /****************************************************************************** * * - * Function: zbx_vector_str_append_uniq * - * * * Purpose: append non duplicate string to the string vector * * * * Parameters: vector - [IN/OUT] the string vector * @@ -468,8 +460,6 @@ static void zbx_vector_str_append_uniq(zbx_vector_str_t *vector, const char *str /****************************************************************************** * * - * Function: zbx_itemkey_extract_global_regexps * - * * * Purpose: extract global regular expression names from item key * * * * Parameters: key - [IN] the item key to parse * @@ -522,8 +512,6 @@ out: /****************************************************************************** * * - * Function: send_list_of_active_checks_json * - * * * Purpose: send list of active checks to the host * * * * Parameters: sock - open socket of server-agent connection * diff --git a/src/zabbix_server/trapper/nodecommand.c b/src/zabbix_server/trapper/nodecommand.c index 3300e094214..13c5ffb19a1 100644 --- a/src/zabbix_server/trapper/nodecommand.c +++ b/src/zabbix_server/trapper/nodecommand.c @@ -33,8 +33,6 @@ /****************************************************************************** * * - * Function: execute_remote_script * - * * * Purpose: execute remote command and wait for the result * * * * Return value: SUCCEED - the remote command was executed successfully * @@ -187,8 +185,6 @@ fail: /****************************************************************************** * * - * Function: zbx_check_event_end_recovery_event * - * * * Purpose: check if the specified event id corresponds to a problem event * * caused by a trigger, find its recovery event (if it exists) * * * @@ -225,8 +221,6 @@ static int zbx_check_event_end_recovery_event(zbx_uint64_t eventid, zbx_uint64_t /****************************************************************************** * * - * Function: execute_script * - * * * Purpose: executing command * * * * Parameters: scriptid - [IN] the id of a script to be executed * @@ -491,8 +485,6 @@ fail: /****************************************************************************** * * - * Function: node_process_command * - * * * Purpose: process command received from the frontend * * * * Return value: SUCCEED - processed successfully * diff --git a/src/zabbix_server/trapper/proxyconfig.c b/src/zabbix_server/trapper/proxyconfig.c index b833f8e3476..8f937ae2fa7 100644 --- a/src/zabbix_server/trapper/proxyconfig.c +++ b/src/zabbix_server/trapper/proxyconfig.c @@ -30,8 +30,6 @@ /****************************************************************************** * * - * Function: send_proxyconfig * - * * * Purpose: send configuration tables to the proxy from server * * (for active proxies) * * * @@ -125,8 +123,6 @@ out: /****************************************************************************** * * - * Function: recv_proxyconfig * - * * * Purpose: receive configuration tables from server (passive proxies) * * * * Author: Alexander Vladishev * diff --git a/src/zabbix_server/trapper/proxydata.c b/src/zabbix_server/trapper/proxydata.c index 31ec9de6a22..99919b3ba38 100644 --- a/src/zabbix_server/trapper/proxydata.c +++ b/src/zabbix_server/trapper/proxydata.c @@ -93,8 +93,6 @@ int zbx_send_proxy_data_response(const DC_PROXY *proxy, zbx_socket_t *sock, cons /****************************************************************************** * * - * Function: zbx_recv_proxy_data * - * * * Purpose: receive 'proxy data' request from proxy * * * * Parameters: sock - [IN] the connection socket * @@ -184,8 +182,6 @@ out: /****************************************************************************** * * - * Function: send_data_to_server * - * * * Purpose: sends data from proxy to server * * * * Parameters: sock - [IN] the connection socket * @@ -213,8 +209,6 @@ static int send_data_to_server(zbx_socket_t *sock, char **buffer, size_t buffer_ /****************************************************************************** * * - * Function: zbx_send_proxy_data * - * * * Purpose: sends 'proxy data' request to server * * * * Parameters: sock - [IN] the connection socket * @@ -326,8 +320,6 @@ out: /****************************************************************************** * * - * Function: zbx_send_task_data * - * * * Purpose: sends 'proxy data' request to server * * * * Parameters: sock - [IN] the connection socket * diff --git a/src/zabbix_server/trapper/trapper.c b/src/zabbix_server/trapper/trapper.c index 0c7d2332c05..a27f36f672f 100644 --- a/src/zabbix_server/trapper/trapper.c +++ b/src/zabbix_server/trapper/trapper.c @@ -106,8 +106,6 @@ zbx_status_section_t; /****************************************************************************** * * - * Function: recv_agenthistory * - * * * Purpose: processes the received values from active agents * * * ******************************************************************************/ @@ -138,8 +136,6 @@ static void recv_agenthistory(zbx_socket_t *sock, struct zbx_json_parse *jp, zbx /****************************************************************************** * * - * Function: recv_senderhistory * - * * * Purpose: processes the received values from senders * * * ******************************************************************************/ @@ -170,8 +166,6 @@ static void recv_senderhistory(zbx_socket_t *sock, struct zbx_json_parse *jp, zb /****************************************************************************** * * - * Function: recv_proxy_heartbeat * - * * * Purpose: process heartbeat sent by proxy servers * * * * Return value: SUCCEED - processed successfully * @@ -238,8 +232,6 @@ zbx_queue_stats_t; /****************************************************************************** * * - * Function: queue_stats_update * - * * * Purpose: update queue stats with a new item delay * * * * Parameters: stats - [IN] the queue stats * @@ -264,8 +256,6 @@ static void queue_stats_update(zbx_queue_stats_t *stats, int delay) /****************************************************************************** * * - * Function: queue_stats_export * - * * * Purpose: export queue stats to JSON format * * * * Parameters: queue_stats - [IN] a hashset containing item stats * @@ -308,8 +298,6 @@ static int queue_compare_by_nextcheck_asc(zbx_queue_item_t **d1, zbx_queue_item_ /****************************************************************************** * * - * Function: recv_getqueue * - * * * Purpose: process queue request * * * * Parameters: sock - [IN] the request socket * @@ -782,8 +770,6 @@ static void status_stats_export(struct zbx_json *json, zbx_user_type_t access_le /****************************************************************************** * * - * Function: recv_getstatus * - * * * Purpose: process status request * * * * Parameters: sock - [IN] the request socket * @@ -874,8 +860,6 @@ out: /****************************************************************************** * * - * Function: send_internal_stats_json * - * * * Purpose: process Zabbix stats request * * * * Parameters: sock - [IN] the request socket * diff --git a/src/zabbix_server/trapper/trapper_auth.c b/src/zabbix_server/trapper/trapper_auth.c index 4b2d01d0ab1..c80fdf742ce 100644 --- a/src/zabbix_server/trapper/trapper_auth.c +++ b/src/zabbix_server/trapper/trapper_auth.c @@ -28,8 +28,6 @@ /****************************************************************************** * * - * Function: format_auth_token_hash * - * * * Purpose: takes a string token, hashes it with sha-512 and then formats the * * resulting binary into the printable hex string * * * @@ -59,8 +57,6 @@ static void format_auth_token_hash(const char *auth_token, char *hash_res_string /****************************************************************************** * * - * Function: zbx_get_user_from_json * - * * * Purpose: authenticate and initialize user data from the supplied json * * * * Parameters: jp - [IN] the request * diff --git a/src/zabbix_server/trapper/trapper_preproc.c b/src/zabbix_server/trapper/trapper_preproc.c index 7d7af04454b..6abab6d747d 100644 --- a/src/zabbix_server/trapper/trapper_preproc.c +++ b/src/zabbix_server/trapper/trapper_preproc.c @@ -32,8 +32,6 @@ extern int CONFIG_DOUBLE_PRECISION; /****************************************************************************** * * - * Function: trapper_parse_preproc_test * - * * * Purpose: parses preprocessing test request * * * * Parameters: jp - [IN] the request * @@ -229,8 +227,6 @@ out: /****************************************************************************** * * - * Function: trapper_preproc_test_run * - * * * Purpose: executes preprocessing test request * * * * Parameters: jp - [IN] the request * @@ -400,8 +396,6 @@ out: /****************************************************************************** * * - * Function: zbx_trapper_preproc_test * - * * * Purpose: processes preprocessing test request * * * * Parameters: sock - [IN] the request source socket (frontend) * diff --git a/src/zabbix_server/trapper/trapper_server.c b/src/zabbix_server/trapper/trapper_server.c index 2358412acdf..ac552610b8d 100644 --- a/src/zabbix_server/trapper/trapper_server.c +++ b/src/zabbix_server/trapper/trapper_server.c @@ -70,8 +70,6 @@ out: /****************************************************************************** * * - * Function: recv_alert_send * - * * * Purpose: process alert send request that is used to test media types * * * * Parameters: sock - [IN] the request socket * diff --git a/src/zabbix_server/vmware/vmware.c b/src/zabbix_server/vmware/vmware.c index 8057f20f001..9d2fee64b30 100644 --- a/src/zabbix_server/vmware/vmware.c +++ b/src/zabbix_server/vmware/vmware.c @@ -602,8 +602,6 @@ static size_t curl_header_cb(void *ptr, size_t size, size_t nmemb, void *userdat /****************************************************************************** * * - * Function: zbx_str_uint64_pair_free * - * * * Purpose: free memory of vector element * * * ******************************************************************************/ @@ -614,8 +612,6 @@ static void zbx_str_uint64_pair_free(zbx_str_uint64_pair_t data) /****************************************************************************** * * - * Function: zbx_str_uint64_pair_name_compare * - * * * Purpose: sorting function to sort zbx_str_uint64_pair_t vector by name * * * ******************************************************************************/ @@ -629,8 +625,6 @@ int zbx_str_uint64_pair_name_compare(const void *p1, const void *p2) /****************************************************************************** * * - * Function: zbx_http_post * - * * * Purpose: abstracts the curl_easy_setopt/curl_easy_perform call pair * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -679,8 +673,6 @@ static int zbx_http_post(CURL *easyhandle, const char *request, ZBX_HTTPPAGE **r } /****************************************************************************** * * - * Function: zbx_soap_post * - * * * Purpose: unification of vmware web service call with SOAP error validation * * * * Parameters: fn_parent - [IN] the parent function name for Log records * @@ -781,8 +773,6 @@ static int vmware_perf_entity_compare_func(const void *d1, const void *d2) /****************************************************************************** * * - * Function: vmware_free_perfvalue * - * * * Purpose: frees perfvalue data structure * * * ******************************************************************************/ @@ -794,8 +784,6 @@ static void vmware_free_perfvalue(zbx_vmware_perf_value_t *value) /****************************************************************************** * * - * Function: vmware_free_perfdata * - * * * Purpose: frees perfdata data structure * * * ******************************************************************************/ @@ -812,8 +800,6 @@ static void vmware_free_perfdata(zbx_vmware_perf_data_t *data) /****************************************************************************** * * - * Function: xml_read_props * - * * * Purpose: reads the vmware object properties by their xpaths from xml data * * * * Parameters: xdoc - [IN] the xml document * @@ -877,8 +863,6 @@ static char **xml_read_props(xmlDoc *xdoc, const zbx_vmware_propmap_t *propmap, /****************************************************************************** * * - * Function: vmware_counters_shared_copy * - * * * Purpose: copies performance counter vector into shared memory hashset * * * * Parameters: dst - [IN] the destination hashset * @@ -910,8 +894,6 @@ static void vmware_counters_shared_copy(zbx_hashset_t *dst, const zbx_vector_ptr /****************************************************************************** * * - * Function: vmware_vector_str_uint64_pair_shared_clean * - * * * Purpose: frees shared resources allocated to store instance performance * * counter values * * * @@ -935,8 +917,6 @@ static void vmware_vector_str_uint64_pair_shared_clean(zbx_vector_str_uint64_pai /****************************************************************************** * * - * Function: vmware_perf_counter_shared_free * - * * * Purpose: frees shared resources allocated to store performance counter * * data * * * @@ -952,8 +932,6 @@ static void vmware_perf_counter_shared_free(zbx_vmware_perf_counter_t *counter) /****************************************************************************** * * - * Function: vmware_entities_shared_clean_stats * - * * * Purpose: removes statistics data from vmware entities * * * ******************************************************************************/ @@ -982,8 +960,6 @@ static void vmware_entities_shared_clean_stats(zbx_hashset_t *entities) /****************************************************************************** * * - * Function: vmware_diskextent_shared_free * - * * * Purpose: frees shared resources allocated to store diskextent data * * * * Parameters: diskextent - [IN] the diskextent * @@ -998,8 +974,6 @@ static void vmware_diskextent_shared_free(zbx_vmware_diskextent_t *diskextent) /****************************************************************************** * * - * Function: vmware_datastore_shared_free * - * * * Purpose: frees shared resources allocated to store datastore data * * * * Parameters: datastore - [IN] the datastore * @@ -1024,8 +998,6 @@ static void vmware_datastore_shared_free(zbx_vmware_datastore_t *datastore) /****************************************************************************** * * - * Function: vmware_datacenter_shared_free * - * * * Purpose: frees shared resources allocated to store datacenter data * * * * Parameters: datacenter - [IN] the datacenter * @@ -1041,8 +1013,6 @@ static void vmware_datacenter_shared_free(zbx_vmware_datacenter_t *datacenter) /****************************************************************************** * * - * Function: vmware_props_shared_free * - * * * Purpose: frees shared resources allocated to store properties list * * * * Parameters: props - [IN] the properties list * @@ -1067,8 +1037,6 @@ static void vmware_props_shared_free(char **props, int props_num) /****************************************************************************** * * - * Function: vmware_dev_shared_free * - * * * Purpose: frees shared resources allocated to store vm device data * * * * Parameters: dev - [IN] the vm device * @@ -1087,8 +1055,6 @@ static void vmware_dev_shared_free(zbx_vmware_dev_t *dev) /****************************************************************************** * * - * Function: vmware_fs_shared_free * - * * * Purpose: frees shared resources allocated to store file system object * * * * Parameters: fs - [IN] the file system * @@ -1104,8 +1070,6 @@ static void vmware_fs_shared_free(zbx_vmware_fs_t *fs) /****************************************************************************** * * - * Function: vmware_vm_shared_free * - * * * Purpose: frees shared resources allocated to store virtual machine * * * * Parameters: vm - [IN] the virtual machine * @@ -1132,8 +1096,6 @@ static void vmware_vm_shared_free(zbx_vmware_vm_t *vm) /****************************************************************************** * * - * Function: vmware_dsname_shared_free * - * * * Purpose: frees shared resources allocated to store datastore names data * * * * Parameters: dsname - [IN] the datastore name * @@ -1149,8 +1111,6 @@ static void vmware_dsname_shared_free(zbx_vmware_dsname_t *dsname) /****************************************************************************** * * - * Function: vmware_hv_shared_clean * - * * * Purpose: frees shared resources allocated to store vmware hypervisor * * * * Parameters: hv - [IN] the vmware hypervisor * @@ -1190,8 +1150,6 @@ static void vmware_hv_shared_clean(zbx_vmware_hv_t *hv) /****************************************************************************** * * - * Function: vmware_cluster_shared_free * - * * * Purpose: frees shared resources allocated to store vmware cluster * * * * Parameters: cluster - [IN] the vmware cluster * @@ -1213,8 +1171,6 @@ static void vmware_cluster_shared_free(zbx_vmware_cluster_t *cluster) /****************************************************************************** * * - * Function: vmware_event_shared_free * - * * * Purpose: frees shared resources allocated to store vmware event * * * * Parameters: event - [IN] the vmware event * @@ -1230,8 +1186,6 @@ static void vmware_event_shared_free(zbx_vmware_event_t *event) /****************************************************************************** * * - * Function: vmware_data_shared_free * - * * * Purpose: frees shared resources allocated to store vmware service data * * * * Parameters: data - [IN] the vmware service data * @@ -1272,8 +1226,6 @@ static void vmware_data_shared_free(zbx_vmware_data_t *data) /****************************************************************************** * * - * Function: vmware_shared_perf_entity_clean * - * * * Purpose: cleans resources allocated by vmware performance entity in vmware * * cache * * * @@ -1293,8 +1245,6 @@ static void vmware_shared_perf_entity_clean(zbx_vmware_perf_entity_t *entity) /****************************************************************************** * * - * Function: vmware_counter_shared_clean * - * * * Purpose: frees resources allocated by vmware performance counter * * * * Parameters: counter - [IN] the performance counter to free * @@ -1307,8 +1257,6 @@ static void vmware_counter_shared_clean(zbx_vmware_counter_t *counter) /****************************************************************************** * * - * Function: vmware_service_shared_free * - * * * Purpose: frees shared resources allocated to store vmware service * * * * Parameters: data - [IN] the vmware service data * @@ -1353,8 +1301,6 @@ static void vmware_service_shared_free(zbx_vmware_service_t *service) /****************************************************************************** * * - * Function: vmware_cluster_shared_dup * - * * * Purpose: copies vmware cluster object into shared memory * * * * Parameters: src - [IN] the vmware cluster object * @@ -1376,8 +1322,6 @@ static zbx_vmware_cluster_t *vmware_cluster_shared_dup(const zbx_vmware_cluster_ /****************************************************************************** * * - * Function: vmware_event_shared_dup * - * * * Purpose: copies vmware event object into shared memory * * * * Parameters: src - [IN] the vmware event object * @@ -1399,8 +1343,6 @@ static zbx_vmware_event_t *vmware_event_shared_dup(const zbx_vmware_event_t *src /****************************************************************************** * * - * Function: vmware_diskextent_shared_dup * - * * * Purpose: copies vmware hypervisor diskextent object into shared memory * * * * Parameters: src - [IN] the vmware diskextent object * @@ -1421,8 +1363,6 @@ static zbx_vmware_diskextent_t *vmware_diskextent_shared_dup(const zbx_vmware_di /****************************************************************************** * * - * Function: vmware_datastore_shared_dup * - * * * Purpose: copies vmware hypervisor datastore object into shared memory * * * * Parameters: src - [IN] the vmware datastore object * @@ -1468,8 +1408,6 @@ static zbx_vmware_datastore_t *vmware_datastore_shared_dup(const zbx_vmware_data /****************************************************************************** * * - * Function: vmware_datacenter_shared_dup * - * * * Purpose: copies vmware datacenter object into shared memory * * * * Parameters: src - [IN] the vmware datacenter object * @@ -1490,8 +1428,6 @@ static zbx_vmware_datacenter_t *vmware_datacenter_shared_dup(const zbx_vmware_da /****************************************************************************** * * - * Function: vmware_dev_shared_dup * - * * * Purpose: copies vmware virtual machine device object into shared memory * * * * Parameters: src - [IN] the vmware device object * @@ -1513,8 +1449,6 @@ static zbx_vmware_dev_t *vmware_dev_shared_dup(const zbx_vmware_dev_t *src) /****************************************************************************** * * - * Function: vmware_fs_shared_dup * - * * * Purpose: copies vmware virtual machine file system object into shared * * memory * * * @@ -1537,8 +1471,6 @@ static zbx_vmware_fs_t *vmware_fs_shared_dup(const zbx_vmware_fs_t *src) /****************************************************************************** * * - * Function: vmware_props_shared_dup * - * * * Purpose: copies object properties list into shared memory * * * * Parameters: src - [IN] the properties list * @@ -1562,8 +1494,6 @@ static char **vmware_props_shared_dup(char ** const src, int props_num) /****************************************************************************** * * - * Function: vmware_vm_shared_dup * - * * * Purpose: copies vmware virtual machine object into shared memory * * * * Parameters: src - [IN] the vmware virtual machine object * @@ -1598,8 +1528,6 @@ static zbx_vmware_vm_t *vmware_vm_shared_dup(const zbx_vmware_vm_t *src) /****************************************************************************** * * - * Function: vmware_dsname_shared_dup * - * * * Purpose: copies vmware hypervisor datastore name object into shared memory * * * * Parameters: src - [IN] the vmware datastore name object * @@ -1629,8 +1557,6 @@ static zbx_vmware_dsname_t *vmware_dsname_shared_dup(const zbx_vmware_dsname_t * /****************************************************************************** * * - * Function: vmware_hv_shared_copy * - * * * Purpose: copies vmware hypervisor object into shared memory * * * * Parameters: dst - [OUT] the vmware hypervisor object into shared memory * @@ -1665,8 +1591,6 @@ static void vmware_hv_shared_copy(zbx_vmware_hv_t *dst, const zbx_vmware_hv_t *s /****************************************************************************** * * - * Function: vmware_data_shared_dup * - * * * Purpose: copies vmware data object into shared memory * * * * Parameters: src - [IN] the vmware data object * @@ -1741,8 +1665,6 @@ static zbx_vmware_data_t *vmware_data_shared_dup(zbx_vmware_data_t *src) /****************************************************************************** * * - * Function: vmware_diskextent_free * - * * * Purpose: frees resources allocated to store diskextent data * * * * Parameters: diskextent - [IN] the diskextent * @@ -1756,8 +1678,6 @@ static void vmware_diskextent_free(zbx_vmware_diskextent_t *diskextent) /****************************************************************************** * * - * Function: vmware_datastore_free * - * * * Purpose: frees resources allocated to store datastore data * * * * Parameters: datastore - [IN] the datastore * @@ -1779,8 +1699,6 @@ static void vmware_datastore_free(zbx_vmware_datastore_t *datastore) /****************************************************************************** * * - * Function: vmware_datacenter_free * - * * * Purpose: frees resources allocated to store datacenter data * * * * Parameters: datacenter - [IN] the datacenter * @@ -1795,8 +1713,6 @@ static void vmware_datacenter_free(zbx_vmware_datacenter_t *datacenter) /****************************************************************************** * * - * Function: vmware_props_free * - * * * Purpose: frees shared resources allocated to store properties list * * * * Parameters: props - [IN] the properties list * @@ -1818,8 +1734,6 @@ static void vmware_props_free(char **props, int props_num) /****************************************************************************** * * - * Function: vmware_dev_free * - * * * Purpose: frees resources allocated to store vm device object * * * * Parameters: dev - [IN] the vm device * @@ -1834,8 +1748,6 @@ static void vmware_dev_free(zbx_vmware_dev_t *dev) /****************************************************************************** * * - * Function: vmware_fs_free * - * * * Purpose: frees resources allocated to store vm file system object * * * * Parameters: fs - [IN] the file system * @@ -1849,8 +1761,6 @@ static void vmware_fs_free(zbx_vmware_fs_t *fs) /****************************************************************************** * * - * Function: vmware_vm_free * - * * * Purpose: frees resources allocated to store virtual machine * * * * Parameters: vm - [IN] the virtual machine * @@ -1872,8 +1782,6 @@ static void vmware_vm_free(zbx_vmware_vm_t *vm) /****************************************************************************** * * - * Function: vmware_dsname_free * - * * * Purpose: frees resources allocated to store Datastore name data * * * * Parameters: dsname - [IN] the Datastore name * @@ -1888,8 +1796,6 @@ static void vmware_dsname_free(zbx_vmware_dsname_t *dsname) /****************************************************************************** * * - * Function: vmware_hv_clean * - * * * Purpose: frees resources allocated to store vmware hypervisor * * * * Parameters: hv - [IN] the vmware hypervisor * @@ -1915,8 +1821,6 @@ static void vmware_hv_clean(zbx_vmware_hv_t *hv) /****************************************************************************** * * - * Function: vmware_cluster_free * - * * * Purpose: frees resources allocated to store vmware cluster * * * * Parameters: cluster - [IN] the vmware cluster * @@ -1932,8 +1836,6 @@ static void vmware_cluster_free(zbx_vmware_cluster_t *cluster) /****************************************************************************** * * - * Function: vmware_event_free * - * * * Purpose: frees resources allocated to store vmware event * * * * Parameters: event - [IN] the vmware event * @@ -1947,8 +1849,6 @@ static void vmware_event_free(zbx_vmware_event_t *event) /****************************************************************************** * * - * Function: vmware_data_free * - * * * Purpose: frees resources allocated to store vmware service data * * * * Parameters: data - [IN] the vmware service data * @@ -1983,8 +1883,6 @@ static void vmware_data_free(zbx_vmware_data_t *data) /****************************************************************************** * * - * Function: vmware_counter_free * - * * * Purpose: frees vmware performance counter and the resources allocated by * * it * * * @@ -1999,8 +1897,6 @@ static void vmware_counter_free(zbx_vmware_counter_t *counter) /****************************************************************************** * * - * Function: vmware_service_authenticate * - * * * Purpose: authenticates vmware service * * * * Parameters: service - [IN] the vmware service * @@ -2121,8 +2017,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_logout * - * * * Purpose: Close unused connection with vCenter * * * * Parameters: service - [IN] the vmware service * @@ -2218,8 +2112,6 @@ static void zbx_property_collection_free(zbx_property_collection_iter *iter) /****************************************************************************** * * - * Function: vmware_service_get_contents * - * * * Purpose: retrieves vmware service instance contents * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -2265,8 +2157,6 @@ static int vmware_service_get_contents(CURL *easyhandle, char **version, char ** /****************************************************************************** * * - * Function: vmware_service_get_perf_counter_refreshrate * - * * * Purpose: get the performance counter refreshrate for the specified entity * * * * Parameters: service - [IN] the vmware service * @@ -2337,8 +2227,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_perf_counters * - * * * Purpose: get the performance counter ids * * * * Parameters: service - [IN] the vmware service * @@ -2516,8 +2404,6 @@ out: /****************************************************************************** * * - * Function: vmware_vm_get_nic_devices * - * * * Purpose: gets virtual machine network interface devices * * * * Parameters: vm - [OUT] the virtual machine * @@ -2575,8 +2461,6 @@ clean: /****************************************************************************** * * - * Function: vmware_vm_get_disk_devices * - * * * Purpose: gets virtual machine virtual disk devices * * * * Parameters: vm - [OUT] the virtual machine * @@ -2706,8 +2590,6 @@ clean: /****************************************************************************** * * - * Function: vmware_vm_get_file_systems * - * * * Purpose: gets the parameters of virtual machine disks * * * * Parameters: vm - [OUT] the virtual machine * @@ -2769,8 +2651,6 @@ clean: /****************************************************************************** * * - * Function: vmware_service_get_vm_data * - * * * Purpose: gets the virtual machine data * * * * Parameters: service - [IN] the vmware service * @@ -2864,8 +2744,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_vm_folder * - * * * Purpose: convert vm folder id to chain of folder names divided by '/' * * * * Parameters: xdoc - [IN] the xml with all vm details * @@ -2922,8 +2800,6 @@ static int vmware_service_get_vm_folder(xmlDoc *xdoc, char **vm_folder) /****************************************************************************** * * - * Function: vmware_service_create_vm * - * * * Purpose: create virtual machine object * * * * Parameters: service - [IN] the vmware service * @@ -2995,8 +2871,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_refresh_datastore_info * - * * * Purpose: Refreshes all storage related information including free-space, * * capacity, and detailed usage of virtual machines. * * * @@ -3032,8 +2906,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_diskextents_list * - * * * Purpose: retrieves a list of vmware service datastore diskextents * * * * Parameters: doc - [IN] XML document * @@ -3099,8 +2971,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_create_datastore * - * * * Purpose: create vmware hypervisor datastore object * * * * Parameters: service - [IN] the vmware service * @@ -3227,8 +3097,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_hv_data * - * * * Purpose: gets the vmware hypervisor data * * * * Parameters: service - [IN] the vmware service * @@ -3317,8 +3185,6 @@ out: /****************************************************************************** * * - * Function: vmware_hv_get_parent_data * - * * * Purpose: gets the vmware hypervisor datacenter, parent folder or cluster * * name * * * @@ -3458,8 +3324,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_hv_get_multipath_data * - * * * Purpose: gets the vmware hypervisor data about ds multipath * * * * Parameters: service - [IN] the vmware service * @@ -3541,8 +3405,6 @@ static int vmware_service_hv_get_multipath_data(const zbx_vmware_service_t *serv /****************************************************************************** * * - * Function: vmware_ds_name_compare * - * * * Purpose: sorting function to sort Datastore vector by name * * * ******************************************************************************/ @@ -3556,8 +3418,6 @@ int vmware_ds_name_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: vmware_ds_id_compare * - * * * Purpose: sorting function to sort Datastore vector by id * * * ******************************************************************************/ @@ -3571,8 +3431,6 @@ static int vmware_ds_id_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: vmware_dc_id_compare * - * * * Purpose: sorting function to sort Datacenter vector by id * * * ******************************************************************************/ @@ -3585,8 +3443,6 @@ static int vmware_dc_id_compare(const void *d1, const void *d2) } /****************************************************************************** - * Function: vmware_hv_get_ds_access * - * * * Purpose: populate array of values from a xml data * * * * Parameters: xdoc - [IN] XML document * @@ -3667,8 +3523,6 @@ clean: /****************************************************************************** * * - * Function: vmware_dsname_compare * - * * * Purpose: sorting function to sort Datastore names vector by name * * * ******************************************************************************/ @@ -3682,8 +3536,6 @@ int vmware_dsname_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: vmware_service_init_hv * - * * * Purpose: initialize vmware hypervisor object * * * * Parameters: service - [IN] the vmware service * @@ -3856,8 +3708,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_datacenters_list * - * * * Purpose: retrieves a list of vmware service datacenters * * * * Parameters: doc - [IN] XML document * @@ -3926,8 +3776,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_hv_ds_dc_list * - * * * Purpose: retrieves a list of all vmware service hypervisor ids * * * * Parameters: service - [IN] the vmware service * @@ -4121,8 +3969,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_event_session * - * * * Purpose: retrieves event session name * * * * Parameters: service - [IN] the vmware service * @@ -4174,8 +4020,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_reset_event_history_collector * - * * * Purpose: resets "scrollable view" to the latest events * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -4221,8 +4065,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_read_previous_events * - * * * Purpose: reads events from "scrollable view" and moves it back in time * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -4270,8 +4112,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_event_latestpage * - * * * Purpose: reads events from "latest page" and moves it back in time * * * * Parameters: service - [IN] the vmware service * @@ -4331,8 +4171,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_destroy_event_session * - * * * Purpose: destroys event session * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -4376,8 +4214,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_put_event_data * - * * * Purpose: read event data by id from xml and put to array of events * * * * Parameters: events - [IN/OUT] the array of parsed events * @@ -4495,8 +4331,6 @@ static int vmware_service_put_event_data(zbx_vector_ptr_t *events, zbx_id_xmlnod /****************************************************************************** * * - * Function: vmware_service_parse_event_data * - * * * Purpose: parse multiple events data * * * * Parameters: events - [IN/OUT] the array of parsed events * @@ -4632,8 +4466,6 @@ clean: /****************************************************************************** * * - * Function: vmware_service_get_event_data * - * * * Purpose: retrieves event data * * * * Parameters: service - [IN] the vmware service * @@ -4749,8 +4581,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_last_event_data * - * * * Purpose: retrieves data only last event * * * * Parameters: service - [IN] the vmware service * @@ -4854,8 +4684,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_clusters * - * * * Purpose: retrieves a list of vmware service clusters * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -5006,8 +4834,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_cluster_status * - * * * Purpose: retrieves status of the specified vmware cluster * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -5068,8 +4894,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_get_cluster_list * - * * * Purpose: creates list of vmware cluster objects * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -5136,8 +4960,6 @@ out: /****************************************************************************** * * - * Function: get_default_maxquerymetrics_for_vcenter * - * * * Purpose: get statically defined default value for maxquerymetrics for * * vcenter when it could not be retrieved from soap, depending on * * vcenter version (https://kb.vmware.com/s/article/2107096) * @@ -5159,8 +4981,6 @@ static unsigned int get_default_maxquerymetrics_for_vcenter(const zbx_vmware_ser /****************************************************************************** * * - * Function: vmware_service_get_maxquerymetrics * - * * * Purpose: get vpxd.stats.maxquerymetrics parameter from vcenter only * * * * Parameters: easyhandle - [IN] the CURL handle * @@ -5236,8 +5056,6 @@ out: } /****************************************************************************** * * - * Function: vmware_counters_add_new * - * * * Purpose: creates a new performance counter object in shared memory and * * adds to the specified vector * * * @@ -5262,8 +5080,6 @@ static void vmware_counters_add_new(zbx_vector_ptr_t *counters, zbx_uint64_t cou /****************************************************************************** * * - * Function: vmware_service_initialize * - * * * Purpose: initializes vmware service object * * * * Parameters: service - [IN] the vmware service * @@ -5364,8 +5180,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_add_perf_entity * - * * * Purpose: adds entity to vmware service performance entity list * * * * Parameters: service - [IN] the vmware service * @@ -5421,8 +5235,6 @@ static void vmware_service_add_perf_entity(zbx_vmware_service_t *service, const /****************************************************************************** * * - * Function: vmware_service_update_perf_entities * - * * * Purpose: adds new or remove old entities (hypervisors, virtual machines) * * from service performance entity list * * * @@ -5504,8 +5316,6 @@ static void vmware_service_update_perf_entities(zbx_vmware_service_t *service) /****************************************************************************** * * - * Function: vmware_service_update * - * * * Purpose: updates object with a new data from vmware service * * * * Parameters: service - [IN] the vmware service * @@ -5804,8 +5614,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_process_perf_entity_data * - * * * Purpose: updates vmware performance statistics data * * * * Parameters: perfdata - [OUT] the performance counter values * @@ -5895,8 +5703,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_parse_perf_data * - * * * Purpose: updates vmware performance statistics data * * * * Parameters: perfdata - [OUT] performance entity data * @@ -5951,8 +5757,6 @@ clean: /****************************************************************************** * * - * Function: vmware_perf_data_add_error * - * * * Purpose: adds error for the specified perf entity * * * * Parameters: perfdata - [OUT] the collected performance counter data * @@ -5982,8 +5786,6 @@ static void vmware_perf_data_add_error(zbx_vector_ptr_t *perfdata, const char *t /****************************************************************************** * * - * Function: vmware_service_copy_perf_data * - * * * Purpose: copies vmware performance statistics of specified service * * * * Parameters: service - [IN] the vmware service * @@ -6038,8 +5840,6 @@ static void vmware_service_copy_perf_data(zbx_vmware_service_t *service, zbx_vec /****************************************************************************** * * - * Function: vmware_service_retrieve_perf_counters * - * * * Purpose: retrieves performance counter values from vmware service * * * * Parameters: service - [IN] the vmware service * @@ -6172,8 +5972,6 @@ static void vmware_service_retrieve_perf_counters(zbx_vmware_service_t *service, /****************************************************************************** * * - * Function: vmware_service_update_perf * - * * * Purpose: updates vmware statistics data * * * * Parameters: service - [IN] the vmware service * @@ -6336,8 +6134,6 @@ out: /****************************************************************************** * * - * Function: vmware_service_remove * - * * * Purpose: removes vmware service * * * * Parameters: service - [IN] the vmware service * @@ -6368,8 +6164,6 @@ static void vmware_service_remove(zbx_vmware_service_t *service) /****************************************************************************** * * - * Function: zbx_vmware_get_service * - * * * Purpose: gets vmware service object * * * * Parameters: url - [IN] the vmware service URL * @@ -6451,8 +6245,6 @@ out: /****************************************************************************** * * - * Function: zbx_vmware_service_get_counterid * - * * * Purpose: gets vmware performance counter id and unit info by the path * * * * Parameters: service - [IN] the vmware service * @@ -6495,8 +6287,6 @@ out: /****************************************************************************** * * - * Function: zbx_vmware_service_add_perf_counter * - * * * Purpose: start monitoring performance counter of the specified entity * * * * Parameters: service - [IN] the vmware service * @@ -6549,8 +6339,6 @@ int zbx_vmware_service_add_perf_counter(zbx_vmware_service_t *service, const cha /****************************************************************************** * * - * Function: zbx_vmware_service_get_perf_entity * - * * * Purpose: gets performance entity by type and id * * * * Parameters: service - [IN] the vmware service * @@ -6577,8 +6365,6 @@ zbx_vmware_perf_entity_t *zbx_vmware_service_get_perf_entity(zbx_vmware_service_ /****************************************************************************** * * - * Function: zbx_vmware_init * - * * * Purpose: initializes vmware collector service * * * * Comments: This function must be called before worker threads are forked. * @@ -6624,8 +6410,6 @@ out: /****************************************************************************** * * - * Function: zbx_vmware_destroy * - * * * Purpose: destroys vmware collector service * * * ******************************************************************************/ @@ -6653,8 +6437,6 @@ void zbx_vmware_destroy(void) /****************************************************************************** * * - * Function: main_vmware_loop * - * * * Purpose: the vmware collector main loop * * * ******************************************************************************/ @@ -6816,8 +6598,6 @@ ZBX_THREAD_ENTRY(vmware_thread, args) /****************************************************************************** * * - * Function: zbx_vmware_lock * - * * * Purpose: locks vmware collector * * * ******************************************************************************/ @@ -6828,8 +6608,6 @@ void zbx_vmware_lock(void) /****************************************************************************** * * - * Function: zbx_vmware_unlock * - * * * Purpose: unlocks vmware collector * * * ******************************************************************************/ @@ -6840,8 +6618,6 @@ void zbx_vmware_unlock(void) /****************************************************************************** * * - * Function: zbx_vmware_get_statistics * - * * * Purpose: gets vmware collector statistics * * * * Parameters: stats - [OUT] the vmware collector statistics * @@ -6872,8 +6648,6 @@ int zbx_vmware_get_statistics(zbx_vmware_stats_t *stats) */ /****************************************************************************** * * - * Function: libxml_handle_error * - * * * Purpose: libxml2 callback function for error handle * * * * Parameters: user_data - [IN/OUT] the user context * @@ -6888,8 +6662,6 @@ static void libxml_handle_error(void *user_data, xmlErrorPtr err) /****************************************************************************** * * - * Function: zbx_xml_try_read_value * - * * * Purpose: retrieve a value from xml data and return status of operation * * * * Parameters: data - [IN] XML data * @@ -6960,8 +6732,6 @@ out: /****************************************************************************** * * - * Function: zbx_xml_read_node_value * - * * * Purpose: retrieve a value from xml data relative to the specified node * * * * Parameters: doc - [IN] the XML document * @@ -7012,8 +6782,6 @@ clean: /****************************************************************************** * * - * Function: zbx_xml_read_doc_value * - * * * Purpose: retrieve a value from xml document relative to the root node * * * * Parameters: xdoc - [IN] the XML document * @@ -7033,8 +6801,6 @@ static char *zbx_xml_read_doc_value(xmlDoc *xdoc, const char *xpath) /****************************************************************************** * * - * Function: zbx_xml_read_doc_num * - * * * Purpose: retrieves numeric xpath value * * * * Parameters: xdoc - [IN] xml document * @@ -7071,8 +6837,6 @@ out: /****************************************************************************** * * - * Function: zbx_xml_read_values * - * * * Purpose: populate array of values from a xml data * * * * Parameters: xdoc - [IN] XML document * diff --git a/tests/libs/zbxcommon/calculate_item_nextcheck.c b/tests/libs/zbxcommon/calculate_item_nextcheck.c index 38a11660b87..2df51b0ce1d 100644 --- a/tests/libs/zbxcommon/calculate_item_nextcheck.c +++ b/tests/libs/zbxcommon/calculate_item_nextcheck.c @@ -27,8 +27,6 @@ /****************************************************************************** * * - * Function: get_item_type * - * * * Purpose: get item type from its string representation * * * * Parameters: item_type - [IN] the item type * diff --git a/tests/libs/zbxcommon/replace_key_params_dyn.c b/tests/libs/zbxcommon/replace_key_params_dyn.c index 8164261bb10..bfa6144154d 100644 --- a/tests/libs/zbxcommon/replace_key_params_dyn.c +++ b/tests/libs/zbxcommon/replace_key_params_dyn.c @@ -26,8 +26,6 @@ /****************************************************************************** * * - * Function: replace_key_param_cb * - * * * Comments: auxiliary function for zbx_mock_test_entry() * * * ******************************************************************************/ diff --git a/tests/libs/zbxdbcache/dc_check_maintenance_period.c b/tests/libs/zbxdbcache/dc_check_maintenance_period.c index e04cb599e34..93925a6a124 100644 --- a/tests/libs/zbxdbcache/dc_check_maintenance_period.c +++ b/tests/libs/zbxdbcache/dc_check_maintenance_period.c @@ -89,8 +89,6 @@ static void get_maintenance(zbx_dc_maintenance_t *maintenance) /****************************************************************************** * * - * Function: zbx_mock_test_entry * - * * ******************************************************************************/ void zbx_mock_test_entry(void **state) { diff --git a/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c b/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c index 3a51f11a263..4c6e7de084b 100644 --- a/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c +++ b/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c @@ -35,8 +35,6 @@ /****************************************************************************** * * - * Function: zbx_mock_test_entry * - * * ******************************************************************************/ void zbx_mock_test_entry(void **state) { diff --git a/tests/libs/zbxdbcache/dc_item_poller_type_update.c b/tests/libs/zbxdbcache/dc_item_poller_type_update.c index 9d76d63b619..698691062fe 100644 --- a/tests/libs/zbxdbcache/dc_item_poller_type_update.c +++ b/tests/libs/zbxdbcache/dc_item_poller_type_update.c @@ -181,8 +181,6 @@ static void read_test(const zbx_mock_handle_t *handle, test_config_t *test_confi /****************************************************************************** * * - * Function: zbx_mock_test_entry * - * * ******************************************************************************/ void zbx_mock_test_entry(void **state) { diff --git a/tests/libs/zbxdbcache/dc_maintenance_match_tags.c b/tests/libs/zbxdbcache/dc_maintenance_match_tags.c index d1158931260..c9f7f81931d 100644 --- a/tests/libs/zbxdbcache/dc_maintenance_match_tags.c +++ b/tests/libs/zbxdbcache/dc_maintenance_match_tags.c @@ -117,8 +117,6 @@ static void get_maintenance(zbx_dc_maintenance_t *maintenance) /****************************************************************************** * * - * Function: zbx_mock_test_entry * - * * ******************************************************************************/ void zbx_mock_test_entry(void **state) { diff --git a/tests/libs/zbxdbcache/is_item_processed_by_server.c b/tests/libs/zbxdbcache/is_item_processed_by_server.c index f10fb24a86d..7353f2ee913 100644 --- a/tests/libs/zbxdbcache/is_item_processed_by_server.c +++ b/tests/libs/zbxdbcache/is_item_processed_by_server.c @@ -27,8 +27,6 @@ /****************************************************************************** * * - * Function: zbx_mock_test_entry * - * * ******************************************************************************/ void zbx_mock_test_entry(void **state) { diff --git a/tests/libs/zbxdbcache/zbx_vc_add_values.c b/tests/libs/zbxdbcache/zbx_vc_add_values.c index a83a8c7fee0..b5ddfb60b7a 100644 --- a/tests/libs/zbxdbcache/zbx_vc_add_values.c +++ b/tests/libs/zbxdbcache/zbx_vc_add_values.c @@ -31,8 +31,6 @@ extern zbx_uint64_t CONFIG_VALUE_CACHE_SIZE; /****************************************************************************** * * - * Function: zbx_mock_test_entry * - * * ******************************************************************************/ void zbx_mock_test_entry(void **state) { diff --git a/tests/libs/zbxdbcache/zbx_vc_get_value.c b/tests/libs/zbxdbcache/zbx_vc_get_value.c index aa7ea5bde3d..88fc8a2b379 100644 --- a/tests/libs/zbxdbcache/zbx_vc_get_value.c +++ b/tests/libs/zbxdbcache/zbx_vc_get_value.c @@ -31,8 +31,6 @@ extern zbx_uint64_t CONFIG_VALUE_CACHE_SIZE; /****************************************************************************** * * - * Function: zbx_mock_test_entry * - * * ******************************************************************************/ void zbx_mock_test_entry(void **state) { diff --git a/tests/libs/zbxdbcache/zbx_vc_get_values.c b/tests/libs/zbxdbcache/zbx_vc_get_values.c index cbff161a96e..2cb08c68cf1 100644 --- a/tests/libs/zbxdbcache/zbx_vc_get_values.c +++ b/tests/libs/zbxdbcache/zbx_vc_get_values.c @@ -31,8 +31,6 @@ extern zbx_uint64_t CONFIG_VALUE_CACHE_SIZE; /****************************************************************************** * * - * Function: zbx_mock_test_entry * - * * ******************************************************************************/ void zbx_mock_test_entry(void **state) { diff --git a/tests/libs/zbxhistory/zbx_history_get_values.c b/tests/libs/zbxhistory/zbx_history_get_values.c index ab4b03d4f56..23acce8b014 100644 --- a/tests/libs/zbxhistory/zbx_history_get_values.c +++ b/tests/libs/zbxhistory/zbx_history_get_values.c @@ -102,8 +102,6 @@ void __wrap_zbx_clean_events(void) /****************************************************************************** * * - * Function: zbx_vcmock_history_dump * - * * * Purpose: dumps history record vector contents to standard output * * * ******************************************************************************/ @@ -125,8 +123,6 @@ static void zbx_vcmock_history_dump(unsigned char value_type, const zbx_vector_h /****************************************************************************** * * - * Function: zbx_vcmock_read_history_value * - * * * Purpose: reads history value and timestamp from input data * * * * Parameters: hvalue - [IN] handle to the history record mapping * @@ -190,8 +186,6 @@ static void zbx_vcmock_read_history_value(zbx_mock_handle_t hvalue, unsigned cha /****************************************************************************** * * - * Function: zbx_vcmock_read_values * - * * * Purpose: reads historical values from input data * * * * Parameters: hdata - [IN] handle to the history values in input data * @@ -214,8 +208,6 @@ void zbx_vcmock_read_values(zbx_mock_handle_t hdata, unsigned char value_type, z /****************************************************************************** * * - * Function: zbx_vcmock_check_records * - * * * Purpose: Compares two history record vectors and throw assertion if either * * values or timestamps don't match * * * @@ -272,8 +264,6 @@ void zbx_vcmock_check_records(const char *prefix, unsigned char value_type, /****************************************************************************** * * - * Function: vc_history_record_compare_desc_func * - * * * Purpose: compares two cache values by their timestamps * * * * Parameters: d1 - [IN] the first value * @@ -297,8 +287,6 @@ static int vc_history_record_compare_desc_func(const zbx_history_record_t *d1, c /****************************************************************************** * * - * Function: zbx_mock_test_entry * - * * ******************************************************************************/ void zbx_mock_test_entry(void **state) { diff --git a/tests/libs/zbxprometheus/prometheus_filter_init.c b/tests/libs/zbxprometheus/prometheus_filter_init.c index 3e81057167f..0c20fbb000a 100644 --- a/tests/libs/zbxprometheus/prometheus_filter_init.c +++ b/tests/libs/zbxprometheus/prometheus_filter_init.c @@ -68,8 +68,6 @@ static void test_match(const char *prefix, zbx_mock_handle_t hmatch, zbx_prometh /****************************************************************************** * * - * Function: zbx_mock_test_entry * - * * ******************************************************************************/ void zbx_mock_test_entry(void **state) { diff --git a/tests/libs/zbxprometheus/prometheus_parse_row.c b/tests/libs/zbxprometheus/prometheus_parse_row.c index fbe4bdf02b3..391cd4946b6 100644 --- a/tests/libs/zbxprometheus/prometheus_parse_row.c +++ b/tests/libs/zbxprometheus/prometheus_parse_row.c @@ -28,8 +28,6 @@ /****************************************************************************** * * - * Function: zbx_mock_test_entry * - * * ******************************************************************************/ void zbx_mock_test_entry(void **state) { diff --git a/tests/mocks/valuecache/valuecache_mock.c b/tests/mocks/valuecache/valuecache_mock.c index 32b64d33bd9..1f83a0b94ac 100644 --- a/tests/mocks/valuecache/valuecache_mock.c +++ b/tests/mocks/valuecache/valuecache_mock.c @@ -73,8 +73,6 @@ static int history_compare(const void *d1, const void *d2) /****************************************************************************** * * - * Function: zbx_vcmock_read_history_value * - * * * Purpose: reads history value and timestamp from input data * * * * Parameters: hvalue - [IN] handle to the history record mapping * @@ -142,8 +140,6 @@ static void zbx_vcmock_read_history_value(zbx_mock_handle_t hvalue, unsigned cha /****************************************************************************** * * - * Function: zbx_vcmock_ds_read_item * - * * * Purpose: reads value cache data store item * * * * Parameters: hvalue - [IN] handle to the history record mapping * @@ -167,8 +163,6 @@ static void zbx_vcmock_ds_read_item(zbx_mock_handle_t hitem, zbx_vcmock_ds_item_ /****************************************************************************** * * - * Function: zbx_vcmock_ds_clone_record * - * * * Purpose: duplicates history record * * * * Parameters: src - [IN] source history record * @@ -207,8 +201,6 @@ static void zbx_vcmock_ds_clone_record(const zbx_history_record_t *src, unsigned /****************************************************************************** * * - * Function: zbx_vcmock_read_values * - * * * Purpose: reads historical values from input data * * * * Parameters: hdata - [IN] handle to the history values in input data * @@ -231,8 +223,6 @@ void zbx_vcmock_read_values(zbx_mock_handle_t hdata, unsigned char value_type, z /****************************************************************************** * * - * Function: zbx_vcmock_ds_init * - * * * Purpose: initializes history data storage * * * * Comments: History data storage is used to emulate history storage backend. * @@ -268,8 +258,6 @@ void zbx_vcmock_ds_init(void) /****************************************************************************** * * - * Function: zbx_vcmock_ds_destroy * - * * * Purpose: destroys history data storage * * * ******************************************************************************/ @@ -287,8 +275,6 @@ void zbx_vcmock_ds_destroy(void) /****************************************************************************** * * - * Function: zbx_vcmock_history_dump * - * * * Purpose: dumps history record vector contents to standard output * * * ******************************************************************************/ @@ -310,8 +296,6 @@ static void zbx_vcmock_history_dump(unsigned char value_type, const zbx_vector_h /****************************************************************************** * * - * Function: zbx_vcmock_ds_dump * - * * * Purpose: dumps history data store to standard output * * * ******************************************************************************/ @@ -330,8 +314,6 @@ void zbx_vcmock_ds_dump(void) /****************************************************************************** * * - * Function: zbx_vcmock_ds_first_item * - * * * Purpose: returns first item in value cache mock data source * * * ******************************************************************************/ @@ -345,8 +327,6 @@ zbx_vcmock_ds_item_t *zbx_vcmock_ds_first_item(void) /****************************************************************************** * * - * Function: zbx_vcmock_get_cache_mode * - * * * Purpose: converts value cache mode from text format * * * ******************************************************************************/ @@ -364,8 +344,6 @@ int zbx_vcmock_str_to_cache_mode(const char *mode) /****************************************************************************** * * - * Function: zbx_vcmock_str_to_item_status * - * * * Purpose: converts value cache item status from text format * * * ******************************************************************************/ @@ -379,8 +357,6 @@ int zbx_vcmock_str_to_item_status(const char *str) /****************************************************************************** * * - * Function: zbx_vcmock_check_records * - * * * Purpose: Compares two history record vectors and throw assertion if either * * values or timestamps don't match * * * @@ -437,8 +413,6 @@ void zbx_vcmock_check_records(const char *prefix, unsigned char value_type, /****************************************************************************** * * - * Function: zbx_vcmock_get_dc_history * - * * * Purpose: reads ZBX_DC_HISTORY vector from input data * * * * Parameters: handle - [IN] the history data handle in input data * @@ -477,8 +451,6 @@ void zbx_vcmock_get_dc_history(zbx_mock_handle_t handle, zbx_vector_ptr_t *histo /****************************************************************************** * * - * Function: zbx_vcmock_free_dc_history * - * * * Purpose: frees ZBX_DC_HISTORY structure * * * ******************************************************************************/ @@ -708,8 +680,6 @@ int __wrap_zbx_elastic_version_get(void) /****************************************************************************** * * - * Function: zbx_vcmock_set_available_mem * - * * * Purpose: sets the available memory for the wrapped memory allocator * * * ******************************************************************************/ @@ -720,8 +690,6 @@ void zbx_vcmock_set_available_mem(size_t size) /****************************************************************************** * * - * Function: zbx_vcmock_mem_get_available * - * * * Purpose: retrieves the memory available in the wrapped memory allocator * * * ******************************************************************************/ @@ -732,8 +700,6 @@ size_t zbx_vcmock_get_available_mem(void) /****************************************************************************** * * - * Function: zbx_vcmock_set_cache_size * - * * * Purpose: sets the available size in value cache if the specified key is * * present in input data * * * @@ -759,8 +725,6 @@ void zbx_vcmock_set_cache_size(zbx_mock_handle_t hitem, const char *key) /****************************************************************************** * * - * Function: zbx_vcmock_get_request_params * - * * * Purpose: gets value cache precache or requests parameters from input data * * * ******************************************************************************/ @@ -782,8 +746,6 @@ void zbx_vcmock_get_request_params(zbx_mock_handle_t handle, zbx_uint64_t *itemi /****************************************************************************** * * - * Function: zbx_vcmock_set_mode * - * * * Purpose: sets value cache mode if the specified key is present in input * * data * * * @@ -824,8 +786,6 @@ void __wrap_zbx_timespec(zbx_timespec_t *ts) /****************************************************************************** * * - * Function: zbx_vcmock_set_time * - * * * Purpose: sets the current time. The key must be present in input data or * * the test case will fail * * * @@ -843,8 +803,6 @@ void zbx_vcmock_set_time(zbx_mock_handle_t hitem, const char *key) /****************************************************************************** * * - * Function: zbx_vcmock_get_ts * - * * * Purpose: returns the mocked current time * * * ******************************************************************************/ diff --git a/tests/zabbix_server/preprocessor/zbx_item_preproc.c b/tests/zabbix_server/preprocessor/zbx_item_preproc.c index f0308e71393..325ac0b3fe4 100644 --- a/tests/zabbix_server/preprocessor/zbx_item_preproc.c +++ b/tests/zabbix_server/preprocessor/zbx_item_preproc.c @@ -148,8 +148,6 @@ static void read_step(const char *path, zbx_preproc_op_t *op) /****************************************************************************** * * - * Function: is_step_supported * - * * * Purpose: checks if the preprocessing step is supported based on build * * configuration or other settings * * * diff --git a/tests/zbxmockdata.c b/tests/zbxmockdata.c index 7879b4a18bb..9ada65be39f 100644 --- a/tests/zbxmockdata.c +++ b/tests/zbxmockdata.c @@ -207,8 +207,6 @@ static void zbx_yaml_replace_node_rec(yaml_document_t *doc, yaml_node_t *parent, /****************************************************************************** * * - * Function: zbx_yaml_replace_node * - * * * Purpose: replaces node occurrences in mappings and sequences with the new * * node index * * * @@ -240,8 +238,6 @@ static void zbx_yaml_replace_node(yaml_document_t *doc, int old_index, int new_i /****************************************************************************** * * - * Function: zbx_yaml_include_rec * - * * * Purpose: recursively include yaml documents from first level 'include' * * mapping scalar value or sequence * * * @@ -281,8 +277,6 @@ static void zbx_yaml_include_rec(yaml_document_t *doc, int *index) /****************************************************************************** * * - * Function: zbx_yaml_check_include * - * * * Purpose: includes another yaml document if include tag is set * * * * Comments: The document is included by recursively copying its contents * @@ -977,8 +971,6 @@ zbx_mock_error_t zbx_mock_int(zbx_mock_handle_t object, int *value) /****************************************************************************** * * - * Function: zbx_mock_string_ex * - * * * Purpose: return string object contents * * * * Comments: The object can be either scalar value or a mapping. In the first * diff --git a/tests/zbxmockjson.c b/tests/zbxmockjson.c index fa226da08df..99f9c7d51a1 100644 --- a/tests/zbxmockjson.c +++ b/tests/zbxmockjson.c @@ -154,8 +154,6 @@ static void json_flatten_contents(struct zbx_json_parse *jp, const char *prefix, /****************************************************************************** * * - * Function: json_flatten * - * * * Purpose: flattens json into vector of key (json path), value pairs, sorted * * by keys * * * @@ -168,8 +166,6 @@ static void json_flatten(struct zbx_json_parse *jp, zbx_vector_ptr_pair_t *props /****************************************************************************** * * - * Function: __zbx_mock_assert_json_eq * - * * * Purpose: compares returned json with expected * * * * Comments: The comparison is done by first flattening both jsons into * diff --git a/tests/zbxmocktime.c b/tests/zbxmocktime.c index 1c8c621b28e..2a27b659042 100644 --- a/tests/zbxmocktime.c +++ b/tests/zbxmocktime.c @@ -37,8 +37,6 @@ /****************************************************************************** * * - * Function: ts_get_component_end * - * * * Purpose: finds the next character after numeric time component * * * * Parameters: text - [IN] the text * @@ -59,8 +57,6 @@ static const char *ts_get_component_end(const char *text) /****************************************************************************** * * - * Function: ts_get_date * - * * * Purpose: parses year, month and day from date component having * * YYYY-MM-DD format * * * @@ -116,8 +112,6 @@ static zbx_mock_error_t ts_get_date(const char *text, int *year, int *month, int /****************************************************************************** * * - * Function: ts_get_time * - * * * Purpose: parses hours, minutes and seconds from time component having * * HH:MM:SS format * * * @@ -173,8 +167,6 @@ static zbx_mock_error_t ts_get_time(const char *text, int *hours, int *minutes, /****************************************************************************** * * - * Function: ts_get_ns * - * * * Purpose: parses nanoseconds from time component having .NNNNNNNNN format * * * * Parameters: text - [IN] the text * @@ -209,8 +201,6 @@ static zbx_mock_error_t ts_get_ns(const char *text, int *ns, const char **pnext) /****************************************************************************** * * - * Function: ts_get_tz * - * * * Purpose: parses timezone offset seconds from timezone component having * * (+|-)HH[:MM] format * * * @@ -254,8 +244,6 @@ static zbx_mock_error_t ts_get_tz(const char *text, int *sec, const char **pnext /****************************************************************************** * * - * Function: zbx_time_to_localtime * - * * * Purpose: converts timestamp to a broken-down time representation and * * timezone offset (in seconds). * * * @@ -294,8 +282,6 @@ static zbx_mock_error_t zbx_time_to_localtime(time_t timestamp, struct tm *local /****************************************************************************** * * - * Function: zbx_tz_format * - * * * Purpose: formats timezone to +hh:mm format * * * * Parameters: buffer - [OUT] the output buffer * @@ -334,8 +320,6 @@ zbx_mock_time_parser_state_t; /****************************************************************************** * * - * Function: zbx_strtime_to_timespec * - * * * Purpose: converts YAML space separated timestamp having * * YYYY-MM-DD hh:mm:ss.nnnnnnnnn TZ format to zabbix timespec * * * @@ -489,8 +473,6 @@ zbx_mock_error_t zbx_strtime_to_timespec(const char *strtime, zbx_timespec_t *ts /****************************************************************************** * * - * Function: zbx_time_to_strtime * - * * * Purpose: converts time to YAML space separated timestamp in * * YYYY-MM-DD hh:mm:ss TZ format * * * @@ -531,8 +513,6 @@ zbx_mock_error_t zbx_time_to_strtime(time_t timestamp, char *buffer, size_t size /****************************************************************************** * * - * Function: zbx_timespec_to_strtime * - * * * Purpose: converts timespec (seconds + nanoseconds) to YAML space separated * * timestamp in YYYY-MM-DD hh:mm:ss.nnnnnnnnn TZ format * * * diff --git a/tests/zbxmockutil.c b/tests/zbxmockutil.c index 783ade0ed61..e4c60f5015f 100644 --- a/tests/zbxmockutil.c +++ b/tests/zbxmockutil.c @@ -82,8 +82,6 @@ zbx_mock_handle_t zbx_mock_get_object_member_handle(zbx_mock_handle_t object, co /****************************************************************************** * * - * Function: zbx_mock_str_to_token_type * - * * * Purpose: converts token type from text format * * * ******************************************************************************/ @@ -113,8 +111,6 @@ void zbx_mock_str_to_token_type(const char *str, int *out) /****************************************************************************** * * - * Function: zbx_mock_str_to_value_type * - * * * Purpose: converts item value type from text format * * * ******************************************************************************/ @@ -141,8 +137,6 @@ unsigned char zbx_mock_str_to_value_type(const char *str) /****************************************************************************** * * - * Function: zbx_mock_str_to_item_type * - * * * Purpose: converts item type from text format * * * ******************************************************************************/ @@ -204,8 +198,6 @@ int zbx_mock_str_to_item_type(const char *str) /****************************************************************************** * * - * Function: zbx_mock_str_to_variant * - * * * Purpose: converts variant from text format * * * ******************************************************************************/ @@ -305,8 +297,6 @@ int zbx_mock_get_object_member_int(zbx_mock_handle_t object, const char *name) /****************************************************************************** * * - * Function: zbx_mock_str_to_return_code * - * * * Purpose: converts common function return code from text format * * * ******************************************************************************/ @@ -348,8 +338,6 @@ int zbx_mock_str_to_return_code(const char *str) /****************************************************************************** * * - * Function: zbx_mock_str_to_value_type * - * * * Purpose: converts item value type from text format * * * ******************************************************************************/ |