chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolve: remove unused variable
[elogind.git]
/
src
/
shared
/
logs-show.c
diff --git
a/src/shared/logs-show.c
b/src/shared/logs-show.c
index 32eba6ccfe127d2c51ec1696d009149d0bc18be7..98972eda3b08ef977ef245f6f2e8f868967c9f65 100644
(file)
--- a/
src/shared/logs-show.c
+++ b/
src/shared/logs-show.c
@@
-295,10
+295,8
@@
static int output_short(
if (r < 0)
r = sd_journal_get_monotonic_usec(j, &t, &boot_id);
if (r < 0)
r = sd_journal_get_monotonic_usec(j, &t, &boot_id);
- if (r < 0) {
- log_error_errno(-r, "Failed to get monotonic timestamp: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get monotonic timestamp: %m");
fprintf(f, "[%5llu.%06llu]",
(unsigned long long) (t / USEC_PER_SEC),
fprintf(f, "[%5llu.%06llu]",
(unsigned long long) (t / USEC_PER_SEC),
@@
-322,10
+320,8
@@
static int output_short(
if (r < 0)
r = sd_journal_get_realtime_usec(j, &x);
if (r < 0)
r = sd_journal_get_realtime_usec(j, &x);
- if (r < 0) {
- log_error_errno(-r, "Failed to get realtime timestamp: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get realtime timestamp: %m");
t = (time_t) (x / USEC_PER_SEC);
t = (time_t) (x / USEC_PER_SEC);
@@
-422,12
+418,11
@@
static int output_verbose(
r = parse_field(data, length, "_SOURCE_REALTIME_TIMESTAMP=", &value, &size);
if (r < 0)
r = parse_field(data, length, "_SOURCE_REALTIME_TIMESTAMP=", &value, &size);
if (r < 0)
- log_debug_errno(
-
r, "_SOURCE_REALTIME_TIMESTAMP invalid: %m");
+ log_debug_errno(r, "_SOURCE_REALTIME_TIMESTAMP invalid: %m");
else {
r = safe_atou64(value, &realtime);
if (r < 0)
else {
r = safe_atou64(value, &realtime);
if (r < 0)
- log_debug("Failed to parse realtime timestamp: %s",
- strerror(-r));
+ log_debug_errno(r, "Failed to parse realtime timestamp: %m");
}
}
}
}
@@
-441,10
+436,8
@@
static int output_verbose(
}
r = sd_journal_get_cursor(j, &cursor);
}
r = sd_journal_get_cursor(j, &cursor);
- if (r < 0) {
- log_error_errno(-r, "Failed to get cursor: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get cursor: %m");
fprintf(f, "%s [%s]\n",
flags & OUTPUT_UTC ?
fprintf(f, "%s [%s]\n",
flags & OUTPUT_UTC ?
@@
-516,22
+509,16
@@
static int output_export(
sd_journal_set_data_threshold(j, 0);
r = sd_journal_get_realtime_usec(j, &realtime);
sd_journal_set_data_threshold(j, 0);
r = sd_journal_get_realtime_usec(j, &realtime);
- if (r < 0) {
- log_error_errno(-r, "Failed to get realtime timestamp: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get realtime timestamp: %m");
r = sd_journal_get_monotonic_usec(j, &monotonic, &boot_id);
r = sd_journal_get_monotonic_usec(j, &monotonic, &boot_id);
- if (r < 0) {
- log_error_errno(-r, "Failed to get monotonic timestamp: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get monotonic timestamp: %m");
r = sd_journal_get_cursor(j, &cursor);
r = sd_journal_get_cursor(j, &cursor);
- if (r < 0) {
- log_error_errno(-r, "Failed to get cursor: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get cursor: %m");
fprintf(f,
"__CURSOR=%s\n"
fprintf(f,
"__CURSOR=%s\n"
@@
-656,22
+643,16
@@
static int output_json(
sd_journal_set_data_threshold(j, flags & OUTPUT_SHOW_ALL ? 0 : JSON_THRESHOLD);
r = sd_journal_get_realtime_usec(j, &realtime);
sd_journal_set_data_threshold(j, flags & OUTPUT_SHOW_ALL ? 0 : JSON_THRESHOLD);
r = sd_journal_get_realtime_usec(j, &realtime);
- if (r < 0) {
- log_error_errno(-r, "Failed to get realtime timestamp: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get realtime timestamp: %m");
r = sd_journal_get_monotonic_usec(j, &monotonic, &boot_id);
r = sd_journal_get_monotonic_usec(j, &monotonic, &boot_id);
- if (r < 0) {
- log_error_errno(-r, "Failed to get monotonic timestamp: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get monotonic timestamp: %m");
r = sd_journal_get_cursor(j, &cursor);
r = sd_journal_get_cursor(j, &cursor);
- if (r < 0) {
- log_error_errno(-r, "Failed to get cursor: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get cursor: %m");
if (mode == OUTPUT_JSON_PRETTY)
fprintf(f,
if (mode == OUTPUT_JSON_PRETTY)
fprintf(f,
@@
-877,8
+858,7
@@
static int output_cat(
if (r == -ENOENT)
return 0;
if (r == -ENOENT)
return 0;
- log_error_errno(-r, "Failed to get data: %m");
- return r;
+ return log_error_errno(r, "Failed to get data: %m");
}
assert(l >= 8);
}
assert(l >= 8);
@@
-1225,24
+1205,18
@@
int add_match_this_boot(sd_journal *j, const char *machine) {
if (machine) {
r = get_boot_id_for_machine(machine, &boot_id);
if (machine) {
r = get_boot_id_for_machine(machine, &boot_id);
- if (r < 0) {
- log_error_errno(-r, "Failed to get boot id of container %s: %m", machine);
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get boot id of container %s: %m", machine);
} else {
r = sd_id128_get_boot(&boot_id);
} else {
r = sd_id128_get_boot(&boot_id);
- if (r < 0) {
- log_error_errno(-r, "Failed to get boot id: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to get boot id: %m");
}
sd_id128_to_string(boot_id, match + 9);
r = sd_journal_add_match(j, match, strlen(match));
}
sd_id128_to_string(boot_id, match + 9);
r = sd_journal_add_match(j, match, strlen(match));
- if (r < 0) {
- log_error_errno(-r, "Failed to add match: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to add match: %m");
r = sd_journal_add_conjunction(j);
if (r < 0)
r = sd_journal_add_conjunction(j);
if (r < 0)