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: no need to negate errno for log_*_errno()
[elogind.git]
/
src
/
journal-remote
/
journal-upload-journal.c
diff --git
a/src/journal-remote/journal-upload-journal.c
b/src/journal-remote/journal-upload-journal.c
index 1cd52db2c19ae18ff8c3755f1a266b260f23f4cf..ace31af0bfb213a3248d479cd1122ea666ddb2bc 100644
(file)
--- a/
src/journal-remote/journal-upload-journal.c
+++ b/
src/journal-remote/journal-upload-journal.c
@@
-26,7
+26,7
@@
static ssize_t write_entry(char *buf, size_t size, Uploader *u) {
r = sd_journal_get_cursor(u->journal, &u->current_cursor);
if (r < 0) {
r = sd_journal_get_cursor(u->journal, &u->current_cursor);
if (r < 0) {
- log_error
("Failed to get cursor: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to get cursor: %m"
);
return r;
}
return r;
}
@@
-52,7
+52,7
@@
static ssize_t write_entry(char *buf, size_t size, Uploader *u) {
r = sd_journal_get_realtime_usec(u->journal, &realtime);
if (r < 0) {
r = sd_journal_get_realtime_usec(u->journal, &realtime);
if (r < 0) {
- log_error
("Failed to get realtime timestamp: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to get realtime timestamp: %m"
);
return r;
}
return r;
}
@@
-79,7
+79,7
@@
static ssize_t write_entry(char *buf, size_t size, Uploader *u) {
r = sd_journal_get_monotonic_usec(u->journal, &monotonic, &boot_id);
if (r < 0) {
r = sd_journal_get_monotonic_usec(u->journal, &monotonic, &boot_id);
if (r < 0) {
- log_error
("Failed to get monotonic timestamp: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to get monotonic timestamp: %m"
);
return r;
}
return r;
}
@@
-106,7
+106,7
@@
static ssize_t write_entry(char *buf, size_t size, Uploader *u) {
r = sd_journal_get_monotonic_usec(u->journal, NULL, &boot_id);
if (r < 0) {
r = sd_journal_get_monotonic_usec(u->journal, NULL, &boot_id);
if (r < 0) {
- log_error
("Failed to get monotonic timestamp: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to get monotonic timestamp: %m"
);
return r;
}
return r;
}
@@
-305,7
+305,7
@@
static int process_journal_input(Uploader *u, int skip) {
r = sd_journal_next_skip(u->journal, skip);
if (r < 0) {
r = sd_journal_next_skip(u->journal, skip);
if (r < 0) {
- log_error
("Failed to skip to next entry: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to skip to next entry: %m"
);
return r;
} else if (r < skip)
return 0;
return r;
} else if (r < skip)
return 0;
@@
-321,7
+321,7
@@
int check_journal_input(Uploader *u) {
r = sd_journal_process(u->journal);
if (r < 0) {
r = sd_journal_process(u->journal);
if (r < 0) {
- log_error
("Failed to process journal: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to process journal: %m"
);
close_journal_input(u);
return r;
}
close_journal_input(u);
return r;
}
@@
-364,7
+364,7
@@
int open_journal_for_upload(Uploader *u,
if (follow) {
fd = sd_journal_get_fd(j);
if (fd < 0) {
if (follow) {
fd = sd_journal_get_fd(j);
if (fd < 0) {
- log_error
("sd_journal_get_fd failed: %s", strerror(-fd)
);
+ log_error
_errno(fd, "sd_journal_get_fd failed: %m"
);
return fd;
}
return fd;
}
@@
-380,7
+380,7
@@
int open_journal_for_upload(Uploader *u,
r = sd_event_add_io(u->events, &u->input_event,
fd, events, dispatch_journal_input, u);
if (r < 0) {
r = sd_event_add_io(u->events, &u->input_event,
fd, events, dispatch_journal_input, u);
if (r < 0) {
- log_error
("Failed to register input event: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to register input event: %m"
);
return r;
}
return r;
}