Merge branch 'collectd-4.5' into collectd-4.6

[collectd.git] / src / unixsock.c

diff --git a/src/unixsock.c b/src/unixsock.c
index d800906..57f3450 100644 (file)
--- a/src/unixsock.c
+++ b/src/unixsock.c
@@ -278,7 +278,7 @@ static void *us_handle_client (void *arg)
        return ((void *) 0);
 } /* void *us_handle_client */
 
-static void *us_server_thread (void *arg)
+static void *us_server_thread (void __attribute__((unused)) *arg)
 {
        int  status;
        int *remote_fd;
@@ -383,8 +383,15 @@ static int us_config (const char *key, const char *val)
 
 static int us_init (void)
 {
+       static int have_init = 0;
+
        int status;
 
+       /* Initialize only once. */
+       if (have_init != 0)
+               return (0);
+       have_init = 1;
+
        loop = 1;
 
        status = pthread_create (&listen_thread, NULL, us_server_thread, NULL);