configure.in: Many fixes for Solaris. Especially check the `kstat_io_t'-type for...

[collectd.git] / src / df.c

diff --git a/src/df.c b/src/df.c
index dd5e138..afd3e0b 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -142,7 +142,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 +174,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;
                }
 
@@ -220,13 +223,18 @@ static int df_read (void)
 } /* int df_read */
 #endif /* DF_HAVE_READ */
 
-void module_register (void)
+void module_register (modreg_e load)
 {
-       plugin_register_data_set (&ds);
+       if (load & MR_DATASETS)
+               plugin_register_data_set (&ds);
 
 #if DF_HAVE_READ
-       plugin_register_config ("df", df_config, config_keys, config_keys_num);
-       plugin_register_init ("df", df_init);
-       plugin_register_read ("df", df_read);
+       if (load & MR_READ)
+       {
+               plugin_register_config ("df", df_config,
+                               config_keys, config_keys_num);
+               plugin_register_init ("df", df_init);
+               plugin_register_read ("df", df_read);
+       }
 #endif
 } /* void module_register */