Various plugins: Use the IS_TRUE and IS_FALSE macros everywhere.

diff --git a/src/apache.c b/src/apache.c
index a333bf2..df1b560 100644 (file)
--- a/src/apache.c
+++ b/src/apache.c
@@ -212,13 +212,9 @@ static int config_set_boolean (int *ret_boolean, /* {{{ */
        else /* if (ci->values[0].type != OCONFIG_TYPE_STRING) */
        {
                char *string = ci->values[0].value.string;
-               if ((strcasecmp ("true", string) == 0)
-                               || (strcasecmp ("yes", string) == 0)
-                               || (strcasecmp ("on", string) == 0))
+               if (IS_TRUE (string))
                        *ret_boolean = 1;
-               else if ((strcasecmp ("false", string) == 0)
-                               || (strcasecmp ("no", string) == 0)
-                               || (strcasecmp ("off", string) == 0))
+               else if (IS_FALSE (string))
                        *ret_boolean = 0;
                else
                {

diff --git a/src/ascent.c b/src/ascent.c
index 1e7eca1..6782fce 100644 (file)
--- a/src/ascent.c
+++ b/src/ascent.c
@@ -562,12 +562,12 @@ static int ascent_init (void) /* {{{ */
   curl_easy_setopt (curl, CURLOPT_URL, url);
   curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1);
 
-  if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0))
+  if ((verify_peer == NULL) || IS_TRUE (verify_peer))
     curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1);
   else
     curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0);
 
-  if ((verify_host == NULL) || (strcmp (verify_host, "true") == 0))
+  if ((verify_host == NULL) || IS_TRUE (verify_host))
     curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2);
   else
     curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0);

diff --git a/src/collectd.c b/src/collectd.c
index 576abef..bc69a3b 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -102,9 +102,7 @@ static int init_hostname (void)
        }
 
        str = global_option_get ("FQDNLookup");
-       if ((strcasecmp ("false", str) == 0)
-                       || (strcasecmp ("no", str) == 0)
-                       || (strcasecmp ("off", str) == 0))
+       if (IS_FALSE (str))
                return (0);
 
        memset (&ai_hints, '\0', sizeof (ai_hints));

