Removed the `XXX_HAVE_READ' defines from all plugins.

[collectd.git] / src / apcups.c

diff --git a/src/apcups.c b/src/apcups.c
index b5b939a..62c7a3c 100644 (file)
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -1,9 +1,11 @@
 /*
  * collectd - src/apcups.c
+ * Copyright (C) 2007 Florian octo Forster
  * 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>
  *
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General
  * Public License as published by the Free Software Foundation.
@@ -78,59 +80,6 @@ static int   conf_port = NISPORT;
 
 static int global_sockfd = -1;
 
-/* 
- * The following are only if not compiled to test the module with its own main.
-*/
-static data_source_t data_source_voltage[1] =
-{
-       {"value", DS_TYPE_GAUGE, NAN, NAN}
-};
-
-static data_set_t ds_voltage =
-{
-       "voltage", 1, data_source_voltage
-};
-
-static data_source_t data_source_percent[1] =
-{
-       {"percent", DS_TYPE_GAUGE, 0, 100.1}
-};
-
-static data_set_t ds_percent =
-{
-       "percent", 1, data_source_percent
-};
-
-static data_source_t data_source_timeleft[1] =
-{
-       {"timeleft", DS_TYPE_GAUGE, 0, 100.0}
-};
-
-static data_set_t ds_timeleft =
-{
-       "timeleft", 1, data_source_timeleft
-};
-
-static data_source_t data_source_temperature[1] =
-{
-       {"value", DS_TYPE_GAUGE, -273.15, NAN}
-};
-
-static data_set_t ds_temperature =
-{
-       "temperature", 1, data_source_temperature
-};
-
-static data_source_t data_source_frequency[1] =
-{
-       {"frequency", DS_TYPE_GAUGE, 0, NAN}
-};
-
-static data_set_t ds_frequency =
-{
-       "frequency", 1, data_source_frequency
-};
-
 static const char *config_keys[] =
 {
        "Host",
@@ -186,7 +135,11 @@ static int net_open (char *host, char *service, int port)
        status = getaddrinfo (host, port_str, &ai_hints, &ai_return);
        if (status != 0)
        {
-               DEBUG ("getaddrinfo failed: %s", status == EAI_SYSTEM ? strerror (errno) : gai_strerror (status));
+               char errbuf[1024];
+               DEBUG ("getaddrinfo failed: %s",
+                               (status == EAI_SYSTEM)
+                               ? sstrerror (errno, errbuf, sizeof (errbuf))
+                               : gai_strerror (status));
                return (-1);
        }
 
@@ -213,7 +166,9 @@ static int net_open (char *host, char *service, int port)
 
        if (status != 0) /* `connect(2)' failed */
        {
-               DEBUG ("connect failed: %s", strerror (errno));
+               char errbuf[1024];
+               DEBUG ("connect failed: %s",
+                               sstrerror (errno, errbuf, sizeof (errbuf)));
                close (sd);
                return (-1);
        }
@@ -484,14 +439,8 @@ static int apcups_read (void)
 
 void module_register (void)
 {
-       plugin_register_data_set (&ds_voltage);
-       plugin_register_data_set (&ds_percent);
-       plugin_register_data_set (&ds_timeleft);
-       plugin_register_data_set (&ds_temperature);
-       plugin_register_data_set (&ds_frequency);
-
-       plugin_register_config ("apcups", apcups_config, config_keys, config_keys_num);
-
+       plugin_register_config ("apcups", apcups_config, config_keys,
+                       config_keys_num);
        plugin_register_read ("apcups", apcups_read);
        plugin_register_shutdown ("apcups", apcups_shutdown);
-}
+} /* void module_register */