X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmemcached.c;h=b3321578894d7e3ffc49a4a7126143ff0e3d2b87;hb=be99a844a40d7037a910d37a894988b807631a6e;hp=3421f824f0cfed67b1173dccc263c4f7021ccd72;hpb=330010ea9cf8dad458dc9245d8284a7dbf62b1a9;p=collectd.git

diff --git a/src/memcached.c b/src/memcached.c
index 3421f824..b3321578 100644
--- a/src/memcached.c
+++ b/src/memcached.c
@@ -67,7 +67,8 @@ static int memcached_query_daemon (char *buffer, int buffer_size) /* {{{ */
 
 		memset (&serv_addr, 0, sizeof (serv_addr));
 		serv_addr.sun_family = AF_UNIX;
-		sstrncpy (serv_addr.sun_path, memcached_socket, sizeof (serv_addr.sun_path));
+		sstrncpy (serv_addr.sun_path, memcached_socket,
+				sizeof (serv_addr.sun_path));
 
 		/* create our socket descriptor */
 		fd = socket (AF_UNIX, SOCK_STREAM, 0);
@@ -80,7 +81,7 @@ static int memcached_query_daemon (char *buffer, int buffer_size) /* {{{ */
 
 		/* connect to the memcached daemon */
 		status = (ssize_t) connect (fd, (struct sockaddr *) &serv_addr,
-				SUN_LEN (&serv_addr));
+				sizeof (serv_addr));
 		if (status != 0) {
 			shutdown (fd, SHUT_RDWR);
 			close (fd);
@@ -114,7 +115,7 @@ static int memcached_query_daemon (char *buffer, int buffer_size) /* {{{ */
 			port = MEMCACHED_DEF_PORT;
 		}
 
-		if ((ai_return = getaddrinfo (host, port, NULL, &ai_list)) != 0) {
+		if ((ai_return = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0) {
 			char errbuf[1024];
 			ERROR ("memcached: getaddrinfo (%s, %s): %s",
 					host, port,