From fe05cbcf0d68e1b7c51a0977785b4b3fd678bc9b Mon Sep 17 00:00:00 2001
From: n-a-c-h <>
Date: Mon, 10 Oct 2005 00:24:14 +0000
Subject: [PATCH] Some consolidation.

---
 zsnes/src/linux/sdllink.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/zsnes/src/linux/sdllink.c b/zsnes/src/linux/sdllink.c
index 6639d0ef..94152316 100644
--- a/zsnes/src/linux/sdllink.c
+++ b/zsnes/src/linux/sdllink.c
@@ -1363,7 +1363,7 @@ int CheckBattery()
       fp = fopen(fnbuf, "r");
       if (fp)
       {
-        while (fgets(line, 80, fp) && 2 == sscanf(line, pattern, key, arg))
+        while (fgets(line, 80, fp) && sscanf(line, pattern, key, arg) == 2)
         {
           if (!strcmp(key, "state"))
           {
@@ -1412,13 +1412,13 @@ static void update_battery_info()
       fp = fopen(fnbuf, "r");
       if (fp)
       {
-        while (fgets(line, 80, fp) && 2 == sscanf(line, pattern, key, arg))
+        while (fgets(line, 80, fp) && sscanf(line, pattern, key, arg) == 2)
         {
-          if (strcmp(key, "design capacity") == 0 && sscanf(arg, "%g", &x) == 1)
+          if (!strcmp(key, "design capacity") && sscanf(arg, "%g", &x) == 1)
           {
             design_capacity += x;
           }
-          else if (strcmp(key, "last full capacity") == 0 && sscanf(arg, "%g", &x) == 1)
+          else if (!strcmp(key, "last full capacity") && sscanf(arg, "%g", &x) == 1)
           {
             full_capacity += x;
           }
@@ -1430,25 +1430,25 @@ static void update_battery_info()
       if (fp)
       {
         int charging = 0;
-        while (fgets(line, 80, fp) && 2 == sscanf(line, pattern, key, arg))
+        while (fgets(line, 80, fp) && sscanf(line, pattern, key, arg) == 2)
         {
-          if (strcmp(key, "charging state") == 0)
+          if (!strcmp(key, "charging state"))
           {
-            if (strcmp(arg, "discharging") == 0)
+            if (!strcmp(arg, "discharging"))
             {
               charging = -1;
             }
-            else if (strcmp(arg, "charging") == 0)
+            else if (!strcmp(arg, "charging"))
             {
               charging = 1;
             }
           }
-          else if (strcmp(key, "present rate") == 0 && sscanf(arg, "%g", &x) == 1)
+          else if (!strcmp(key, "present rate") && sscanf(arg, "%g", &x) == 1)
           {
             present_rate += charging * x;
             charging = 0;
           }
-          else if (strcmp(key, "remaining capacity") == 0 && sscanf(arg, "%g:", &x) == 1)
+          else if (!strcmp(key, "remaining capacity") && sscanf(arg, "%g:", &x) == 1)
           {
             remaining_capacity += x;
             charging = 0;