diff --git a/src/zookeeper.c b/src/zookeeper.c
index 5aa94e3469091101a559dd2116e34d1d5dbba668..84174853d24c62bd8ba22aaa17bc28e5f68aaa3d 100644 (file)
--- a/src/zookeeper.c
+++ b/src/zookeeper.c
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include <netdb.h>
-#include <sys/socket.h>
#include <sys/un.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
{
int sk = -1;
int status;
- struct addrinfo ai_hints;
- struct addrinfo *ai;
struct addrinfo *ai_list;
- char *host;
- char *port;
-
- memset ((void *) &ai_hints, '\0', sizeof (ai_hints));
- ai_hints.ai_family = AF_UNSPEC;
- ai_hints.ai_socktype = SOCK_STREAM;
+ const char *host;
+ const char *port;
host = (zk_host != NULL) ? zk_host : ZOOKEEPER_DEF_HOST;
port = (zk_port != NULL) ? zk_port : ZOOKEEPER_DEF_PORT;
+
+ struct addrinfo ai_hints = {
+ .ai_family = AF_UNSPEC,
+ .ai_socktype = SOCK_STREAM
+ };
+
status = getaddrinfo (host, port, &ai_hints, &ai_list);
if (status != 0)
{
return (-1);
}
- for (ai = ai_list; ai != NULL; ai = ai->ai_next)
+ for (struct addrinfo *ai = ai_list; ai != NULL; ai = ai->ai_next)
{
sk = socket (ai->ai_family, SOCK_STREAM, 0);
if (sk < 0)
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();