X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fping.c;h=27a65faafc36f23a14118ac61a04353acc48704f;hb=747f853a2ce3f8a55438aff274df5ea25a3e9cce;hp=eb716a4771537639bf10b17d1460c56054351f05;hpb=20d30b176dad6c969feb610777a8dfbb6dc04e70;p=collectd.git

diff --git a/src/ping.c b/src/ping.c
index eb716a47..27a65faa 100644
--- a/src/ping.c
+++ b/src/ping.c
@@ -45,16 +45,6 @@ typedef struct hostlist_s hostlist_t;
 static pingobj_t *pingobj = NULL;
 static hostlist_t *hosts = NULL;
 
-static data_source_t dsrc[1] =
-{
-	{"ping", DS_TYPE_GAUGE, 0, 65535.0},
-};
-
-static data_set_t ds =
-{
-	"ping", 1, dsrc
-};
-
 static const char *config_keys[] =
 {
 	"Host",
@@ -251,7 +241,7 @@ static int ping_read (void)
 		number_of_hosts++;
 	}
 
-	if ((number_of_hosts == 0) && (getuid != 0))
+	if ((number_of_hosts == 0) && (getuid () != 0))
 	{
 		ERROR ("ping plugin: All hosts failed. Try starting collectd as root.");
 	}
@@ -259,16 +249,10 @@ static int ping_read (void)
 	return (number_of_hosts == 0 ? -1 : 0);
 } /* int ping_read */
 
-void module_register (modreg_e load)
+void module_register (void)
 {
-	if (load & MR_DATASETS)
-		plugin_register_data_set (&ds);
-
-	if (load & MR_READ)
-	{
-		plugin_register_config ("ping", ping_config,
-				config_keys, config_keys_num);
-		plugin_register_init ("ping", ping_init);
-		plugin_register_read ("ping", ping_read);
-	}
+	plugin_register_config ("ping", ping_config,
+			config_keys, config_keys_num);
+	plugin_register_init ("ping", ping_init);
+	plugin_register_read ("ping", ping_read);
 } /* void module_register */