...G...PS. [ZBX-12671] refactoring the code base to support the compiler flag -Wstrict-prototypes

24 files changed, 56 insertions, 55 deletions

diff --git a/configure.ac b/configure.ac
index 722d0e96e2c..5341c3d86de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ dnl *****************************************************************
 
 AC_PROG_CC([cc c99 gcc clang])
 AM_PROG_CC_C_O
+CFLAGS="$CFLAGS -Wstrict-prototypes"
 
 dnl *****************************************************************
 dnl *                                                               *
diff --git a/include/alias.h b/include/alias.h
index 8c6bcb73b9b..bb8bec43269 100644
--- a/include/alias.h
+++ b/include/alias.h
@@ -28,9 +28,9 @@ typedef struct zbx_alias
 }
 ALIAS;
 
-void		test_aliases();
+void		test_aliases(void);
 void		add_alias(const char *name, const char *value);
-void		alias_list_free();
+void		alias_list_free(void);
 const char	*zbx_alias_get(const char *orig);
 
 #endif	/* ZABBIX_ALIAS_H */
diff --git a/include/common.h b/include/common.h
index 2c058654873..b7d1c2a1968 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1128,7 +1128,7 @@ void	uint64_array_remove(zbx_uint64_t *values, int *num, const zbx_uint64_t *rm_
 const char	*zbx_event_value_string(unsigned char source, unsigned char object, unsigned char value);
 
 #ifdef _WINDOWS
-const OSVERSIONINFOEX	*zbx_win_getversion();
+const OSVERSIONINFOEX	*zbx_win_getversion(void);
 void	zbx_wmi_get(const char *wmi_namespace, const char *wmi_query, char **utf8_value);
 wchar_t	*zbx_acp_to_unicode(const char *acp_string);
 wchar_t	*zbx_oemcp_to_unicode(const char *oemcp_string);
diff --git a/include/module.h b/include/module.h
index 4419d6cb385..a7e7d872318 100644
--- a/include/module.h
+++ b/include/module.h
@@ -45,15 +45,6 @@
 #define CF_MODULE		0x02	/* item is defined in a loadable module */
 #define CF_USERPARAMETER	0x04	/* item is defined as user parameter */
 
-typedef struct
-{
-	char		*key;
-	unsigned	flags;
-	int		(*function)();
-	char		*test_param;	/* item test parameters; user parameter items keep command here */
-}
-ZBX_METRIC;
-
 /* agent request structure */
 typedef struct
 {
@@ -99,6 +90,15 @@ typedef struct
 }
 AGENT_RESULT;
 
+typedef struct
+{
+	char		*key;
+	unsigned	flags;
+	int		(*function)(AGENT_REQUEST *request, AGENT_RESULT *result);
+	char		*test_param;	/* item test parameters; user parameter items keep command here */
+}
+ZBX_METRIC;
+
 /* SET RESULT */
 
 #define SET_UI64_RESULT(res, val)		\
diff --git a/include/service.h b/include/service.h
index 2063dd92c58..8e3c8f2b8b0 100644
--- a/include/service.h
+++ b/include/service.h
@@ -31,11 +31,11 @@ extern ZBX_THREAD_HANDLE	*threads;
 void	service_start(int flags);
 
 int	ZabbixCreateService(const char *path, int multiple_agents);
-int	ZabbixRemoveService();
-int	ZabbixStartService();
-int	ZabbixStopService();
+int	ZabbixRemoveService(void);
+int	ZabbixStartService(void);
+int	ZabbixStopService(void);
 
-void	set_parent_signal_handler();
+void	set_parent_signal_handler(void);
 
 int	application_status;	/* required for closing application from service */
 
diff --git a/include/symbols.h b/include/symbols.h
index b468cdf37dd..7f292442cd7 100644
--- a/include/symbols.h
+++ b/include/symbols.h
@@ -45,7 +45,7 @@ BOOL	(__stdcall *zbx_GetPerformanceInfo)(PPERFORMANCE_INFORMATION, DWORD);
 BOOL	(__stdcall *zbx_GlobalMemoryStatusEx)(LPMEMORYSTATUSEX);
 BOOL	(__stdcall *zbx_GetFileInformationByHandleEx)(HANDLE, FILE_INFO_BY_HANDLE_CLASS, LPVOID, DWORD);
 
-void	import_symbols();
+void	import_symbols(void);
 
 #else
 #	define import_symbols()
diff --git a/include/sysinfo.h b/include/sysinfo.h
index 97a7dc51f6b..233f32402b6 100644
--- a/include/sysinfo.h
+++ b/include/sysinfo.h
@@ -192,15 +192,15 @@ int	get_diskstat(const char *devname, zbx_uint64_t *dstat);
 #define PROCESS_MODULE_COMMAND	0x2
 #define PROCESS_WITH_ALIAS	0x4
 
-void	init_metrics();
+void	init_metrics(void);
 int	add_metric(ZBX_METRIC *metric, char *error, size_t max_error_len);
-void	free_metrics();
+void	free_metrics(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_module(const char *key, int (*function)());
-void	test_parameters();
+int	add_user_module(const char *key, int (*function)(void));
+void	test_parameters(void);
 void	test_parameter(const char *key);
 
 void	init_result(AGENT_RESULT *result);
@@ -290,7 +290,7 @@ typedef int (*zbx_metric_func_t)(AGENT_REQUEST *request, AGENT_RESULT *result);
 typedef struct
 {
 	const char	*mode;
-	int		(*function)();
+	int		(*function)(void);
 }
 MODE_FUNCTION;
 
diff --git a/include/threads.h b/include/threads.h
index a311cc4921c..e1a7f8e8538 100644
--- a/include/threads.h
+++ b/include/threads.h
@@ -47,8 +47,8 @@
 
 #else	/* not _WINDOWS */
 
-	int	zbx_fork();
-	int	zbx_child_fork();
+	int	zbx_fork(void);
+	int	zbx_child_fork(void);
 
 	#define ZBX_THREAD_ERROR	-1
 
@@ -87,6 +87,6 @@ zbx_thread_args_t;
 ZBX_THREAD_HANDLE	zbx_thread_start(ZBX_THREAD_ENTRY_POINTER(handler), zbx_thread_args_t *thread_args);
 int			zbx_thread_wait(ZBX_THREAD_HANDLE thread);
 /* zbx_thread_exit(status) -- declared as define !!! */
-long int		zbx_get_thread_id();
+long int		zbx_get_thread_id(void);
 
 #endif	/* ZABBIX_THREADS_H */
diff --git a/src/libs/zbxcommon/alias.c b/src/libs/zbxcommon/alias.c
index 2c0f06bba9a..8cd5217f51a 100644
--- a/src/libs/zbxcommon/alias.c
+++ b/src/libs/zbxcommon/alias.c
@@ -24,7 +24,7 @@
 
 static ALIAS	*aliasList = NULL;
 
-void	test_aliases()
+void	test_aliases(void)
 {
 	ALIAS	*alias;
 
@@ -61,7 +61,7 @@ void	add_alias(const char *name, const char *value)
 	}
 }
 
-void	alias_list_free()
+void	alias_list_free(void)
 {
 	ALIAS	*curr, *next;
 
diff --git a/src/libs/zbxdbcache/dbconfig.c b/src/libs/zbxdbcache/dbconfig.c
index 67fb84dd742..6b61562997f 100644
--- a/src/libs/zbxdbcache/dbconfig.c
+++ b/src/libs/zbxdbcache/dbconfig.c
@@ -4201,7 +4201,7 @@ static void	DCsync_item_preproc(zbx_dbsync_t *sync)
  * Purpose: updates trigger topology after trigger dependency changes         *
  *                                                                            *
  ******************************************************************************/
-static void	dc_trigger_update_topology()
+static void	dc_trigger_update_topology(void)
 {
 	zbx_hashset_iter_t	iter;
 	ZBX_DC_TRIGGER		*trigger;
@@ -4235,7 +4235,7 @@ static int	zbx_default_ptr_pair_ptr_compare_func(const void *d1, const void *d2)
  *              3) list of triggers each item is used by                      *
  *                                                                            *
  ******************************************************************************/
-static void	dc_trigger_update_cache()
+static void	dc_trigger_update_cache(void)
 {
 	zbx_hashset_iter_t	iter;
 	ZBX_DC_TRIGGER		*trigger;
@@ -4333,7 +4333,7 @@ static void	dc_trigger_update_cache()
  * Purpose: updates hostgroup name index and resets nested group lists        *
  *                                                                            *
  ******************************************************************************/
-static void	dc_hostgroups_update_cache()
+static void	dc_hostgroups_update_cache(void)
 {
 	zbx_hashset_iter_t	iter;
 	zbx_dc_hostgroup_t	*group;
diff --git a/src/libs/zbxdbcache/valuecache.c b/src/libs/zbxdbcache/valuecache.c
index 91537a53263..8ce148894a7 100644
--- a/src/libs/zbxdbcache/valuecache.c
+++ b/src/libs/zbxdbcache/valuecache.c
@@ -657,7 +657,7 @@ static void	vc_update_statistics(zbx_vc_item_t *item, int hits, int misses)
  *           cache is working in the low memory mode.                         *
  *                                                                            *
  ******************************************************************************/
-static void	vc_warn_low_memory()
+static void	vc_warn_low_memory(void)
 {
 	int	now;
 
diff --git a/src/libs/zbxdbhigh/db.c b/src/libs/zbxdbhigh/db.c
index 8893ae83397..1e8c7c8d8de 100644
--- a/src/libs/zbxdbhigh/db.c
+++ b/src/libs/zbxdbhigh/db.c
@@ -124,7 +124,7 @@ void	DBdeinit(void)
  * Author: Eugene Grigorjev, Vladimir Levijev                                 *
  *                                                                            *
  ******************************************************************************/
-static void	DBtxn_operation(int (*txn_operation)())
+static void	DBtxn_operation(int (*txn_operation)(void))
 {
 	int	rc;
 
diff --git a/src/libs/zbxsys/symbols.c b/src/libs/zbxsys/symbols.c
index 0b5992887d9..f9e16d22795 100644
--- a/src/libs/zbxsys/symbols.c
+++ b/src/libs/zbxsys/symbols.c
@@ -38,7 +38,7 @@ static FARPROC	GetProcAddressAndLog(HMODULE hModule, const char *procName)
 	return ptr;
 }
 
-void	import_symbols()
+void	import_symbols(void)
 {
 	HMODULE	hModule;
 
diff --git a/src/libs/zbxsys/threads.c b/src/libs/zbxsys/threads.c
index 7520e356bc0..036ac64411c 100644
--- a/src/libs/zbxsys/threads.c
+++ b/src/libs/zbxsys/threads.c
@@ -33,7 +33,7 @@
  * Author: Eugene Grigorjev                                                   *
  *                                                                            *
  ******************************************************************************/
-int	zbx_fork()
+int	zbx_fork(void)
 {
 	fflush(stdout);
 	fflush(stderr);
@@ -53,7 +53,7 @@ int	zbx_fork()
  * Comments: use this function only for forks from the main process           *
  *                                                                            *
  ******************************************************************************/
-int	zbx_child_fork()
+int	zbx_child_fork(void)
 {
 	pid_t		pid;
 	sigset_t	mask, orig_mask;
@@ -193,7 +193,7 @@ int	zbx_thread_wait(ZBX_THREAD_HANDLE thread)
 	return status;
 }
 
-long int	zbx_get_thread_id()
+long int	zbx_get_thread_id(void)
 {
 #ifdef _WINDOWS
 	return (long int)GetCurrentThreadId();
diff --git a/src/libs/zbxsysinfo/linux/software.h b/src/libs/zbxsysinfo/linux/software.h
index 42c75822109..d0cb174333f 100644
--- a/src/libs/zbxsysinfo/linux/software.h
+++ b/src/libs/zbxsysinfo/linux/software.h
@@ -32,7 +32,7 @@ typedef struct
 	const char	*name;
 	const char	*test_cmd;	/* if this shell command has stdout output, package manager is present */
 	const char	*list_cmd;	/* this command lists the installed packages */
-	int		(*parser)();	/* for non-standard list (package per line), add a parser function */
+	int		(*parser)(const char *line, char *package, size_t max_package_len);	/* for non-standard list (package per line), add a parser function */
 }
 ZBX_PACKAGE_MANAGER;
 
diff --git a/src/libs/zbxsysinfo/sysinfo.c b/src/libs/zbxsysinfo/sysinfo.c
index fabe2662360..56c105e4a81 100644
--- a/src/libs/zbxsysinfo/sysinfo.c
+++ b/src/libs/zbxsysinfo/sysinfo.c
@@ -163,7 +163,7 @@ int	add_user_parameter(const char *itemkey, char *command, char *error, size_t m
 	return ret;
 }
 
-void	init_metrics()
+void	init_metrics(void)
 {
 	int	i;
 	char	error[MAX_STRING_LEN];
@@ -224,7 +224,7 @@ void	init_metrics()
 #endif
 }
 
-void	free_metrics()
+void	free_metrics(void)
 {
 	if (NULL != commands)
 	{
diff --git a/src/libs/zbxsysinfo/win32/system.c b/src/libs/zbxsysinfo/win32/system.c
index 5fbc40b42d0..e4da6e0190b 100644
--- a/src/libs/zbxsysinfo/win32/system.c
+++ b/src/libs/zbxsysinfo/win32/system.c
@@ -51,7 +51,7 @@ static wchar_t	*read_registry_value(HKEY hKey, LPCTSTR name)
  * Purpose: get Windows version information                                   *
  *                                                                            *
  ******************************************************************************/
-const OSVERSIONINFOEX		*zbx_win_getversion()
+const OSVERSIONINFOEX		*zbx_win_getversion(void)
 {
 #	define ZBX_REGKEY_VERSION		"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"
 #	define ZBX_REGVALUE_CURRENTVERSION	"CurrentVersion"
diff --git a/src/libs/zbxwin32/service.c b/src/libs/zbxwin32/service.c
index 4ea3f5dc3fa..af8f5f34285 100644
--- a/src/libs/zbxwin32/service.c
+++ b/src/libs/zbxwin32/service.c
@@ -304,7 +304,7 @@ static int	svc_RemoveEventSource()
 	return SUCCEED;
 }
 
-int	ZabbixRemoveService()
+int	ZabbixRemoveService(void)
 {
 	SC_HANDLE	mgr, service;
 	int		ret = FAIL;
@@ -336,7 +336,7 @@ int	ZabbixRemoveService()
 	return ret;
 }
 
-int	ZabbixStartService()
+int	ZabbixStartService(void)
 {
 	SC_HANDLE	mgr, service;
 	int		ret = FAIL;
@@ -365,7 +365,7 @@ int	ZabbixStartService()
 	return ret;
 }
 
-int	ZabbixStopService()
+int	ZabbixStopService(void)
 {
 	SC_HANDLE	mgr, service;
 	SERVICE_STATUS	status;
@@ -395,7 +395,7 @@ int	ZabbixStopService()
 	return ret;
 }
 
-void	set_parent_signal_handler()
+void	set_parent_signal_handler(void)
 {
 	signal(SIGINT, parent_signal_handler);
 	signal(SIGTERM, parent_signal_handler);
diff --git a/src/zabbix_agent/diskdevices.c b/src/zabbix_agent/diskdevices.c
index 5383abc5cee..eab12d595d9 100644
--- a/src/zabbix_agent/diskdevices.c
+++ b/src/zabbix_agent/diskdevices.c
@@ -108,7 +108,7 @@ static void	process_diskstat(ZBX_SINGLE_DISKDEVICE_DATA *device)
 	apply_diskstat(device, now, dstat);
 }
 
-void	collect_stats_diskdevices()
+void	collect_stats_diskdevices(void)
 {
 	int	i;
 
diff --git a/src/zabbix_agent/diskdevices.h b/src/zabbix_agent/diskdevices.h
index 698b5a2a16e..57a44421e42 100644
--- a/src/zabbix_agent/diskdevices.h
+++ b/src/zabbix_agent/diskdevices.h
@@ -58,6 +58,6 @@ typedef struct c_diskdevices_data
 
 ZBX_SINGLE_DISKDEVICE_DATA	*collector_diskdevice_get(const char *devname);
 ZBX_SINGLE_DISKDEVICE_DATA	*collector_diskdevice_add(const char *devname);
-void				collect_stats_diskdevices();
+void				collect_stats_diskdevices(void);
 
 #endif
diff --git a/src/zabbix_agent/zbxconf.c b/src/zabbix_agent/zbxconf.c
index e87d105c6d3..264a0f05292 100644
--- a/src/zabbix_agent/zbxconf.c
+++ b/src/zabbix_agent/zbxconf.c
@@ -194,7 +194,7 @@ pc_fail:
 #endif	/* _WINDOWS */
 
 #ifdef _AIX
-void	tl_version()
+void	tl_version(void)
 {
 #ifdef _AIXVERSION_610
 #	define ZBX_AIX_TL	"6100 and above"
diff --git a/src/zabbix_agent/zbxconf.h b/src/zabbix_agent/zbxconf.h
index de843f0065f..78f89be649c 100644
--- a/src/zabbix_agent/zbxconf.h
+++ b/src/zabbix_agent/zbxconf.h
@@ -62,7 +62,7 @@ void	load_perf_counters(const char **lines);
 #endif
 
 #ifdef _AIX
-void	tl_version();
+void	tl_version(void);
 #endif
 
 #endif /* ZABBIX_ZBXCONF_H */
diff --git a/src/zabbix_server/housekeeper/housekeeper.c b/src/zabbix_server/housekeeper/housekeeper.c
index b81d54705b5..b4934e05831 100644
--- a/src/zabbix_server/housekeeper/housekeeper.c
+++ b/src/zabbix_server/housekeeper/housekeeper.c
@@ -762,7 +762,7 @@ static int	hk_table_cleanup(const char *table, const char *field, zbx_uint64_t i
  * Comments: sqlite3 does not use CONFIG_MAX_HOUSEKEEPER_DELETE, deletes all  *
  *                                                                            *
  ******************************************************************************/
-static int	housekeeping_cleanup()
+static int	housekeeping_cleanup(void)
 {
 	const char		*__function_name = "housekeeping_cleanup";
 
diff --git a/src/zabbix_server/snmptrapper/snmptrapper.c b/src/zabbix_server/snmptrapper/snmptrapper.c
index c069aba92e8..3f3ec5696e9 100644
--- a/src/zabbix_server/snmptrapper/snmptrapper.c
+++ b/src/zabbix_server/snmptrapper/snmptrapper.c
@@ -38,7 +38,7 @@ static int	force = 0;
 extern unsigned char	process_type, program_type;
 extern int		server_num, process_num;
 
-static void	DBget_lastsize()
+static void	DBget_lastsize(void)
 {
 	DB_RESULT	result;
 	DB_ROW		row;
@@ -60,7 +60,7 @@ static void	DBget_lastsize()
 	DBcommit();
 }
 
-static void	DBupdate_lastsize()
+static void	DBupdate_lastsize(void)
 {
 	DBbegin();
 	DBexecute("update globalvars set snmp_lastsize=" ZBX_FS_UI64, trap_lastsize);
@@ -417,7 +417,7 @@ static void	delay_trap_logs(char *error, int log_level)
  * Author: Rudolfs Kreicbergs                                                 *
  *                                                                            *
  ******************************************************************************/
-static int	read_traps()
+static int	read_traps(void)
 {
 	const char	*__function_name = "read_traps";
 	int		nbytes = 0;
@@ -467,7 +467,7 @@ out:
  * Comments: !!! do not reset lastsize elsewhere !!!                          *
  *                                                                            *
  ******************************************************************************/
-static void	close_trap_file()
+static void	close_trap_file(void)
 {
 	if (-1 != trap_fd)
 		close(trap_fd);
@@ -488,7 +488,7 @@ static void	close_trap_file()
  * Author: Rudolfs Kreicbergs                                                 *
  *                                                                            *
  ******************************************************************************/
-static int	open_trap_file()
+static int	open_trap_file(void)
 {
 	zbx_stat_t	file_buf;
 	char		*error = NULL;
@@ -532,7 +532,7 @@ out:
  * Author: Rudolfs Kreicbergs                                                 *
  *                                                                            *
  ******************************************************************************/
-static int	get_latest_data()
+static int	get_latest_data(void)
 {
 	zbx_stat_t	file_buf;