Merge branch 'collectd-5.4' into collectd-5.5

diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c
index 73d0156..e723af0 100644 (file)
--- 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 e9e9317..90d4d79 100644 (file)
--- 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 9d73277..c752414 100644 (file)
--- 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 7fa621b..f04a5fc 100644 (file)
--- 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",