Merge branch 'collectd-4.5' into collectd-4.6

[collectd.git] / src / apcups.c

diff --git a/src/apcups.c b/src/apcups.c
index 6391eb0..a0629d5 100644 (file)
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -1,8 +1,9 @@
 /*
  * collectd - src/apcups.c
- * Copyright (C) 2006 Anthony Gialluca <tonyabg at charter.net>
- * Copyright (C) 2000-2004 Kern Sibbald
- * Copyright (C) 1996-99 Andre M. Hedrick <andre at suse.com>
+ * Copyright (C) 2006-2007  Florian octo Forster
+ * Copyright (C) 2006       Anthony Gialluca <tonyabg at charter.net>
+ * Copyright (C) 2000-2004  Kern Sibbald
+ * Copyright (C) 1996-1999  Andre M. Hedrick <andre at suse.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General
@@ -20,15 +21,9 @@
  *
  * Authors:
  *   Anthony Gialluca <tonyabg at charter.net>
+ *   Florian octo Forster <octo at verplant.org>
  **/
 
-/*
- * FIXME: Don't know why but without this here atof() was not returning
- * correct values for me. This is behavior that I don't understand and
- * should be examined in closer detail.
- */
-#include <stdlib.h>
-
 #include "collectd.h"
 #include "common.h"      /* rrd_update_file */
 #include "plugin.h"      /* plugin_register, plugin_submit */
@@ -110,7 +105,7 @@ static int apcups_shutdown (void)
  * Returns -1 on error
  * Returns socket file descriptor otherwise
  */
-static int net_open (char *host, char *service, int port)
+static int net_open (char *host, int port)
 {
        int              sd;
        int              status;
@@ -122,8 +117,7 @@ static int net_open (char *host, char *service, int port)
        assert ((port > 0x00000000) && (port <= 0x0000FFFF));
 
        /* Convert the port to a string */
-       snprintf (port_str, 8, "%i", port);
-       port_str[7] = '\0';
+       ssnprintf (port_str, sizeof (port_str), "%i", port);
 
        /* Resolve name */
        memset ((void *) &ai_hints, '\0', sizeof (ai_hints));
@@ -134,7 +128,7 @@ static int net_open (char *host, char *service, int port)
        if (status != 0)
        {
                char errbuf[1024];
-               DEBUG ("getaddrinfo failed: %s",
+               INFO ("getaddrinfo failed: %s",
                                (status == EAI_SYSTEM)
                                ? sstrerror (errno, errbuf, sizeof (errbuf))
                                : gai_strerror (status));
@@ -165,7 +159,7 @@ static int net_open (char *host, char *service, int port)
        if (status != 0) /* `connect(2)' failed */
        {
                char errbuf[1024];
-               DEBUG ("connect failed: %s",
+               INFO ("connect failed: %s",
                                sstrerror (errno, errbuf, sizeof (errbuf)));
                close (sd);
                return (-1);
@@ -260,8 +254,6 @@ static int apc_query_server (char *host, int port,
        char   *key;
        double  value;
 
-       static complain_t compl;
-
 #if APCMAIN
 # define PRINT_VALUE(name, val) printf("  Found property: name = %s; value = %f;\n", name, val)
 #else
@@ -270,17 +262,13 @@ static int apc_query_server (char *host, int port,
 
        if (global_sockfd < 0)
        {
-               if ((global_sockfd = net_open (host, NULL, port)) < 0)
+               global_sockfd = net_open (host, port);
+               if (global_sockfd < 0)
                {
-                       plugin_complain (LOG_ERR, &compl, "apcups plugin: "
-                                       "Connecting to the apcupsd failed.");
+                       ERROR ("apcups plugin: Connecting to the "
+                                       "apcupsd failed.");
                        return (-1);
                }
-               else
-               {
-                       plugin_relief (LOG_NOTICE, &compl, "apcups plugin: "
-                                       "Connection re-established to the apcupsd.");
-               }
        }
 
        if (net_send (&global_sockfd, "status", 6) < 0)
@@ -291,7 +279,7 @@ static int apc_query_server (char *host, int port,
 
        while ((n = net_recv (&global_sockfd, recvline, sizeof (recvline) - 1)) > 0)
        {
-               assert (n < sizeof (recvline));
+               assert ((unsigned int)n < sizeof (recvline));
                recvline[n] = '\0';
 #if APCMAIN
                printf ("net_recv = `%s';\n", recvline);
@@ -376,13 +364,13 @@ static void apc_submit_generic (char *type, char *type_inst, double value)
 
        vl.values = values;
        vl.values_len = 1;
-       vl.time = time (NULL);
-       strcpy (vl.host, hostname_g);
-       strcpy (vl.plugin, "apcups");
-       strcpy (vl.plugin_instance, "");
-       strncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
+       sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+       sstrncpy (vl.plugin, "apcups", sizeof (vl.plugin));
+       sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance));
+       sstrncpy (vl.type, type, sizeof (vl.type));
+       sstrncpy (vl.type_instance, type_inst, sizeof (vl.type_instance));
 
-       plugin_dispatch_values (type, &vl);
+       plugin_dispatch_values (&vl);
 }
 
 static void apc_submit (struct apc_detail_s *apcups_detail)