diff options
| author | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2020-06-02 16:14:03 +0300 |
|---|---|---|
| committer | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2020-06-02 16:14:18 +0300 |
| commit | 7417609a882af4929821c23eb8aca22cf3b6ad80 (patch) | |
| tree | b86e8c74570a8b9c8520dcdabfde76f13af00bcc | |
| parent | 1d996822fdbccf68698a319924ae003bec93c692 (diff) | |
...G...PS. [DEV-1570] fixed multiple funcArgNamesDifferent cppcheck warnings
(cherry picked from commit fe50c591d19db5ee990a680ee7bc9b7eb224999b)
38 files changed, 82 insertions, 83 deletions
diff --git a/include/common.h b/include/common.h index c876c83c166..ec257c99ad9 100644 --- a/include/common.h +++ b/include/common.h @@ -553,7 +553,7 @@ const char *get_program_type_string(unsigned char program_type); #define ZBX_PROCESS_TYPE_ALERTSYNCER 30 #define ZBX_PROCESS_TYPE_COUNT 31 /* number of process types */ #define ZBX_PROCESS_TYPE_UNKNOWN 255 -const char *get_process_type_string(unsigned char process_type); +const char *get_process_type_string(unsigned char proc_type); int get_process_type_by_name(const char *proc_type_str); /* maintenance */ @@ -991,7 +991,7 @@ char *string_replace(const char *str, const char *sub_str1, const char *sub_str2 int is_double_suffix(const char *str, unsigned char flags); int is_double(const char *str, double *value); #define ZBX_LENGTH_UNLIMITED 0x7fffffff -int is_time_suffix(const char *c, int *value, int length); +int is_time_suffix(const char *str, int *value, int length); int is_uint_n_range(const char *str, size_t n, void *value, size_t size, zbx_uint64_t min, zbx_uint64_t max); int is_hex_n_range(const char *str, size_t n, void *value, size_t size, zbx_uint64_t min, zbx_uint64_t max); @@ -1034,9 +1034,9 @@ char *zbx_str_printable_dyn(const char *text); #define ZBX_WHITESPACE " \t\r\n" #define zbx_remove_whitespace(str) zbx_remove_chars(str, ZBX_WHITESPACE) void del_zeros(char *s); -int get_param(const char *param, int num, char *buf, size_t max_len, zbx_request_parameter_type_t *type); -int num_param(const char *param); -char *get_param_dyn(const char *param, int num, zbx_request_parameter_type_t *type); +int get_param(const char *p, int num, char *buf, size_t max_len, zbx_request_parameter_type_t *type); +int num_param(const char *p); +char *get_param_dyn(const char *p, int num, zbx_request_parameter_type_t *type); /****************************************************************************** * * @@ -1217,11 +1217,11 @@ typedef struct } zbx_iprange_t; -int iprange_parse(zbx_iprange_t *range, const char *address); -void iprange_first(const zbx_iprange_t *range, int *address); -int iprange_next(const zbx_iprange_t *range, int *address); -int iprange_validate(const zbx_iprange_t *range, const int *address); -zbx_uint64_t iprange_volume(const zbx_iprange_t *range); +int iprange_parse(zbx_iprange_t *iprange, const char *address); +void iprange_first(const zbx_iprange_t *iprange, int *address); +int iprange_next(const zbx_iprange_t *iprange, int *address); +int iprange_validate(const zbx_iprange_t *iprange, const int *address); +zbx_uint64_t iprange_volume(const zbx_iprange_t *iprange); /* time related functions */ char *zbx_age2str(int age); @@ -1351,7 +1351,7 @@ char *zbx_user_macro_quote_context_dyn(const char *context, int force_quote); #define ZBX_SESSION_ACTIVE 0 #define ZBX_SESSION_PASSIVE 1 -char *zbx_dyn_escape_shell_single_quote(const char *text); +char *zbx_dyn_escape_shell_single_quote(const char *arg); #define ZBX_DO_NOT_SEND_RESPONSE 0 #define ZBX_SEND_RESPONSE 1 @@ -1602,8 +1602,8 @@ zbx_variant_t; void zbx_variant_clear(zbx_variant_t *value); void zbx_variant_set_none(zbx_variant_t *value); void zbx_variant_set_str(zbx_variant_t *value, char *text); -void zbx_variant_set_dbl(zbx_variant_t *value, double dbl); -void zbx_variant_set_ui64(zbx_variant_t *value, zbx_uint64_t ui64); +void zbx_variant_set_dbl(zbx_variant_t *value, double value_dbl); +void zbx_variant_set_ui64(zbx_variant_t *value, zbx_uint64_t value_ui64); void zbx_variant_set_bin(zbx_variant_t *value, void *value_bin); void zbx_variant_copy(zbx_variant_t *value, const zbx_variant_t *source); int zbx_variant_set_numeric(zbx_variant_t *value, const char *text); diff --git a/include/db.h b/include/db.h index f7589a43bb2..ef10133d1a8 100644 --- a/include/db.h +++ b/include/db.h @@ -559,8 +559,8 @@ typedef struct } zbx_trigger_diff_t; -void zbx_process_triggers(zbx_vector_ptr_t *triggers, zbx_vector_ptr_t *diffs); -void zbx_db_save_trigger_changes(const zbx_vector_ptr_t *diffs); +void zbx_process_triggers(zbx_vector_ptr_t *triggers, zbx_vector_ptr_t *trigger_diff); +void zbx_db_save_trigger_changes(const zbx_vector_ptr_t *trigger_diff); void zbx_trigger_diff_free(zbx_trigger_diff_t *diff); void zbx_append_trigger_diff(zbx_vector_ptr_t *trigger_diff, zbx_uint64_t triggerid, unsigned char priority, zbx_uint64_t flags, unsigned char value, unsigned char state, int lastchange, const char *error); @@ -637,7 +637,7 @@ zbx_conn_flags_t; zbx_uint64_t DBadd_interface(zbx_uint64_t hostid, unsigned char type, unsigned char useip, const char *ip, const char *dns, unsigned short port, zbx_conn_flags_t flags); -void DBadd_interface_snmp(const zbx_uint64_t interfaceid, const unsigned char type, const unsigned char bulk, +void DBadd_interface_snmp(const zbx_uint64_t interfaceid, const unsigned char version, const unsigned char bulk, const char *community, const char *securityname, const unsigned char securitylevel, const char *authpassphrase, const char *privpassphrase, const unsigned char authprotocol, const unsigned char privprotocol, const char *contextname); diff --git a/include/dbcache.h b/include/dbcache.h index 60cd5b7e770..a8d07496857 100644 --- a/include/dbcache.h +++ b/include/dbcache.h @@ -747,14 +747,14 @@ void DCget_autoregistration_psk(char *psk_identity_buf, size_t psk_identity_buf_ #define ZBX_MACRO_SECRET_MASK "******" -void DCget_user_macro(const zbx_uint64_t *hostids, int host_num, const char *macro, char **replace_to); +void DCget_user_macro(const zbx_uint64_t *hostids, int hostids_num, const char *macro, char **replace_to); char *DCexpression_expand_user_macros(const char *expression); int DChost_activate(zbx_uint64_t hostid, unsigned char agent_type, const zbx_timespec_t *ts, zbx_agent_availability_t *in, zbx_agent_availability_t *out); -int DChost_deactivate(zbx_uint64_t hostid, unsigned char agent, const zbx_timespec_t *ts, - zbx_agent_availability_t *in, zbx_agent_availability_t *out, const char *error); +int DChost_deactivate(zbx_uint64_t hostid, unsigned char agent_type, const zbx_timespec_t *ts, + zbx_agent_availability_t *in, zbx_agent_availability_t *out, const char *error_msg); #define ZBX_QUEUE_FROM_DEFAULT 6 /* default lower limit for delay (in seconds) */ #define ZBX_QUEUE_TO_INFINITY -1 /* no upper limit for delay */ @@ -807,7 +807,7 @@ int DCget_hosts_availability(zbx_vector_ptr_t *hosts, int *ts); void DCtouch_hosts_availability(const zbx_vector_uint64_t *hostids); void zbx_host_availability_init(zbx_host_availability_t *availability, zbx_uint64_t hostid); -void zbx_host_availability_clean(zbx_host_availability_t *availability); +void zbx_host_availability_clean(zbx_host_availability_t *ha); void zbx_host_availability_free(zbx_host_availability_t *availability); int zbx_host_availability_is_set(const zbx_host_availability_t *ha); @@ -856,7 +856,7 @@ typedef struct zbx_hc_item_t; void zbx_free_tag(zbx_tag_t *tag); -void zbx_free_item_tag(zbx_item_tag_t *host_tag); +void zbx_free_item_tag(zbx_item_tag_t *item_tag); int zbx_dc_get_active_proxy_by_name(const char *name, DC_PROXY *proxy, char **error); void zbx_dc_update_proxy_version(zbx_uint64_t hostid, int version); @@ -894,7 +894,7 @@ zbx_trigger_dep_t; void zbx_dc_get_trigger_dependencies(const zbx_vector_uint64_t *triggerids, zbx_vector_ptr_t *deps); -void zbx_dc_reschedule_items(const zbx_vector_uint64_t *itemids, int now, zbx_uint64_t *proxy_hostids); +void zbx_dc_reschedule_items(const zbx_vector_uint64_t *itemids, int nextcheck, zbx_uint64_t *proxy_hostids); void zbx_dc_get_timer_triggerids(zbx_vector_uint64_t *triggerids, int now, int limit); void zbx_dc_get_timer_triggers_by_triggerids(zbx_hashset_t *trigger_info, zbx_vector_ptr_t *trigger_order, @@ -975,7 +975,8 @@ int zbx_lld_macro_value_by_name(const struct zbx_json_parse *jp_row, const zbx_v const char *macro, char **value); int zbx_lld_macro_paths_compare(const void *d1, const void *d2); -void zbx_dc_get_item_tags_by_functionids(const zbx_uint64_t *functionids, size_t functionids_num, zbx_vector_ptr_t *host_tags); +void zbx_dc_get_item_tags_by_functionids(const zbx_uint64_t *functionids, size_t functionids_num, + zbx_vector_ptr_t *item_tags); unsigned char zbx_dc_set_macro_env(unsigned char env); diff --git a/include/perfmon.h b/include/perfmon.h index 52b1c704269..00704c97315 100644 --- a/include/perfmon.h +++ b/include/perfmon.h @@ -89,8 +89,8 @@ PDH_STATUS calculate_counter_value(const char *function, const char *counterpath wchar_t *get_counter_name(DWORD pdhIndex); int check_counter_path(char *counterPath, int convert_from_numeric); int init_builtin_counter_indexes(void); -DWORD get_builtin_object_index(zbx_builtin_counter_ref_t ref); -DWORD get_builtin_counter_index(zbx_builtin_counter_ref_t ref); +DWORD get_builtin_object_index(zbx_builtin_counter_ref_t counter_ref); +DWORD get_builtin_counter_index(zbx_builtin_counter_ref_t counter_ref); wchar_t *get_all_counter_names(HKEY reg_key, wchar_t *reg_value_name); #define get_builtin_object_name(ctr) get_counter_name(get_builtin_object_index(ctr)) diff --git a/include/proxy.h b/include/proxy.h index 9ac9d41a12f..19702eab7a6 100644 --- a/include/proxy.h +++ b/include/proxy.h @@ -42,8 +42,8 @@ void update_proxy_lastaccess(const zbx_uint64_t hostid, time_t last_access); int get_proxyconfig_data(zbx_uint64_t proxy_hostid, struct zbx_json *j, char **error); void process_proxyconfig(struct zbx_json_parse *jp_data); -int get_host_availability_data(struct zbx_json *j, int *ts); -int process_host_availability(struct zbx_json_parse *jp_data, char **error); +int get_host_availability_data(struct zbx_json *json, int *ts); +int process_host_availability(struct zbx_json_parse *jp, char **error); int proxy_get_hist_data(struct zbx_json *j, zbx_uint64_t *lastid, int *more); int proxy_get_dhis_data(struct zbx_json *j, zbx_uint64_t *lastid, int *more); diff --git a/include/sysinfo.h b/include/sysinfo.h index c6eeb1b6897..51ece244f63 100644 --- a/include/sysinfo.h +++ b/include/sysinfo.h @@ -213,7 +213,7 @@ void free_key_access_rules(void); int process(const char *in_command, unsigned flags, AGENT_RESULT *result); -int add_user_parameter(const char *key, char *command, char *error, size_t max_error_len); +int add_user_parameter(const char *itemkey, char *command, char *error, size_t max_error_len); int add_user_module(const char *key, int (*function)(void)); void test_parameters(void); void test_parameter(const char *key); diff --git a/include/zbxalgo.h b/include/zbxalgo.h index bcb72d2c13b..c51e84b9a7e 100644 --- a/include/zbxalgo.h +++ b/include/zbxalgo.h @@ -339,7 +339,7 @@ void zbx_str_free(char *data); void uinc128_64(zbx_uint128_t *base, zbx_uint64_t value); void uinc128_128(zbx_uint128_t *base, const zbx_uint128_t *value); -void udiv128_64(zbx_uint128_t *result, const zbx_uint128_t *base, zbx_uint64_t value); +void udiv128_64(zbx_uint128_t *result, const zbx_uint128_t *dividend, zbx_uint64_t value); void umul64_64(zbx_uint128_t *result, zbx_uint64_t value, zbx_uint64_t factor); unsigned int zbx_isqrt32(unsigned int value); diff --git a/include/zbxdb.h b/include/zbxdb.h index 2e5ddc745fa..a3f7871bcb3 100644 --- a/include/zbxdb.h +++ b/include/zbxdb.h @@ -79,13 +79,13 @@ zbx_db_value_t; # define ZBX_ROW_DL ";\n" #endif -int zbx_db_init(const char *dbname, const char *const db_schema, char **error); +int zbx_db_init(const char *dbname, const char *const dbschema, char **error); void zbx_db_deinit(void); void zbx_db_init_autoincrement_options(void); int zbx_db_connect(char *host, char *user, char *password, char *dbname, char *dbschema, char *dbsocket, int port, - char *tlsmode, char *cert, char *key, char *ca, char *cipher, char *cipher_13); + char *tls_connect, char *cert, char *key, char *ca, char *cipher, char *cipher_13); void zbx_db_close(void); int zbx_db_begin(void); diff --git a/include/zbxexec.h b/include/zbxexec.h index f0fdd9ed982..8af729d850a 100644 --- a/include/zbxexec.h +++ b/include/zbxexec.h @@ -23,7 +23,7 @@ #define ZBX_EXIT_CODE_CHECKS_DISABLED 0 #define ZBX_EXIT_CODE_CHECKS_ENABLED 1 -int zbx_execute(const char *command, char **buffer, char *error, size_t max_error_len, int timeout, +int zbx_execute(const char *command, char **output, char *error, size_t max_error_len, int timeout, unsigned char flag); int zbx_execute_nowait(const char *command); diff --git a/include/zbxhistory.h b/include/zbxhistory.h index f89ea38402d..38dec2f89c5 100644 --- a/include/zbxhistory.h +++ b/include/zbxhistory.h @@ -50,7 +50,7 @@ void zbx_history_value_print(char *buffer, size_t size, const history_value_t *v int zbx_history_init(char **error); void zbx_history_destroy(void); -int zbx_history_add_values(const zbx_vector_ptr_t *values); +int zbx_history_add_values(const zbx_vector_ptr_t *history); int zbx_history_get_values(zbx_uint64_t itemid, int value_type, int start, int count, int end, zbx_vector_history_record_t *values); diff --git a/include/zbxjson.h b/include/zbxjson.h index f1845f0a070..c311cc39f3a 100644 --- a/include/zbxjson.h +++ b/include/zbxjson.h @@ -272,7 +272,7 @@ int zbx_json_value_by_name(const struct zbx_json_parse *jp, const char *name, c zbx_json_type_t *type); int zbx_json_value_by_name_dyn(const struct zbx_json_parse *jp, const char *name, char **string, size_t *string_alloc, zbx_json_type_t *type); -int zbx_json_brackets_open(const char *p, struct zbx_json_parse *out); +int zbx_json_brackets_open(const char *p, struct zbx_json_parse *jp); int zbx_json_brackets_by_name(const struct zbx_json_parse *jp, const char *name, struct zbx_json_parse *out); int zbx_json_object_is_empty(const struct zbx_json_parse *jp); int zbx_json_count(const struct zbx_json_parse *jp); diff --git a/include/zbxprometheus.h b/include/zbxprometheus.h index f9a3f92572a..360231e9911 100644 --- a/include/zbxprometheus.h +++ b/include/zbxprometheus.h @@ -20,9 +20,9 @@ #ifndef __zbxprometheus_h__ #define __zbxprometheus_h__ -int zbx_prometheus_pattern(const char *data, const char *filter_data, const char *output, - char **value, char **err); -int zbx_prometheus_to_json(const char *data, const char *filter_data, char **value, char **err); +int zbx_prometheus_pattern(const char *data, const char *filter_data, const char *output, char **value, + char **error); +int zbx_prometheus_to_json(const char *data, const char *filter_data, char **value, char **error); int zbx_prometheus_validate_filter(const char *pattern, char **error); int zbx_prometheus_validate_label(const char *label); diff --git a/include/zbxregexp.h b/include/zbxregexp.h index f849fc8ab8c..a25e56e2581 100644 --- a/include/zbxregexp.h +++ b/include/zbxregexp.h @@ -38,7 +38,7 @@ zbx_expression_t; /* regular expressions */ int zbx_regexp_compile(const char *pattern, zbx_regexp_t **regexp, const char **err_msg_static); -int zbx_regexp_compile_ext(const char *pattern, zbx_regexp_t **regexp, int flags, const char **error); +int zbx_regexp_compile_ext(const char *pattern, zbx_regexp_t **regexp, int flags, const char **err_msg_static); void zbx_regexp_free(zbx_regexp_t *regexp); int zbx_regexp_match_precompiled(const char *string, const zbx_regexp_t *regexp); char *zbx_regexp_match(const char *string, const char *pattern, int *len); diff --git a/include/zbxself.h b/include/zbxself.h index be6465845c2..eec30149e5b 100644 --- a/include/zbxself.h +++ b/include/zbxself.h @@ -44,15 +44,15 @@ typedef struct } zbx_process_info_t; -int get_process_type_forks(unsigned char process_type); +int get_process_type_forks(unsigned char proc_type); #ifndef _WINDOWS int init_selfmon_collector(char **error); void free_selfmon_collector(void); void update_selfmon_counter(unsigned char state); void collect_selfmon_stats(void); -void get_selfmon_stats(unsigned char process_type, unsigned char aggr_func, int process_num, - unsigned char state, double *value); +void get_selfmon_stats(unsigned char proc_type, unsigned char aggr_func, int proc_num, unsigned char state, + double *value); int zbx_get_all_process_stats(zbx_process_info_t *stats); void zbx_sleep_loop(int sleeptime); void zbx_sleep_forever(void); diff --git a/include/zbxserver.h b/include/zbxserver.h index 4b0a2259930..f05ff721123 100644 --- a/include/zbxserver.h +++ b/include/zbxserver.h @@ -59,7 +59,7 @@ char *zbx_dc_expand_user_macros_in_expression(const char *text, zbx_uint64_t *ho int get_N_functionid(const char *expression, int N_functionid, zbx_uint64_t *functionid, const char **end); void get_functionids(zbx_vector_uint64_t *functionids, const char *expression); -int evaluate_function(char **value, DC_ITEM *item, const char *function, const char *parameters, +int evaluate_function(char **value, DC_ITEM *item, const char *function, const char *parameter, const zbx_timespec_t *ts, char **error); int substitute_simple_macros(zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event, @@ -91,10 +91,10 @@ void get_trigger_expression_constant(const char *expression, const zbx_token_ref int substitute_lld_macros(char **data, const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macro_paths, int flags, char *error, size_t max_error_len); int substitute_key_macros(char **data, zbx_uint64_t *hostid, DC_ITEM *dc_item, const struct zbx_json_parse *jp_row, - const zbx_vector_ptr_t *lld_macro_paths, int macro_type, char *error, size_t mexerrlen); + const zbx_vector_ptr_t *lld_macro_paths, int macro_type, char *error, size_t maxerrlen); int substitute_key_macros_unmasked(char **data, zbx_uint64_t *hostid, DC_ITEM *dc_item, const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macro_paths, int macro_type, - char *error, size_t mexerrlen); + char *error, size_t maxerrlen); int substitute_function_lld_param(const char *e, size_t len, unsigned char key_in_param, char **exp, size_t *exp_alloc, size_t *exp_offset, const struct zbx_json_parse *jp_row, const zbx_vector_ptr_t *lld_macro_paths, char *error, size_t max_error_len); diff --git a/include/zbxtasks.h b/include/zbxtasks.h index 9602158fbf2..d2b409d0752 100644 --- a/include/zbxtasks.h +++ b/include/zbxtasks.h @@ -124,12 +124,12 @@ zbx_tm_task_t *zbx_tm_task_create(zbx_uint64_t taskid, unsigned char type, unsig void zbx_tm_task_clear(zbx_tm_task_t *task); void zbx_tm_task_free(zbx_tm_task_t *task); -zbx_tm_remote_command_t *zbx_tm_remote_command_create(int commandtype, const char *command, int execute_on, int port, +zbx_tm_remote_command_t *zbx_tm_remote_command_create(int command_type, const char *command, int execute_on, int port, int authtype, const char *username, const char *password, const char *publickey, const char *privatekey, zbx_uint64_t parent_taskid, zbx_uint64_t hostid, zbx_uint64_t alertid); zbx_tm_remote_command_result_t *zbx_tm_remote_command_result_create(zbx_uint64_t parent_taskid, int status, - const char *error); + const char *info); zbx_tm_check_now_t *zbx_tm_check_now_create(zbx_uint64_t itemid); diff --git a/src/libs/zbxcommon/str.c b/src/libs/zbxcommon/str.c index 612ac787029..be435e7716d 100644 --- a/src/libs/zbxcommon/str.c +++ b/src/libs/zbxcommon/str.c @@ -1278,7 +1278,7 @@ int cmp_key_id(const char *key_1, const char *key_2) * * * Purpose: Returns process name * * * - * Parameters: process_type - [IN] process type; ZBX_PROCESS_TYPE_* * + * Parameters: proc_type - [IN] process type; ZBX_PROCESS_TYPE_* * * * * Author: Alexander Vladishev * * * @@ -4627,7 +4627,7 @@ char *zbx_expression_extract_constant(const char *src, const zbx_strloc_t *loc) * Purpose: find number of parameters in parameter list * * * * Parameters: * - * param - parameter list * + * p - [IN] parameter list * * * * Return value: number of parameters (starting from 1) or * * 0 if syntax error * diff --git a/src/libs/zbxdbcache/dbconfig.c b/src/libs/zbxdbcache/dbconfig.c index 89403c9e93e..3941d659989 100644 --- a/src/libs/zbxdbcache/dbconfig.c +++ b/src/libs/zbxdbcache/dbconfig.c @@ -8661,7 +8661,7 @@ void zbx_host_availability_init(zbx_host_availability_t *availability, zbx_uint6 * * * Purpose: releases resources allocated to store host availability data * * * - * Parameters: availability - [IN] host availability data * + * Parameters: ha - [IN] host availability data * * * ******************************************************************************/ void zbx_host_availability_clean(zbx_host_availability_t *ha) @@ -8848,7 +8848,7 @@ out: * OUT: the host availability data in cache * * before changes * * out - [OUT] the host availability data after changes * - * error - [IN] the error message * + * error_msg - [IN] the error message * * * * Return value: SUCCEED - the host was deactivated successfully * * FAIL - the host was already deactivated or deactivation * diff --git a/src/libs/zbxdbcache/dbsync.h b/src/libs/zbxdbcache/dbsync.h index edd5cf27d35..73d69a487d7 100644 --- a/src/libs/zbxdbcache/dbsync.h +++ b/src/libs/zbxdbcache/dbsync.h @@ -113,7 +113,7 @@ void zbx_dbsync_free_env(void); void zbx_dbsync_init(zbx_dbsync_t *sync, unsigned char mode); void zbx_dbsync_clear(zbx_dbsync_t *sync); -int zbx_dbsync_next(zbx_dbsync_t *sync, zbx_uint64_t *rowid, char ***rows, unsigned char *tag); +int zbx_dbsync_next(zbx_dbsync_t *sync, zbx_uint64_t *rowid, char ***row, unsigned char *tag); int zbx_dbsync_compare_config(zbx_dbsync_t *sync); int zbx_dbsync_compare_autoreg_psk(zbx_dbsync_t *sync); diff --git a/src/libs/zbxdbhigh/trigger.c b/src/libs/zbxdbhigh/trigger.c index 62d97eac4f0..f08ccc02609 100644 --- a/src/libs/zbxdbhigh/trigger.c +++ b/src/libs/zbxdbhigh/trigger.c @@ -149,7 +149,7 @@ out: * * * Purpose: save the trigger changes to database * * * - * Parameters:trigger_diff - [IN] the trigger changeset * + * Parameters: trigger_diff - [IN] the trigger changeset * * * ******************************************************************************/ void zbx_db_save_trigger_changes(const zbx_vector_ptr_t *trigger_diff) diff --git a/src/libs/zbxself/selfmon.c b/src/libs/zbxself/selfmon.c index 39d42eef03d..25baf19d1bf 100644 --- a/src/libs/zbxself/selfmon.c +++ b/src/libs/zbxself/selfmon.c @@ -128,7 +128,7 @@ extern int process_num; * * * Purpose: Returns number of processes depending on process type * * * - * Parameters: process_type - [IN] process type; ZBX_PROCESS_TYPE_* * + * Parameters: proc_type - [IN] process type; ZBX_PROCESS_TYPE_* * * * * Return value: number of processes * * * @@ -483,8 +483,8 @@ out: * Author: Alexander Vladishev * * * ******************************************************************************/ -void get_selfmon_stats(unsigned char proc_type, unsigned char aggr_func, int proc_num, - unsigned char state, double *value) +void get_selfmon_stats(unsigned char proc_type, unsigned char aggr_func, int proc_num, unsigned char state, + double *value) { unsigned int total = 0, counter = 0; unsigned char s; diff --git a/src/libs/zbxserver/evalfunc.c b/src/libs/zbxserver/evalfunc.c index e6a40c2cb47..8d2e0748fad 100644 --- a/src/libs/zbxserver/evalfunc.c +++ b/src/libs/zbxserver/evalfunc.c @@ -2745,8 +2745,8 @@ out: * * * Purpose: evaluate function * * * - * Parameters: item - item to calculate function for * - * function - function (for example, 'max') * + * Parameters: item - item to calculate function for * + * function - function (for example, 'max') * * parameter - parameter of the function * * * * Return value: SUCCEED - evaluated successfully, value contains its value * diff --git a/src/libs/zbxwin32/perfmon.c b/src/libs/zbxwin32/perfmon.c index 28f8174bd4f..056ebb3eb8f 100644 --- a/src/libs/zbxwin32/perfmon.c +++ b/src/libs/zbxwin32/perfmon.c @@ -291,7 +291,7 @@ close_query: * Purpose: get performance object index by reference value described by * * zbx_builtin_counter_ref_t enum * * * - * Parameters: object_ref - [IN] built-in performance object * + * Parameters: counter_ref - [IN] built-in performance object * * * * Comments: Performance object index values can differ across Windows * * installations for the same names * diff --git a/src/zabbix_agent/eventlog.h b/src/zabbix_agent/eventlog.h index 02b1107707b..9ad183e6e2d 100644 --- a/src/zabbix_agent/eventlog.h +++ b/src/zabbix_agent/eventlog.h @@ -185,13 +185,13 @@ EVT_VARIANT_TYPE; int process_eventslog(const char *server, unsigned short port, const char *eventlog_name, zbx_vector_ptr_t *regexps, const char *pattern, const char *key_severity, const char *key_source, const char *key_logeventid, int rate, - zbx_process_value_func_t cb_process_value, ZBX_ACTIVE_METRIC *metric, + zbx_process_value_func_t process_value_cb, ZBX_ACTIVE_METRIC *metric, zbx_uint64_t *lastlogsize_sent, char **error); -int process_eventslog6(const char *server, unsigned short port, const char *fl_source, +int process_eventslog6(const char *server, unsigned short port, const char *eventlog_name, EVT_HANDLE *render_context, EVT_HANDLE *query, zbx_uint64_t lastlogsize, zbx_uint64_t FirstID, zbx_uint64_t LastID, zbx_vector_ptr_t *regexps, const char *pattern, const char *key_severity, const char *key_source, const char *key_logeventid, int rate, - zbx_process_value_func_t cb_process_value, ZBX_ACTIVE_METRIC *metric, + zbx_process_value_func_t process_value_cb, ZBX_ACTIVE_METRIC *metric, zbx_uint64_t *lastlogsize_sent, char **error); int initialize_eventlog6(const char *source, zbx_uint64_t *lastlogsize, zbx_uint64_t *FirstID, zbx_uint64_t *LastID, EVT_HANDLE *render_context, EVT_HANDLE *query, char **error); diff --git a/src/zabbix_agent/listener.h b/src/zabbix_agent/listener.h index 6d2cfb0d580..1c4b970170c 100644 --- a/src/zabbix_agent/listener.h +++ b/src/zabbix_agent/listener.h @@ -22,6 +22,6 @@ #include "threads.h" -ZBX_THREAD_ENTRY(listener_thread, pSock); +ZBX_THREAD_ENTRY(listener_thread, args); #endif diff --git a/src/zabbix_agent/stats.h b/src/zabbix_agent/stats.h index 6111843473d..0ef43892ac9 100644 --- a/src/zabbix_agent/stats.h +++ b/src/zabbix_agent/stats.h @@ -59,7 +59,7 @@ extern ZBX_DISKDEVICES_DATA *diskdevices; extern int my_diskstat_shmid; #endif -ZBX_THREAD_ENTRY(collector_thread, pSemColectorStarted); +ZBX_THREAD_ENTRY(collector_thread, args); int init_collector_data(char **error); void free_collector_data(void); diff --git a/src/zabbix_server/lld/lld.h b/src/zabbix_server/lld/lld.h index 912fadb50dd..2b799821589 100644 --- a/src/zabbix_server/lld/lld.h +++ b/src/zabbix_server/lld/lld.h @@ -52,18 +52,18 @@ void lld_override_host(const zbx_vector_ptr_t *overrides, const char *name, zbx_ void lld_override_graph(const zbx_vector_ptr_t *overrides, const char *name, unsigned char *discover); int lld_update_items(zbx_uint64_t hostid, zbx_uint64_t lld_ruleid, zbx_vector_ptr_t *lld_rows, - const zbx_vector_ptr_t *lld_macros, char **error, int lifetime, int lastcheck); + const zbx_vector_ptr_t *lld_macro_paths, char **error, int lifetime, int lastcheck); void lld_item_links_sort(zbx_vector_ptr_t *lld_rows); int lld_update_triggers(zbx_uint64_t hostid, zbx_uint64_t lld_ruleid, const zbx_vector_ptr_t *lld_rows, - const zbx_vector_ptr_t *lld_macros, char **error, int lifetime, int lastcheck); + const zbx_vector_ptr_t *lld_macro_paths, char **error, int lifetime, int lastcheck); int lld_update_graphs(zbx_uint64_t hostid, zbx_uint64_t lld_ruleid, const zbx_vector_ptr_t *lld_rows, const zbx_vector_ptr_t *lld_macro_paths, char **error, int lifetime, int lastcheck); -void lld_update_hosts(zbx_uint64_t lld_ruleid, const zbx_vector_ptr_t *lld_rows, const zbx_vector_ptr_t *lld_macros, - char **error, int lifetime, int lastcheck); +void lld_update_hosts(zbx_uint64_t lld_ruleid, const zbx_vector_ptr_t *lld_rows, + const zbx_vector_ptr_t *lld_macro_paths, char **error, int lifetime, int lastcheck); int lld_end_of_life(int lastcheck, int lifetime); diff --git a/src/zabbix_server/poller/checks_calculated.h b/src/zabbix_server/poller/checks_calculated.h index 1abce82773d..44e9899ab55 100644 --- a/src/zabbix_server/poller/checks_calculated.h +++ b/src/zabbix_server/poller/checks_calculated.h @@ -24,6 +24,6 @@ #include "dbcache.h" #include "sysinfo.h" -int get_value_calculated(DC_ITEM *item, AGENT_RESULT *result); +int get_value_calculated(DC_ITEM *dc_item, AGENT_RESULT *result); #endif diff --git a/src/zabbix_server/poller/checks_internal.h b/src/zabbix_server/poller/checks_internal.h index a5ee6b27cbb..de64b7cc856 100644 --- a/src/zabbix_server/poller/checks_internal.h +++ b/src/zabbix_server/poller/checks_internal.h @@ -29,6 +29,6 @@ extern int CONFIG_SERVER_STARTUP_TIME; int get_value_internal(const DC_ITEM *item, AGENT_RESULT *result); -int zbx_get_value_internal_ext(const char *query, const AGENT_REQUEST *request, AGENT_RESULT *result); +int zbx_get_value_internal_ext(const char *param1, const AGENT_REQUEST *request, AGENT_RESULT *result); #endif diff --git a/src/zabbix_server/preprocessor/linked_list.c b/src/zabbix_server/preprocessor/linked_list.c index 4bff243bf5d..79261800b3b 100644 --- a/src/zabbix_server/preprocessor/linked_list.c +++ b/src/zabbix_server/preprocessor/linked_list.c @@ -27,7 +27,7 @@ * * * Purpose: create singly linked list * * * - * Parameters: list - [IN] the list * + * Parameters: queue - [IN] the list * * * ******************************************************************************/ void zbx_list_create(zbx_list_t *queue) diff --git a/src/zabbix_server/preprocessor/linked_list.h b/src/zabbix_server/preprocessor/linked_list.h index 667802ceaa4..1d0be783aba 100644 --- a/src/zabbix_server/preprocessor/linked_list.h +++ b/src/zabbix_server/preprocessor/linked_list.h @@ -47,11 +47,11 @@ typedef struct } zbx_list_iterator_t; -void zbx_list_create(zbx_list_t *list); +void zbx_list_create(zbx_list_t *queue); void zbx_list_destroy(zbx_list_t *list); -void zbx_list_append(zbx_list_t *list, void *value, zbx_list_item_t **enqueued); -void zbx_list_insert_after(zbx_list_t *list, zbx_list_item_t *after, void *value, zbx_list_item_t **enqueued); -void zbx_list_prepend(zbx_list_t *list, void *value, zbx_list_item_t **enqueued); +void zbx_list_append(zbx_list_t *list, void *value, zbx_list_item_t **inserted); +void zbx_list_insert_after(zbx_list_t *list, zbx_list_item_t *after, void *value, zbx_list_item_t **inserted); +void zbx_list_prepend(zbx_list_t *list, void *value, zbx_list_item_t **inserted); int zbx_list_pop(zbx_list_t *list, void **value); int zbx_list_peek(const zbx_list_t *list, void **value); void zbx_list_iterator_init(zbx_list_t *list, zbx_list_iterator_t *iterator); diff --git a/src/zabbix_server/preprocessor/preproc_manager.c b/src/zabbix_server/preprocessor/preproc_manager.c index b6102006902..056363f250b 100644 --- a/src/zabbix_server/preprocessor/preproc_manager.c +++ b/src/zabbix_server/preprocessor/preproc_manager.c @@ -110,7 +110,7 @@ typedef struct zbx_preprocessing_manager_t; static void preprocessor_enqueue_dependent(zbx_preprocessing_manager_t *manager, - zbx_preproc_item_value_t *value, zbx_list_item_t *master); + zbx_preproc_item_value_t *source_value, zbx_list_item_t *master); /* cleanup functions */ diff --git a/src/zabbix_server/trapper/active.c b/src/zabbix_server/trapper/active.c index 2d321b26ff9..5510a20302f 100644 --- a/src/zabbix_server/trapper/active.c +++ b/src/zabbix_server/trapper/active.c @@ -532,15 +532,13 @@ out: * Purpose: send list of active checks to the host * * * * Parameters: sock - open socket of server-agent connection * - * json - request buffer * + * jp - request buffer * * * * Return value: SUCCEED - list of active checks sent successfully * * FAIL - an error occurred * * * * Author: Alexander Vladishev * * * - * Comments: * - * * ******************************************************************************/ int send_list_of_active_checks_json(zbx_socket_t *sock, struct zbx_json_parse *jp) { diff --git a/src/zabbix_server/trapper/active.h b/src/zabbix_server/trapper/active.h index a17b511d7ee..7f85c3d189d 100644 --- a/src/zabbix_server/trapper/active.h +++ b/src/zabbix_server/trapper/active.h @@ -28,6 +28,6 @@ extern int CONFIG_TIMEOUT; int send_list_of_active_checks(zbx_socket_t *sock, char *request); -int send_list_of_active_checks_json(zbx_socket_t *sock, struct zbx_json_parse *json); +int send_list_of_active_checks_json(zbx_socket_t *sock, struct zbx_json_parse *jp); #endif diff --git a/tests/libs/zbxdbcache/valuecache_test.h b/tests/libs/zbxdbcache/valuecache_test.h index 96b6ab53963..bc5e47d83d9 100644 --- a/tests/libs/zbxdbcache/valuecache_test.h +++ b/tests/libs/zbxdbcache/valuecache_test.h @@ -22,7 +22,7 @@ void zbx_vc_set_mode(int mode); int zbx_vc_get_cached_values(zbx_uint64_t itemid, unsigned char value_type, zbx_vector_history_record_t *values); -int zbx_vc_precache_values(zbx_uint64_t itemid, int value_type, int seconds, int count, const zbx_timespec_t *end); +int zbx_vc_precache_values(zbx_uint64_t itemid, int value_type, int seconds, int count, const zbx_timespec_t *ts); int zbx_vc_get_item_state(zbx_uint64_t itemid, int *status, int *active_range, int *values_total, int *db_cached_from); int zbx_vc_get_cache_state(int *mode, zbx_uint64_t *hits, zbx_uint64_t *misses); diff --git a/tests/mocks/valuecache/valuecache_mock.h b/tests/mocks/valuecache/valuecache_mock.h index 0e89e182676..d3c748b52ea 100644 --- a/tests/mocks/valuecache/valuecache_mock.h +++ b/tests/mocks/valuecache/valuecache_mock.h @@ -44,7 +44,7 @@ zbx_vcmock_ds_item_t *zbx_vcmock_ds_first_item(void); int zbx_vcmock_str_to_cache_mode(const char *mode); int zbx_vcmock_str_to_item_status(const char *str); -void zbx_vcmock_read_values(zbx_mock_handle_t handle, unsigned char value_type, zbx_vector_history_record_t *values); +void zbx_vcmock_read_values(zbx_mock_handle_t hdata, unsigned char value_type, zbx_vector_history_record_t *values); void zbx_vcmock_check_records(const char *prefix, unsigned char value_type, const zbx_vector_history_record_t *expected_values, const zbx_vector_history_record_t *returned_values); diff --git a/tests/zbxmockdata.h b/tests/zbxmockdata.h index ba339302799..0d8ae5cacaa 100644 --- a/tests/zbxmockdata.h +++ b/tests/zbxmockdata.h @@ -58,7 +58,7 @@ zbx_mock_error_t zbx_mock_exit_code(int *status); zbx_mock_error_t zbx_mock_object_member(zbx_mock_handle_t object, const char *name, zbx_mock_handle_t *member); zbx_mock_error_t zbx_mock_vector_element(zbx_mock_handle_t vector, zbx_mock_handle_t *element); zbx_mock_error_t zbx_mock_string(zbx_mock_handle_t string, const char **value); -zbx_mock_error_t zbx_mock_string_ex(zbx_mock_handle_t string, const char **value); +zbx_mock_error_t zbx_mock_string_ex(zbx_mock_handle_t hobject, const char **value); zbx_mock_error_t zbx_mock_binary(zbx_mock_handle_t binary, const char **value, size_t *length); zbx_mock_error_t zbx_mock_parameter(const char *path, zbx_mock_handle_t *parameter); zbx_mock_error_t zbx_mock_parameter_exists(const char *path); diff --git a/tests/zbxmockhelper.h b/tests/zbxmockhelper.h index 432203fb1f3..6a3f9558df4 100644 --- a/tests/zbxmockhelper.h +++ b/tests/zbxmockhelper.h @@ -20,6 +20,6 @@ #ifndef ZABBIX_MOCK_HELPER_H #define ZABBIX_MOCK_HELPER_H -char *zbx_yaml_assemble_binary_sequence(const char *in, size_t expected); +char *zbx_yaml_assemble_binary_sequence(const char *path, size_t expected); #endif |