Merged changed on `battery.c' from `trunk' to `tags/collectd-3.7.2'

diff --git a/src/battery.c b/src/battery.c
index 6c7e2b50d6d17b4e6e77be41d71fc04ff24d911b..d467ecc8614148181cd945941f45d616915a6f26 100644 (file)
--- a/src/battery.c
+++ b/src/battery.c
@@ -285,22 +285,22 @@ static void battery_read (void)
                                if (numfields < 3)
                                        continue;
 
-                               if ((strcmp (fields[0], "present"))
-                                               && (strcmp (fields[1], "rate:")))
+                               if ((strcmp (fields[0], "present") == 0)
+                                               && (strcmp (fields[1], "rate:") == 0))
                                        valptr = &current;
-                               else if ((strcmp (fields[0], "remaining"))
-                                               && (strcmp (fields[1], "capacity:")))
+                               else if ((strcmp (fields[0], "remaining") == 0)
+                                               && (strcmp (fields[1], "capacity:") == 0))
                                        valptr = &charge;
-                               else if ((strcmp (fields[0], "present"))
-                                               && (strcmp (fields[1], "voltage:")))
+                               else if ((strcmp (fields[0], "present") == 0)
+                                               && (strcmp (fields[1], "voltage:") == 0))
                                        valptr = &voltage;
                                else
                                        valptr = NULL;
 
-                               if ((strcmp (fields[0], "charging"))
-                                               && (strcmp (fields[1], "state:")))
+                               if ((strcmp (fields[0], "charging") == 0)
+                                               && (strcmp (fields[1], "state:") == 0))
                                {
-                                       if (strcmp (fields[2], "charging"))
+                                       if (strcmp (fields[2], "charging") == 0)
                                                charging = 1;
                                        else
                                                charging = 0;