chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemd-sleep: Support sleep.conf.d directories in the usual search paths
[elogind.git]
/
src
/
rfkill
/
rfkill.c
diff --git
a/src/rfkill/rfkill.c
b/src/rfkill/rfkill.c
index c7c659292abefb0fb0ece120bbf70878fe4dd47d..68729b0c04e5bf08aa220ffaa7f08273fb1a0a41 100644
(file)
--- a/
src/rfkill/rfkill.c
+++ b/
src/rfkill/rfkill.c
@@
-45,7
+45,7
@@
int main(int argc, char *argv[]) {
r = mkdir_p("/var/lib/systemd/rfkill", 0755);
if (r < 0) {
r = mkdir_p("/var/lib/systemd/rfkill", 0755);
if (r < 0) {
- log_error
("Failed to create rfkill directory: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to create rfkill directory: %m"
);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-59,7
+59,7
@@
int main(int argc, char *argv[]) {
device = udev_device_new_from_subsystem_sysname(udev, "rfkill", argv[2]);
if (!device) {
if (errno != 0)
device = udev_device_new_from_subsystem_sysname(udev, "rfkill", argv[2]);
if (!device) {
if (errno != 0)
- log_error
(
"Failed to get rfkill device '%s': %m", argv[2]);
+ log_error
_errno(errno,
"Failed to get rfkill device '%s': %m", argv[2]);
else
log_oom();
else
log_oom();
@@
-107,13
+107,13
@@
int main(int argc, char *argv[]) {
if (r == -ENOENT)
return EXIT_SUCCESS;
if (r == -ENOENT)
return EXIT_SUCCESS;
- log_error
("Failed to read %s: %s", saved, strerror(-r)
);
+ log_error
_errno(r, "Failed to read %s: %m", saved
);
return EXIT_FAILURE;
}
r = udev_device_set_sysattr_value(device, "soft", value);
if (r < 0) {
return EXIT_FAILURE;
}
r = udev_device_set_sysattr_value(device, "soft", value);
if (r < 0) {
- log_error
("Failed to write system attribute: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to write system attribute: %m"
);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-122,13
+122,13
@@
int main(int argc, char *argv[]) {
value = udev_device_get_sysattr_value(device, "soft");
if (!value) {
value = udev_device_get_sysattr_value(device, "soft");
if (!value) {
- log_error
("Failed to read system attribute: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to read system attribute: %m"
);
return EXIT_FAILURE;
}
r = write_string_file(saved, value);
if (r < 0) {
return EXIT_FAILURE;
}
r = write_string_file(saved, value);
if (r < 0) {
- log_error
("Failed to write %s: %s", saved, strerror(-r)
);
+ log_error
_errno(r, "Failed to write %s: %m", saved
);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}