chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: use log_*_errno whenever %m is in the format string
[elogind.git]
/
src
/
journal
/
journald-server.c
diff --git
a/src/journal/journald-server.c
b/src/journal/journald-server.c
index 3d1947f25ff1c64ffada940bbe3973aabc02df66..081ae7c08d229e7648c291896152b4bb7c88a5d0 100644
(file)
--- a/
src/journal/journald-server.c
+++ b/
src/journal/journald-server.c
@@
-212,7
+212,7
@@
void server_fix_perms(Server *s, JournalFile *f, uid_t uid) {
acl = acl_get_fd(f->fd);
if (!acl) {
acl = acl_get_fd(f->fd);
if (!acl) {
- log_warning
(
"Failed to read ACL on %s, ignoring: %m", f->path);
+ log_warning
_errno(errno,
"Failed to read ACL on %s, ignoring: %m", f->path);
return;
}
return;
}
@@
-222,7
+222,7
@@
void server_fix_perms(Server *s, JournalFile *f, uid_t uid) {
if (acl_create_entry(&acl, &entry) < 0 ||
acl_set_tag_type(entry, ACL_USER) < 0 ||
acl_set_qualifier(entry, &uid) < 0) {
if (acl_create_entry(&acl, &entry) < 0 ||
acl_set_tag_type(entry, ACL_USER) < 0 ||
acl_set_qualifier(entry, &uid) < 0) {
- log_warning
(
"Failed to patch ACL on %s, ignoring: %m", f->path);
+ log_warning
_errno(errno,
"Failed to patch ACL on %s, ignoring: %m", f->path);
goto finish;
}
}
goto finish;
}
}
@@
-232,12
+232,12
@@
void server_fix_perms(Server *s, JournalFile *f, uid_t uid) {
if (acl_get_permset(entry, &permset) < 0 ||
acl_add_perm(permset, ACL_READ) < 0 ||
calc_acl_mask_if_needed(&acl) < 0) {
if (acl_get_permset(entry, &permset) < 0 ||
acl_add_perm(permset, ACL_READ) < 0 ||
calc_acl_mask_if_needed(&acl) < 0) {
- log_warning
(
"Failed to patch ACL on %s, ignoring: %m", f->path);
+ log_warning
_errno(errno,
"Failed to patch ACL on %s, ignoring: %m", f->path);
goto finish;
}
if (acl_set_fd(f->fd, acl) < 0)
goto finish;
}
if (acl_set_fd(f->fd, acl) < 0)
- log_warning
(
"Failed to set ACL on %s, ignoring: %m", f->path);
+ log_warning
_errno(errno,
"Failed to set ACL on %s, ignoring: %m", f->path);
finish:
acl_free(acl);
finish:
acl_free(acl);
@@
-1174,7
+1174,7
@@
int process_datagram(sd_event_source *es, int fd, uint32_t revents, void *userda
if (errno == EINTR || errno == EAGAIN)
return 0;
if (errno == EINTR || errno == EAGAIN)
return 0;
- log_error
(
"recvmsg() failed: %m");
+ log_error
_errno(errno,
"recvmsg() failed: %m");
return -errno;
}
return -errno;
}
@@
-1432,7
+1432,7
@@
static int server_open_hostname(Server *s) {
s->hostname_fd = open("/proc/sys/kernel/hostname", O_RDONLY|O_CLOEXEC|O_NDELAY|O_NOCTTY);
if (s->hostname_fd < 0) {
s->hostname_fd = open("/proc/sys/kernel/hostname", O_RDONLY|O_CLOEXEC|O_NDELAY|O_NOCTTY);
if (s->hostname_fd < 0) {
- log_error
(
"Failed to open /proc/sys/kernel/hostname: %m");
+ log_error
_errno(errno,
"Failed to open /proc/sys/kernel/hostname: %m");
return -errno;
}
return -errno;
}