X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdf.c;h=433f4e2cf7116fad666f6065e2ea223aa0df1c8c;hb=1fdb04e6cb573ad06b914b9371f21ffb255b1d13;hp=dd5e13824660c34da87231606029531fed4e99eb;hpb=79d36d9eb61ac09f253769feff144383b2b665c9;p=collectd.git

diff --git a/src/df.c b/src/df.c
index dd5e1382..433f4e2c 100644
--- 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