battery: Minor coding style fixes
- Line length - Spacing and indentation - No explicit checks for NULL
This commit is contained in:
parent
bae576cd22
commit
103945e7bb
@ -15,13 +15,16 @@
|
|||||||
#define POWER_NOW "/sys/class/power_supply/%s/power_now"
|
#define POWER_NOW "/sys/class/power_supply/%s/power_now"
|
||||||
|
|
||||||
static const char *
|
static const char *
|
||||||
pick(const char *bat, const char *f1, const char *f2, char *path, size_t length)
|
pick(const char *bat, const char *f1, const char *f2, char *path,
|
||||||
|
size_t length)
|
||||||
{
|
{
|
||||||
if (esnprintf(path, length, f1, bat) > 0 && access(path, R_OK) == 0) {
|
if (esnprintf(path, length, f1, bat) > 0 &&
|
||||||
|
access(path, R_OK) == 0) {
|
||||||
return f1;
|
return f1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (esnprintf(path, length, f2, bat) > 0 && access(path, R_OK) == 0) {
|
if (esnprintf(path, length, f2, bat) > 0 &&
|
||||||
|
access(path, R_OK) == 0) {
|
||||||
return f2;
|
return f2;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -92,13 +95,14 @@
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pick(bat, CHARGE_NOW, ENERGY_NOW, path, sizeof (path)) == NULL ||
|
if (!pick(bat, CHARGE_NOW, ENERGY_NOW, path, sizeof(path)) ||
|
||||||
pscanf(path, "%d", &charge_now) < 0) {
|
pscanf(path, "%d", &charge_now) < 0) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!strcmp(state, "Discharging")) {
|
if (!strcmp(state, "Discharging")) {
|
||||||
if (pick(bat, CURRENT_NOW, POWER_NOW, path, sizeof (path)) == NULL ||
|
if (!pick(bat, CURRENT_NOW, POWER_NOW, path,
|
||||||
|
sizeof(path)) ||
|
||||||
pscanf(path, "%d", ¤t_now) < 0) {
|
pscanf(path, "%d", ¤t_now) < 0) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@ -182,7 +186,8 @@
|
|||||||
|
|
||||||
if (load_apm_power_info(&apm_info)) {
|
if (load_apm_power_info(&apm_info)) {
|
||||||
if (apm_info.ac_state != APM_AC_ON) {
|
if (apm_info.ac_state != APM_AC_ON) {
|
||||||
return bprintf("%uh %02um", apm_info.minutes_left / 60,
|
return bprintf("%uh %02um",
|
||||||
|
apm_info.minutes_left / 60,
|
||||||
apm_info.minutes_left % 60);
|
apm_info.minutes_left % 60);
|
||||||
} else {
|
} else {
|
||||||
return "";
|
return "";
|
||||||
|
Loading…
Reference in New Issue
Block a user