marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Match trailing equal sign in slurp_battery_info.

Browse Source 
Should make it more resilient to future ambiguities in uevent.
This commit is contained in:
Tommie Gannert 2016-08-16 09:18:05 +01:00
parent 15de209cba
commit ac8998ef03
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/print_battery_info.c
View File

@ -65,21 +65,21 @@ static bool slurp_battery_info(struct battery_info *batt_info, yajl_gen json_gen
if (*walk != '=') if (*walk != '=')
continue; continue;
if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_NOW")) { if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_NOW=")) {
watt_as_unit = true; watt_as_unit = true;
batt_info->remaining = atoi(walk + 1); batt_info->remaining = atoi(walk + 1);
} else if (BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_NOW")) { } else if (BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_NOW=")) {
watt_as_unit = false; watt_as_unit = false;
batt_info->remaining = atoi(walk + 1); batt_info->remaining = atoi(walk + 1);
} else if (BEGINS_WITH(last, "POWER_SUPPLY_CURRENT_NOW")) } else if (BEGINS_WITH(last, "POWER_SUPPLY_CURRENT_NOW="))
batt_info->present_rate = abs(atoi(walk + 1)); batt_info->present_rate = abs(atoi(walk + 1));
else if (BEGINS_WITH(last, "POWER_SUPPLY_VOLTAGE_NOW")) else if (BEGINS_WITH(last, "POWER_SUPPLY_VOLTAGE_NOW="))
voltage = abs(atoi(walk + 1)); voltage = abs(atoi(walk + 1));
/* on some systems POWER_SUPPLY_POWER_NOW does not exist, but actually /* on some systems POWER_SUPPLY_POWER_NOW does not exist, but actually
* it is the same as POWER_SUPPLY_CURRENT_NOW but with μWh as * it is the same as POWER_SUPPLY_CURRENT_NOW but with μWh as
* unit instead of μAh. We will calculate it as we need it * unit instead of μAh. We will calculate it as we need it
* later. */ * later. */
else if (BEGINS_WITH(last, "POWER_SUPPLY_POWER_NOW")) else if (BEGINS_WITH(last, "POWER_SUPPLY_POWER_NOW="))
batt_info->present_rate = abs(atoi(walk + 1)); batt_info->present_rate = abs(atoi(walk + 1));
else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Charging")) else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=Charging"))
batt_info->status = CS_CHARGING; batt_info->status = CS_CHARGING;
@ -89,11 +89,11 @@ static bool slurp_battery_info(struct battery_info *batt_info, yajl_gen json_gen
batt_info->status = CS_DISCHARGING; batt_info->status = CS_DISCHARGING;
else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS=")) else if (BEGINS_WITH(last, "POWER_SUPPLY_STATUS="))
batt_info->status = CS_UNKNOWN; batt_info->status = CS_UNKNOWN;
else if (BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL_DESIGN") || else if (BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL_DESIGN=") ||
BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN")) BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN="))
batt_info->full_design = atoi(walk + 1); batt_info->full_design = atoi(walk + 1);
else if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL") || else if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL=") ||
BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL")) BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL="))
batt_info->full_last = atoi(walk + 1); batt_info->full_last = atoi(walk + 1);
} }