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: more log_*_errno() conversions, multiline calls
[elogind.git]
/
src
/
journal
/
sd-journal.c
diff --git
a/src/journal/sd-journal.c
b/src/journal/sd-journal.c
index 61e64f7f7c64fc4668800bbc453ef60cdb686505..d171600eefa3596120f7e6b9c25ba518a7857a60 100644
(file)
--- a/
src/journal/sd-journal.c
+++ b/
src/journal/sd-journal.c
@@
-1466,8
+1466,8
@@
static int add_directory(sd_journal *j, const char *prefix, const char *dirname)
dirent_is_file_with_suffix(de, ".journal~")) {
r = add_file(j, m->path, de->d_name);
if (r < 0) {
dirent_is_file_with_suffix(de, ".journal~")) {
r = add_file(j, m->path, de->d_name);
if (r < 0) {
- log_debug
("Failed to add file %s/%s: %s
",
-
m->path, de->d_name, strerror(-r)
);
+ log_debug
_errno(r, "Failed to add file %s/%s: %m
",
+
m->path, de->d_name
);
r = set_put_error(j, r);
if (r < 0)
return r;
r = set_put_error(j, r);
if (r < 0)
return r;
@@
-1556,8
+1556,8
@@
static int add_root_directory(sd_journal *j, const char *p) {
dirent_is_file_with_suffix(de, ".journal~")) {
r = add_file(j, m->path, de->d_name);
if (r < 0) {
dirent_is_file_with_suffix(de, ".journal~")) {
r = add_file(j, m->path, de->d_name);
if (r < 0) {
- log_debug
("Failed to add file %s/%s: %s
",
-
m->path, de->d_name, strerror(-r)
);
+ log_debug
_errno(r, "Failed to add file %s/%s: %m
",
+
m->path, de->d_name
);
r = set_put_error(j, r);
if (r < 0)
return r;
r = set_put_error(j, r);
if (r < 0)
return r;
@@
-2218,8
+2218,8
@@
static void process_inotify_event(sd_journal *j, struct inotify_event *e) {
if (e->mask & (IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB)) {
r = add_file(j, d->path, e->name);
if (r < 0) {
if (e->mask & (IN_CREATE|IN_MOVED_TO|IN_MODIFY|IN_ATTRIB)) {
r = add_file(j, d->path, e->name);
if (r < 0) {
- log_debug
("Failed to add file %s/%s: %s
",
-
d->path, e->name, strerror(-r)
);
+ log_debug
_errno(r, "Failed to add file %s/%s: %m
",
+
d->path, e->name
);
set_put_error(j, r);
}
set_put_error(j, r);
}