chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: Support system.conf.d and user.conf.d directories in the usual search paths
[elogind.git]
/
src
/
core
/
device.c
diff --git
a/src/core/device.c
b/src/core/device.c
index 068578dc829a82f8f6ea85c0157c11f2a8140d1a..b254e45b33d17a8706f44d48a9f3fa4838a0cfda 100644
(file)
--- a/
src/core/device.c
+++ b/
src/core/device.c
@@
-334,7
+334,7
@@
static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
return 0;
fail:
return 0;
fail:
- log_warning
("Failed to load device unit: %s", strerror(-r)
);
+ log_warning
_errno(r, "Failed to load device unit: %m"
);
if (delete && u)
unit_free(u);
if (delete && u)
unit_free(u);
@@
-628,7
+628,7
@@
static int device_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
static RATELIMIT_DEFINE(limit, 10*USEC_PER_SEC, 5);
if (!ratelimit_test(&limit))
static RATELIMIT_DEFINE(limit, 10*USEC_PER_SEC, 5);
if (!ratelimit_test(&limit))
- log_error
(
"Failed to get udev event: %m");
+ log_error
_errno(errno,
"Failed to get udev event: %m");
if (!(revents & EPOLLIN))
return 0;
}
if (!(revents & EPOLLIN))
return 0;
}
@@
-650,20
+650,20
@@
static int device_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
if (streq(action, "remove") || !device_is_ready(dev)) {
r = device_process_removed_device(m, dev);
if (r < 0)
if (streq(action, "remove") || !device_is_ready(dev)) {
r = device_process_removed_device(m, dev);
if (r < 0)
- log_error
("Failed to process device remove event: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to process device remove event: %m"
);
r = swap_process_removed_device(m, dev);
if (r < 0)
r = swap_process_removed_device(m, dev);
if (r < 0)
- log_error
("Failed to process swap device remove event: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to process swap device remove event: %m"
);
} else {
r = device_process_new_device(m, dev);
if (r < 0)
} else {
r = device_process_new_device(m, dev);
if (r < 0)
- log_error
("Failed to process device new event: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to process device new event: %m"
);
r = swap_process_new_device(m, dev);
if (r < 0)
r = swap_process_new_device(m, dev);
if (r < 0)
- log_error
("Failed to process swap device new event: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to process swap device new event: %m"
);
manager_dispatch_load_queue(m);
manager_dispatch_load_queue(m);