system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-07 00:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

backlight: refactor get_max_brightness() to appease gcc

Browse source 
The old code was just fine, but gcc doesn't understand that max_brightness is
initialized. Let's rework it a bit to move some logic to the main function. Now
get_max_brightness() just retrieves and parses the attribute, and the main
function decides what to do with it.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-04-01 10:19:07 +02:00
parent 0246f42980
commit c03916164d
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/backlight/backlight.c
View file

@ -226,26 +226,20 @@ static int validate_device(sd_device *device) {
}
static int get_max_brightness(sd_device *device, unsigned *ret) {
const char *max_brightness_str;
unsigned max_brightness;
const char *s;
int r;
assert(device);
assert(ret);
r = sd_device_get_sysattr_value(device, "max_brightness", &max_brightness_str);
r = sd_device_get_sysattr_value(device, "max_brightness", &s);
if (r < 0)
return log_device_warning_errno(device, r, "Failed to read 'max_brightness' attribute: %m");
r = safe_atou(max_brightness_str, &max_brightness);
r = safe_atou(s, ret);
if (r < 0)
return log_device_warning_errno(device, r, "Failed to parse 'max_brightness' \"%s\": %m", max_brightness_str);
return log_device_warning_errno(device, r, "Failed to parse 'max_brightness' \"%s\": %m", s);
if (max_brightness <= 0)
return log_device_warning_errno(device, SYNTHETIC_ERRNO(EINVAL), "Maximum brightness is 0, ignoring device.");
log_device_debug(device, "Maximum brightness is %u", max_brightness);
*ret = max_brightness;
return 0;
}
@ -409,6 +403,13 @@ static int run(int argc, char *argv[]) {
if (get_max_brightness(device, &max_brightness) < 0)
return 0;
if (max_brightness == 0) {
log_device_warning(device, "Maximum brightness is 0, ignoring device.");
return 0;
}
log_device_debug(device, "Maximum brightness is %u", max_brightness);
escaped_ss = cescape(ss);
if (!escaped_ss)
return log_oom();