From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Fri, 4 Mar 2016 11:19:15 +0000 (+0100)
Subject: Merge branch 'collectd-5.4' into collectd-5.5
X-Git-Tag: collectd-5.5.2~36
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=1fc00932fd49fa535551cc4bba09c4e4be059ab4;hp=9de86bc9ce5961281632944a04efbc2314828a2f;p=collectd.git

Merge branch 'collectd-5.4' into collectd-5.5
---

diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c
index 73d01568..e723af07 100644
--- a/src/daemon/plugin.c
+++ b/src/daemon/plugin.c
@@ -974,7 +974,7 @@ static int plugin_mark_loaded (char const *name)
 	return (status);
 }
 
-static void plugin_free_loaded ()
+static void plugin_free_loaded (void)
 {
 	void *key;
 	void *value;
diff --git a/src/processes.c b/src/processes.c
index e9e93173..90d4d79e 100644
--- a/src/processes.c
+++ b/src/processes.c
@@ -1169,7 +1169,7 @@ static char *ps_get_cmdline (long pid, char *name, char *buf, size_t buf_len)
 	return buf;
 } /* char *ps_get_cmdline (...) */
 
-static int read_fork_rate ()
+static int read_fork_rate (void)
 {
 	FILE *proc_stat;
 	char buffer[1024];
diff --git a/src/python.c b/src/python.c
index 9d732772..c7524143 100644
--- a/src/python.c
+++ b/src/python.c
@@ -1063,7 +1063,7 @@ PyMODINIT_FUNC PyInit_collectd(void) {
 }
 #endif
 
-static int cpy_init_python() {
+static int cpy_init_python(void) {
 	PyObject *sys;
 	PyObject *module;
 
diff --git a/src/tokyotyrant.c b/src/tokyotyrant.c
index 7fa621bf..f04a5fce 100644
--- a/src/tokyotyrant.c
+++ b/src/tokyotyrant.c
@@ -78,7 +78,7 @@ static int tt_config (const char *key, const char *value)
 	return (0);
 }
 
-static void printerr()
+static void printerr (void)
 {
 	int ecode = tcrdbecode(rdb);
 	ERROR ("tokyotyrant plugin: error: %d, %s",