X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fping.c;h=ffb16910eaff3655d7326e30592595dc1da31410;hp=b07a4247bf53f7bf446300f2231d915a4f2f3341;hb=ec51ddee94fa2ba1e01fe0e336ccc9c190a198ff;hpb=c265bcdf47770ef826a88befb621fe85b16ec5e4

diff --git a/src/ping.c b/src/ping.c
index b07a4247..ffb16910 100644
--- a/src/ping.c
+++ b/src/ping.c
@@ -69,14 +69,14 @@ typedef struct hostlist_s hostlist_t;
 /*
  * Private variables
  */
-static hostlist_t *hostlist_head = NULL;
+static hostlist_t *hostlist_head;
 
 static int ping_af = PING_DEF_AF;
-static char *ping_source = NULL;
+static char *ping_source;
 #ifdef HAVE_OPING_1_3
-static char *ping_device = NULL;
+static char *ping_device;
 #endif
-static char *ping_data = NULL;
+static char *ping_data;
 static int ping_ttl = PING_DEF_TTL;
 static double ping_interval = 1.0;
 static double ping_timeout = 0.9;
@@ -84,8 +84,8 @@ static int ping_max_missed = -1;
 
 static pthread_mutex_t ping_lock = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t ping_cond = PTHREAD_COND_INITIALIZER;
-static int ping_thread_loop = 0;
-static int ping_thread_error = 0;
+static int ping_thread_loop;
+static int ping_thread_error;
 static pthread_t ping_thread_id;
 
 static const char *config_keys[] = {"Host",    "SourceAddress", "AddressFamily",
@@ -298,7 +298,7 @@ static void *ping_thread(void *arg) /* {{{ */
 
   pthread_mutex_lock(&ping_lock);
   while (ping_thread_loop > 0) {
-    _Bool send_successful = 0;
+    bool send_successful = false;
 
     if (gettimeofday(&tv_begin, NULL) < 0) {
       ERROR("ping plugin: gettimeofday failed: %s", STRERRNO);
@@ -314,7 +314,7 @@ static void *ping_thread(void *arg) /* {{{ */
                  ping_get_error(pingobj));
     } else {
       c_release(LOG_NOTICE, &complaint, "ping plugin: ping_send succeeded.");
-      send_successful = 1;
+      send_successful = true;
     }
 
     pthread_mutex_lock(&ping_lock);
@@ -488,9 +488,7 @@ static int ping_config(const char *key, const char *value) /* {{{ */
     } else if (strncmp(af, "ipv6", 4) == 0) {
       ping_af = AF_INET6;
     } else {
-      ERROR("ping plugin: Bad address family: %s", af);
-      free(af);
-      return 1;
+      WARNING("ping plugin: Ignoring invalid AddressFamily value %s", af);
     }
     free(af);