a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some consolidation.

Browse Source
This commit is contained in:
n-a-c-h
2005-10-10 00:24:14 +00:00
parent 5163b9b35e
commit fe05cbcf0d
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
zsnes/src/linux/sdllink.c
View File

@@ -1363,7 +1363,7 @@ int CheckBattery()
fp = fopen(fnbuf, "r"); fp = fopen(fnbuf, "r");
if (fp) 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")) if (!strcmp(key, "state"))
{ {
@@ -1412,13 +1412,13 @@ static void update_battery_info()
fp = fopen(fnbuf, "r"); fp = fopen(fnbuf, "r");
if (fp) 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; 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; full_capacity += x;
} }
@@ -1430,25 +1430,25 @@ static void update_battery_info()
if (fp) if (fp)
{ {
int charging = 0; 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; charging = -1;
} }
else if (strcmp(arg, "charging") == 0) else if (!strcmp(arg, "charging"))
{ {
charging = 1; 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; present_rate += charging * x;
charging = 0; 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; remaining_capacity += x;
charging = 0; charging = 0;