use kern.cp_times sysctl for FreeBSD smp support

[collectd.git] / src / memcached.c

diff --git a/src/memcached.c b/src/memcached.c
index 759ef51..b332157 100644 (file)
--- a/src/memcached.c
+++ b/src/memcached.c
@@ -1,8 +1,9 @@
 /**
  * collectd - src/memcached.c, based on src/hddtemp.c
- * Copyright (C) 2007  Antony Dovgal
- * Copyright (C) 2005,2006  Vincent Stehlé
- * Copyright (C) 2009  Franck Lombardi
+ * Copyright (C) 2007       Antony Dovgal
+ * Copyright (C) 2007-2009  Florian Forster
+ * Copyright (C) 2009       Doug MacEachern
+ * Copyright (C) 2009       Franck Lombardi
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -20,8 +21,8 @@
  *
  * Authors:
  *   Antony Dovgal <tony at daylessday dot org>
- *   Vincent Stehlé <vincent.stehle at free.fr>
  *   Florian octo Forster <octo at verplant.org>
+ *   Doug MacEachern <dougm at hyperic.com>
  *   Franck Lombardi
  **/
 
@@ -66,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);
@@ -79,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);
@@ -113,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,