diff --git a/src/csv.c b/src/csv.c
index 78037a9..0b34687 100644 (file)
--- a/src/csv.c
+++ b/src/csv.c
@@ -246,16 +246,10 @@ static int csv_config (const char *key, const char *value)
        }
        else if (strcasecmp ("StoreRates", key) == 0)
        {
-               if ((strcasecmp ("True", value) == 0)
-                               || (strcasecmp ("Yes", value) == 0)
-                               || (strcasecmp ("On", value) == 0))
-               {
+               if (IS_TRUE (value))
                        store_rates = 1;
-               }
                else
-               {
                        store_rates = 0;
-               }
        }
        else
        {

diff --git a/src/disk.c b/src/disk.c
index 489770c..5df1c98 100644 (file)
--- a/src/disk.c
+++ b/src/disk.c
@@ -132,9 +132,7 @@ static int disk_config (const char *key, const char *value)
   else if (strcasecmp ("IgnoreSelected", key) == 0)
   {
     int invert = 1;
-    if ((strcasecmp ("True", value) == 0)
-       || (strcasecmp ("Yes", value) == 0)
-       || (strcasecmp ("On", value) == 0))
+    if (IS_TRUE (value))
       invert = 0;
     ignorelist_set_invert (ignorelist, invert);
   }

diff --git a/src/hddtemp.c b/src/hddtemp.c
index 2405d8c..4e08375 100644 (file)
--- a/src/hddtemp.c
+++ b/src/hddtemp.c
@@ -233,9 +233,7 @@ static int hddtemp_config (const char *key, const char *value)
        }
        else if (strcasecmp (key, "TranslateDevicename") == 0)
        {
-               if ((strcasecmp ("true", value) == 0)
-                               || (strcasecmp ("yes", value) == 0)
-                               || (strcasecmp ("on", value) == 0))
+               if (IS_TRUE (value))
                        translate_devicename = 1;
                else
                        translate_devicename = 0;

diff --git a/src/interface.c b/src/interface.c
index fad37db..fead888 100644 (file)
--- a/src/interface.c
+++ b/src/interface.c
@@ -99,9 +99,7 @@ static int interface_config (const char *key, const char *value)
        else if (strcasecmp (key, "IgnoreSelected") == 0)
        {
                int invert = 1;
-               if ((strcasecmp (value, "True") == 0)
-                               || (strcasecmp (value, "Yes") == 0)
-                               || (strcasecmp (value, "On") == 0))
+               if (IS_TRUE (value))
                        invert = 0;
                ignorelist_set_invert (ignorelist, invert);
        }

diff --git a/src/ipmi.c b/src/ipmi.c
index 441ad8f..95b3dbf 100644 (file)
--- a/src/ipmi.c
+++ b/src/ipmi.c
@@ -632,31 +632,23 @@ static int c_ipmi_config (const char *key, const char *value)
   else if (strcasecmp ("IgnoreSelected", key) == 0)
   {
     int invert = 1;
-    if ((strcasecmp ("True", value) == 0)
-        || (strcasecmp ("Yes", value) == 0)
-        || (strcasecmp ("On", value) == 0))
+    if (IS_TRUE (value))
       invert = 0;
     ignorelist_set_invert (ignorelist, invert);
   }
   else if (strcasecmp ("NotifySensorAdd", key) == 0)
   {
-    if ((strcasecmp ("True", value) == 0)
-        || (strcasecmp ("Yes", value) == 0)
-        || (strcasecmp ("On", value) == 0))
+    if (IS_TRUE (value))
       c_ipmi_nofiy_add = 1;
   }
   else if (strcasecmp ("NotifySensorRemove", key) == 0)
   {
-    if ((strcasecmp ("True", value) == 0)
-        || (strcasecmp ("Yes", value) == 0)
-        || (strcasecmp ("On", value) == 0))
+    if (IS_TRUE (value))
       c_ipmi_nofiy_remove = 1;
   }
   else if (strcasecmp ("NotifySensorNotPresent", key) == 0)
   {
-    if ((strcasecmp ("True", value) == 0)
-        || (strcasecmp ("Yes", value) == 0)
-        || (strcasecmp ("On", value) == 0))
+    if (IS_TRUE (value))
       c_ipmi_nofiy_notpresent = 1;
   }
   else

diff --git a/src/irq.c b/src/irq.c
index 1aef344..401cc6f 100644 (file)
--- a/src/irq.c
+++ b/src/irq.c
@@ -85,9 +85,7 @@ static int irq_config (const char *key, const char *value)
        }
        else if (strcasecmp (key, "IgnoreSelected") == 0)
        {
-               if ((strcasecmp (value, "True") == 0)
-                               || (strcasecmp (value, "Yes") == 0)
-                               || (strcasecmp (value, "On") == 0))
+               if (IS_TRUE (value))
                        irq_list_action = 1;
                else
                        irq_list_action = 0;

diff --git a/src/libvirt.c b/src/libvirt.c
index 6f9e5f1..bcbf0e6 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -187,9 +187,7 @@ lv_config (const char *key, const char *value)
     }
 
     if (strcasecmp (key, "IgnoreSelected") == 0) {
-        if (strcasecmp (value, "True") == 0 ||
-            strcasecmp (value, "Yes") == 0 ||
-            strcasecmp (value, "On") == 0)
+        if (IS_TRUE (value))
         {
             ignorelist_set_invert (il_domains, 0);
             ignorelist_set_invert (il_block_devices, 0);

diff --git a/src/logfile.c b/src/logfile.c
index 03af7a3..7b96ac5 100644 (file)
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -74,9 +74,7 @@ static int logfile_config (const char *key, const char *value)
                log_file = strdup (value);
        }
        else if (0 == strcasecmp (key, "Timestamp")) {
-               if ((strcasecmp (value, "false") == 0)
-                               || (strcasecmp (value, "no") == 0)
-                               || (strcasecmp (value, "off") == 0))
+               if (IS_FALSE (value))
                        print_timestamp = 0;
                else
                        print_timestamp = 1;

diff --git a/src/netlink.c b/src/netlink.c
index b15768e..49c4e99 100644 (file)
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -526,9 +526,7 @@ static int ir_config (const char *key, const char *value)
     }
     else
     {
-      if ((strcasecmp (fields[0], "yes") == 0)
-         || (strcasecmp (fields[0], "true") == 0)
-         || (strcasecmp (fields[0], "on") == 0))
+      if (IS_TRUE (fields[0]))
        ir_ignorelist_invert = 0;
       else
        ir_ignorelist_invert = 1;

diff --git a/src/network.c b/src/network.c
index 109289e..f4b8757 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -2518,13 +2518,9 @@ static int network_config_set_boolean (const oconfig_item_t *ci, /* {{{ */
   {
     char *str = ci->values[0].value.string;
 
-    if ((strcasecmp ("true", str) == 0)
-        || (strcasecmp ("yes", str) == 0)
-        || (strcasecmp ("on", str) == 0))
+    if (IS_TRUE (str))
       *retval = 1;
-    else if ((strcasecmp ("false", str) == 0)
-        || (strcasecmp ("no", str) == 0)
-        || (strcasecmp ("off", str) == 0))
+    else if (IS_FALSE (str))
       *retval = 0;
     else
     {

diff --git a/src/nginx.c b/src/nginx.c
index 53137a7..6976842 100644 (file)
--- a/src/nginx.c
+++ b/src/nginx.c
@@ -143,7 +143,7 @@ static int init (void)
 
   curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1);
 
-  if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0))
+  if ((verify_peer == NULL) || IS_TRUE (verify_peer))
   {
     curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1);
   }
@@ -152,7 +152,7 @@ static int init (void)
     curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0);
   }
 
