sstrerror: Be even more cautios with the return value of `strerror_r'..

[collectd.git] / src / df.c

diff --git a/src/df.c b/src/df.c
index dd5e138..433f4e2 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -46,18 +46,6 @@
 # define BLOCKSIZE(s) (s).f_bsize
 #endif
 
-/* 2^50 - 1 == 1125899906842623 = 1 Petabyte */
-static data_source_t dsrc[2] =
-{
-       {"free", DS_TYPE_GAUGE, 0, 1125899906842623.0},
-       {"used", DS_TYPE_GAUGE, 0, 1125899906842623.0}
-};
-
-static data_set_t ds =
-{
-       "df", 2, dsrc
-};
-
 #if DF_HAVE_READ
 static const char *config_keys[] =
 {
@@ -142,7 +130,7 @@ static void df_submit (char *df_name,
        vl.values = values;
        vl.values_len = 2;
        vl.time = time (NULL);
-       strcpy (vl.host, hostname);
+       strcpy (vl.host, hostname_g);
        strcpy (vl.plugin, "df");
        strcpy (vl.plugin_instance, "");
        strncpy (vl.type_instance, df_name, sizeof (vl.type_instance));
@@ -174,7 +162,10 @@ static int df_read (void)
        {
                if (STATANYFS (mnt_ptr->dir, &statbuf) < 0)
                {
-                       syslog (LOG_ERR, "statv?fs failed: %s", strerror (errno));
+                       char errbuf[1024];
+                       ERROR ("statv?fs failed: %s",
+                                       sstrerror (errno, errbuf,
+                                               sizeof (errbuf)));
                        continue;
                }
 
@@ -222,10 +213,9 @@ static int df_read (void)
 
 void module_register (void)
 {
-       plugin_register_data_set (&ds);
-
 #if DF_HAVE_READ
-       plugin_register_config ("df", df_config, config_keys, config_keys_num);
+       plugin_register_config ("df", df_config,
+                       config_keys, config_keys_num);
        plugin_register_init ("df", df_init);
        plugin_register_read ("df", df_read);
 #endif