chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: move definition of LocationType to journal-file.h
[elogind.git]
/
src
/
backlight
/
backlight.c
diff --git
a/src/backlight/backlight.c
b/src/backlight/backlight.c
index ab05a7d1a7ae3501bcb5259387e8907efdbddfc3..1271a66983392c8dc1a692eb0b6f83f4f47c46f9 100644
(file)
--- a/
src/backlight/backlight.c
+++ b/
src/backlight/backlight.c
@@
-211,7
+211,7
@@
static unsigned get_max_brightness(struct udev_device *device) {
r = safe_atou(max_brightness_str, &max_brightness);
if (r < 0) {
r = safe_atou(max_brightness_str, &max_brightness);
if (r < 0) {
- log_warning_errno(
-
r, "Failed to parse 'max_brightness' \"%s\": %m", max_brightness_str);
+ log_warning_errno(r, "Failed to parse 'max_brightness' \"%s\": %m", max_brightness_str);
return 0;
}
return 0;
}
@@
-235,7
+235,7
@@
static void clamp_brightness(struct udev_device *device, char **value, unsigned
r = safe_atou(*value, &brightness);
if (r < 0) {
r = safe_atou(*value, &brightness);
if (r < 0) {
- log_warning_errno(
-
r, "Failed to parse brightness \"%s\": %m", *value);
+ log_warning_errno(r, "Failed to parse brightness \"%s\": %m", *value);
return;
}
return;
}
@@
-285,8
+285,7
@@
int main(int argc, char *argv[]) {
r = mkdir_p("/var/lib/systemd/backlight", 0755);
if (r < 0) {
r = mkdir_p("/var/lib/systemd/backlight", 0755);
if (r < 0) {
- log_error("Failed to create backlight directory /var/lib/systemd/backlight: %s",
- strerror(-r));
+ log_error_errno(r, "Failed to create backlight directory /var/lib/systemd/backlight: %m");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-319,7
+318,7
@@
int main(int argc, char *argv[]) {
device = udev_device_new_from_subsystem_sysname(udev, ss, sysname);
if (!device) {
if (errno != 0)
device = udev_device_new_from_subsystem_sysname(udev, ss, sysname);
if (!device) {
if (errno != 0)
- log_error
(
"Failed to get backlight or LED device '%s:%s': %m", ss, sysname);
+ log_error
_errno(errno,
"Failed to get backlight or LED device '%s:%s': %m", ss, sysname);
else
log_oom();
else
log_oom();
@@
-387,7
+386,7
@@
int main(int argc, char *argv[]) {
if (r == -ENOENT)
return EXIT_SUCCESS;
if (r == -ENOENT)
return EXIT_SUCCESS;
- log_error_errno(
-
r, "Failed to read %s: %m", saved);
+ log_error_errno(r, "Failed to read %s: %m", saved);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-395,8
+394,7
@@
int main(int argc, char *argv[]) {
r = udev_device_set_sysattr_value(device, "brightness", value);
if (r < 0) {
r = udev_device_set_sysattr_value(device, "brightness", value);
if (r < 0) {
- log_error("Failed to write system 'brightness' attribute: %s",
- strerror(-r));
+ log_error_errno(r, "Failed to write system 'brightness' attribute: %m");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-416,7
+414,7
@@
int main(int argc, char *argv[]) {
r = write_string_file(saved, value);
if (r < 0) {
r = write_string_file(saved, value);
if (r < 0) {
- log_error_errno(
-
r, "Failed to write %s: %m", saved);
+ log_error_errno(r, "Failed to write %s: %m", saved);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}