pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

module/battery: log error message on failure during initialization

Browse source
This commit is contained in:
Daniel Eklöf 2018-12-19 21:12:42 +01:00
parent 3bc4bd56a9
commit d81547066d
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
modules/battery/battery.c
View file

@ -127,7 +127,10 @@ readint_from_fd(int fd)
long ret; long ret;
int r = sscanf(s, "%ld", &ret); int r = sscanf(s, "%ld", &ret);
assert(r == 1); if (r != 1) {
LOG_WARN("failed to convert \"%s\" to an integer", s);
return 0;
}
return ret; return ret;
} }
@ -136,19 +139,25 @@ static int
initialize(struct private *m) initialize(struct private *m)
{ {
int pw_fd = open("/sys/class/power_supply", O_RDONLY); int pw_fd = open("/sys/class/power_supply", O_RDONLY);
if (pw_fd == -1) if (pw_fd == -1) {
LOG_ERRNO("/sys/class/power_supply");
return -1; return -1;
}
int base_dir_fd = openat(pw_fd, m->battery, O_RDONLY); int base_dir_fd = openat(pw_fd, m->battery, O_RDONLY);
close(pw_fd); close(pw_fd);
if (base_dir_fd == -1) if (base_dir_fd == -1) {
LOG_ERRNO("%s", m->battery);
return -1; return -1;
}
{ {
int fd = openat(base_dir_fd, "manufacturer", O_RDONLY); int fd = openat(base_dir_fd, "manufacturer", O_RDONLY);
if (fd == -1) if (fd == -1) {
LOG_ERRNO("/sys/class/power_supply/%s/manufacturer", m->battery);
goto err; goto err;
}
m->manufacturer = strdup(readline_from_fd(fd)); m->manufacturer = strdup(readline_from_fd(fd));
close(fd); close(fd);
@ -156,8 +165,10 @@ initialize(struct private *m)
{ {
int fd = openat(base_dir_fd, "model_name", O_RDONLY); int fd = openat(base_dir_fd, "model_name", O_RDONLY);
if (fd == -1) if (fd == -1) {
LOG_ERRNO("/sys/class/power_supply/%s/model_name", m->battery);
goto err; goto err;
}
m->model = strdup(readline_from_fd(fd)); m->model = strdup(readline_from_fd(fd));
close(fd); close(fd);
@ -165,8 +176,10 @@ initialize(struct private *m)
{ {
int fd = openat(base_dir_fd, "energy_full_design", O_RDONLY); int fd = openat(base_dir_fd, "energy_full_design", O_RDONLY);
if (fd == -1) if (fd == -1) {
LOG_ERRNO("/sys/class/power_supply/%s/energy_full_design", m->battery);
goto err; goto err;
}
m->energy_full_design = readint_from_fd(fd); m->energy_full_design = readint_from_fd(fd);
close(fd); close(fd);
@ -174,8 +187,10 @@ initialize(struct private *m)
{ {
int fd = openat(base_dir_fd, "energy_full", O_RDONLY); int fd = openat(base_dir_fd, "energy_full", O_RDONLY);
if (fd == -1) if (fd == -1) {
LOG_ERRNO("/sys/class/power_supply/%s/energy_full", m->battery);
goto err; goto err;
}
m->energy_full = readint_from_fd(fd); m->energy_full = readint_from_fd(fd);
close(fd); close(fd);
@ -212,11 +227,9 @@ update_status(struct module *mod, int capacity_fd, int energy_fd, int power_fd,
else { else {
LOG_ERR("unrecognized battery state: %s", status); LOG_ERR("unrecognized battery state: %s", status);
state = STATE_DISCHARGING; state = STATE_DISCHARGING;
assert(false && "unrecognized battery state");
} }
LOG_DBG("capacity: %ld, energy: %ld, power: %ld", LOG_DBG("capacity: %ld, energy: %ld, power: %ld", capacity, energy, power);
capacity, energy, power);
mtx_lock(&mod->lock); mtx_lock(&mod->lock);
m->state = state; m->state = state;