Moved `exit_usage' from `collectd.c' to `configfile.c' and renamed it to `cf_callback...

[collectd.git] / src / ping.c

diff --git a/src/ping.c b/src/ping.c
index e6456f8c9ef66593b364edde4a91df2327b978dc..bdb8de9652b3a1f8551ba5850cb987b029a7f160 100644 (file)
--- a/src/ping.c
+++ b/src/ping.c
@@ -20,18 +20,18 @@
  *   Florian octo Forster <octo at verplant.org>
  **/
 
-#include "ping.h"
-
-#if COLLECT_PING
-#define MODULE_NAME "ping"
-
-#include "plugin.h"
+#include "collectd.h"
 #include "common.h"
+#include "plugin.h"
 #include "configfile.h"
 
+#define MODULE_NAME "ping"
+
 #include <netinet/in.h>
 #include "libping/ping.h"
 
+#define MAX_PINGHOSTS 32
+
 extern char *pinghosts[MAX_PINGHOSTS];
 extern int   num_pinghosts;
 static int   pingerrors[MAX_PINGHOSTS];
@@ -52,7 +52,7 @@ static char *config_keys[] =
 };
 static int config_keys_num = 1;
 
-void ping_init (void)
+static void ping_init (void)
 {
        int i;
 
@@ -62,7 +62,7 @@ void ping_init (void)
        return;
 }
 
-int ping_config (char *key, char *value)
+static int ping_config (char *key, char *value)
 {
        if (strcasecmp (key, "host"))
        {
@@ -84,7 +84,7 @@ int ping_config (char *key, char *value)
        }
 }
 
-void ping_write (char *host, char *inst, char *val)
+static void ping_write (char *host, char *inst, char *val)
 {
        char file[512];
        int status;
@@ -99,7 +99,7 @@ void ping_write (char *host, char *inst, char *val)
 }
 
 #define BUFSIZE 256
-void ping_submit (int ping_time, char *host)
+static void ping_submit (int ping_time, char *host)
 {
        char buf[BUFSIZE];
 
@@ -110,7 +110,7 @@ void ping_submit (int ping_time, char *host)
 }
 #undef BUFSIZE
 
-void ping_read (void)
+static void ping_read (void)
 {
        int ping;
        int i;
@@ -163,4 +163,3 @@ void module_register (void)
 }
 
 #undef MODULE_NAME
-#endif /* COLLECT_PING */