Merge branch 'collectd-5.5'

[collectd.git] / src / zookeeper.c

diff --git a/src/zookeeper.c b/src/zookeeper.c
index 1eed1fb..860e93d 100644 (file)
--- a/src/zookeeper.c
+++ b/src/zookeeper.c
@@ -111,7 +111,7 @@ static int zookeeper_connect (void)
        const char *host;
        const char *port;
 
-       memset ((void *) &ai_hints, '\0', sizeof (ai_hints));
+       memset (&ai_hints, '\0', sizeof (ai_hints));
        ai_hints.ai_family   = AF_UNSPEC;
        ai_hints.ai_socktype = SOCK_STREAM;
 
@@ -159,8 +159,7 @@ static int zookeeper_connect (void)
 
 static int zookeeper_query (char *buffer, size_t buffer_size)
 {
-       int sk = -1;
-       int status;
+       int sk, status;
        size_t buffer_fill;
 
        sk = zookeeper_connect();