-  if ((verify_host == NULL) || (strcmp (verify_host, "true") == 0))
+  if ((verify_host == NULL) || IS_TRUE (verify_host))
   {
     curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2);
   }

diff --git a/src/ntpd.c b/src/ntpd.c
index 9d716ad..ecc87c7 100644 (file)
--- a/src/ntpd.c
+++ b/src/ntpd.c
@@ -278,9 +278,7 @@ static int ntpd_config (const char *key, const char *value)
        }
        else if (strcasecmp (key, "ReverseLookups") == 0)
        {
-               if ((strcasecmp (value, "True") == 0)
-                               || (strcasecmp (value, "Yes") == 0)
-                               || (strcasecmp (value, "On") == 0))
+               if (IS_TRUE (value))
                        do_reverse_lookups = 1;
                else
                        do_reverse_lookups = 0;

diff --git a/src/onewire.c b/src/onewire.c
index 261457a..cae0d63 100644 (file)
--- a/src/onewire.c
+++ b/src/onewire.c
@@ -89,9 +89,7 @@ static int cow_load_config (const char *key, const char *value)
   else if (strcasecmp (key, "IgnoreSelected") == 0)
   {
     ignorelist_set_invert (sensor_list, 1);
-    if ((strcasecmp (value, "True") == 0)
-        || (strcasecmp (value, "Yes") == 0)
-        || (strcasecmp (value, "On") == 0))
+    if (IS_TRUE (value))
       ignorelist_set_invert (sensor_list, 0);
   }
   else if (strcasecmp (key, "Device") == 0)

diff --git a/src/protocols.c b/src/protocols.c
index 75e9a1c..73fe154 100644 (file)
--- a/src/protocols.c
+++ b/src/protocols.c
@@ -224,9 +224,7 @@ static int protocols_config (const char *key, const char *value)
   else if (strcasecmp (key, "IgnoreSelected") == 0)
   {
     int invert = 1;
-    if ((strcasecmp (value, "True") == 0)
-        || (strcasecmp (value, "Yes") == 0)
-        || (strcasecmp (value, "On") == 0))
+    if (IS_TRUE (value))
       invert = 0;
     ignorelist_set_invert (values_list, invert);
   }

diff --git a/src/rrdcached.c b/src/rrdcached.c
index 728ada4..bca10be 100644 (file)
--- a/src/rrdcached.c
+++ b/src/rrdcached.c
@@ -192,18 +192,14 @@ static int rc_config (const char *key, const char *value)
   }
   else if (strcasecmp ("CreateFiles", key) == 0)
   {
-    if ((strcasecmp ("false", value) == 0)
-        || (strcasecmp ("no", value) == 0)
-        || (strcasecmp ("off", value) == 0))
+    if (IS_FALSE (value))
       config_create_files = 0;
     else
       config_create_files = 1;
   }
   else if (strcasecmp ("CollectStatistics", key) == 0)
   {
-    if ((strcasecmp ("false", value) == 0)
-        || (strcasecmp ("no", value) == 0)
-        || (strcasecmp ("off", value) == 0))
+    if (IS_FALSE (value))
       config_collect_stats = 0;
     else
       config_collect_stats = 1;

diff --git a/src/sensors.c b/src/sensors.c
index fa461a2..8391346 100644 (file)
--- a/src/sensors.c
+++ b/src/sensors.c
@@ -237,9 +237,7 @@ static int sensors_config (const char *key, const char *value)
        else if (strcasecmp (key, "IgnoreSelected") == 0)
        {
                ignorelist_set_invert (sensor_list, 1);
-               if ((strcasecmp (value, "True") == 0)
-                               || (strcasecmp (value, "Yes") == 0)
-                               || (strcasecmp (value, "On") == 0))
+               if (IS_TRUE (value))
                        ignorelist_set_invert (sensor_list, 0);
        }
        else

diff --git a/src/tcpconns.c b/src/tcpconns.c
index f164b53..d68cd09 100644 (file)
--- a/src/tcpconns.c
+++ b/src/tcpconns.c
@@ -454,9 +454,7 @@ static int conn_config (const char *key, const char *value)
 {
   if (strcasecmp (key, "ListeningPorts") == 0)
   {
-    if ((strcasecmp (value, "Yes") == 0)
-       || (strcasecmp (value, "True") == 0)
-       || (strcasecmp (value, "On") == 0))
+    if (IS_TRUE (value))
       port_collect_listening = 1;
     else
       port_collect_listening = 0;

diff --git a/src/thermal.c b/src/thermal.c
index fe54aee..2b70805 100644 (file)
--- a/src/thermal.c
+++ b/src/thermal.c
@@ -198,17 +198,13 @@ static int thermal_config (const char *key, const char *value)
        else if (strcasecmp (key, "IgnoreSelected") == 0)
        {
                ignorelist_set_invert (device_list, 1);
-               if ((strcasecmp (value, "True") == 0)
-                               || (strcasecmp (value, "Yes") == 0)
-                               || (strcasecmp (value, "On") == 0))
+               if (IS_TRUE (value))
                        ignorelist_set_invert (device_list, 0);
        }
        else if (strcasecmp (key, "ForceUseProcfs") == 0)
        {
                force_procfs = 0;
-               if ((strcasecmp (value, "True") == 0)
-                               || (strcasecmp (value, "Yes") == 0)
-                               || (strcasecmp (value, "On") == 0))
+               if (IS_TRUE (value))
                        force_procfs = 1;
        }
        else

diff --git a/src/vmem.c b/src/vmem.c
index 6775d20..d32f1db 100644 (file)
--- a/src/vmem.c
+++ b/src/vmem.c
@@ -77,9 +77,7 @@ static int vmem_config (const char *key, const char *value)
 {
   if (strcasecmp ("Verbose", key) == 0)
   {
-    if ((strcasecmp ("true", value) == 0)
-       || (strcasecmp ("yes", value) == 0)
-       || (strcasecmp ("on", value) == 0))
+    if (IS_TRUE (value))
       verbose_output = 1;
     else
       verbose_output = 0;