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
/
journalctl.c
diff --git
a/src/journal/journalctl.c
b/src/journal/journalctl.c
index 89fb89f0e655ad6bbd132497e7ae2fdbf87cfdad..96b0ddd80f3fface13930b39eac1b62da54688ae 100644
(file)
--- a/
src/journal/journalctl.c
+++ b/
src/journal/journalctl.c
@@
-502,7
+502,7
@@
static int parse_argv(int argc, char *argv[]) {
case ARG_FILE:
r = glob_extend(&arg_file, optarg);
if (r < 0) {
case ARG_FILE:
r = glob_extend(&arg_file, optarg);
if (r < 0) {
- log_error_errno(
-
r, "Failed to add paths: %m");
+ log_error_errno(r, "Failed to add paths: %m");
return r;
};
break;
return r;
};
break;
@@
-750,7
+750,7
@@
static int generate_new_id128(void) {
r = sd_id128_randomize(&id);
if (r < 0) {
r = sd_id128_randomize(&id);
if (r < 0) {
- log_error_errno(
-
r, "Failed to generate ID: %m");
+ log_error_errno(r, "Failed to generate ID: %m");
return r;
}
return r;
}
@@
-852,7
+852,7
@@
static int add_matches(sd_journal *j, char **args) {
}
if (r < 0) {
}
if (r < 0) {
- log_error_errno(
-
r, "Failed to add match '%s': %m", *i);
+ log_error_errno(r, "Failed to add match '%s': %m", *i);
return r;
}
}
return r;
}
}
@@
-1030,7
+1030,7
@@
static int add_boot(sd_journal *j) {
r = get_boot_id_by_offset(j, &arg_boot_id, arg_boot_offset);
if (r < 0) {
if (sd_id128_equal(arg_boot_id, SD_ID128_NULL))
r = get_boot_id_by_offset(j, &arg_boot_id, arg_boot_offset);
if (r < 0) {
if (sd_id128_equal(arg_boot_id, SD_ID128_NULL))
- log_error_errno(
-
r, "Failed to look up boot %+i: %m", arg_boot_offset);
+ log_error_errno(r, "Failed to look up boot %+i: %m", arg_boot_offset);
else
log_error("Failed to look up boot ID "SD_ID128_FORMAT_STR"%+i: %s",
SD_ID128_FORMAT_VAL(arg_boot_id), arg_boot_offset, strerror(-r));
else
log_error("Failed to look up boot ID "SD_ID128_FORMAT_STR"%+i: %s",
SD_ID128_FORMAT_VAL(arg_boot_id), arg_boot_offset, strerror(-r));
@@
-1041,7
+1041,7
@@
static int add_boot(sd_journal *j) {
r = sd_journal_add_match(j, match, sizeof(match) - 1);
if (r < 0) {
r = sd_journal_add_match(j, match, sizeof(match) - 1);
if (r < 0) {
- log_error_errno(
-
r, "Failed to add match: %m");
+ log_error_errno(r, "Failed to add match: %m");
return r;
}
return r;
}
@@
-1061,7
+1061,7
@@
static int add_dmesg(sd_journal *j) {
r = sd_journal_add_match(j, "_TRANSPORT=kernel", strlen("_TRANSPORT=kernel"));
if (r < 0) {
r = sd_journal_add_match(j, "_TRANSPORT=kernel", strlen("_TRANSPORT=kernel"));
if (r < 0) {
- log_error_errno(
-
r, "Failed to add match: %m");
+ log_error_errno(r, "Failed to add match: %m");
return r;
}
return r;
}
@@
-1264,7
+1264,7
@@
static int add_priorities(sd_journal *j) {
r = sd_journal_add_match(j, match, strlen(match));
if (r < 0) {
r = sd_journal_add_match(j, match, strlen(match));
if (r < 0) {
- log_error_errno(
-
r, "Failed to add match: %m");
+ log_error_errno(r, "Failed to add match: %m");
return r;
}
}
return r;
}
}
@@
-1328,13
+1328,13
@@
static int setup_keys(void) {
r = sd_id128_get_machine(&machine);
if (r < 0) {
r = sd_id128_get_machine(&machine);
if (r < 0) {
- log_error_errno(
-
r, "Failed to get machine ID: %m");
+ log_error_errno(r, "Failed to get machine ID: %m");
return r;
}
r = sd_id128_get_boot(&boot);
if (r < 0) {
return r;
}
r = sd_id128_get_boot(&boot);
if (r < 0) {
- log_error_errno(
-
r, "Failed to get boot ID: %m");
+ log_error_errno(r, "Failed to get boot ID: %m");
return r;
}
return r;
}
@@
-1382,7
+1382,7
@@
static int setup_keys(void) {
log_info("Generating seed...");
l = loop_read(fd, seed, seed_size, true);
if (l < 0 || (size_t) l != seed_size) {
log_info("Generating seed...");
l = loop_read(fd, seed, seed_size, true);
if (l < 0 || (size_t) l != seed_size) {
- log_error
("Failed to read random seed: %s", strerror(EIO)
);
+ log_error
_errno(EIO, "Failed to read random seed: %m"
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-1428,14
+1428,14
@@
static int setup_keys(void) {
l = loop_write(fd, &h, sizeof(h), false);
if (l < 0 || (size_t) l != sizeof(h)) {
l = loop_write(fd, &h, sizeof(h), false);
if (l < 0 || (size_t) l != sizeof(h)) {
- log_error
("Failed to write header: %s", strerror(EIO)
);
+ log_error
_errno(EIO, "Failed to write header: %m"
);
r = -EIO;
goto finish;
}
l = loop_write(fd, state, state_size, false);
if (l < 0 || (size_t) l != state_size) {
r = -EIO;
goto finish;
}
l = loop_write(fd, state, state_size, false);
if (l < 0 || (size_t) l != state_size) {
- log_error
("Failed to write state: %s", strerror(EIO)
);
+ log_error
_errno(EIO, "Failed to write state: %m"
);
r = -EIO;
goto finish;
}
r = -EIO;
goto finish;
}
@@
-1662,8
+1662,7
@@
static int access_check(sd_journal *j) {
assert(err > 0);
if (err != EACCES)
assert(err > 0);
if (err != EACCES)
- log_warning("Error was encountered while opening journal files: %s",
- strerror(err));
+ log_warning_errno(err, "Error was encountered while opening journal files: %m");
}
return r;
}
return r;
@@
-1683,7
+1682,7
@@
static int flush_to_var(void) {
* daemon and set up inotify to wait for the flushed file to appear */
r = bus_open_system_systemd(&bus);
if (r < 0) {
* daemon and set up inotify to wait for the flushed file to appear */
r = bus_open_system_systemd(&bus);
if (r < 0) {
- log_error_errno(
-
r, "Failed to get D-Bus connection: %m");
+ log_error_errno(r, "Failed to get D-Bus connection: %m");
return r;
}
return r;
}
@@
-1726,13
+1725,13
@@
static int flush_to_var(void) {
r = fd_wait_for_event(watch_fd, POLLIN, USEC_INFINITY);
if (r < 0) {
r = fd_wait_for_event(watch_fd, POLLIN, USEC_INFINITY);
if (r < 0) {
- log_error_errno(
-
r, "Failed to wait for event: %m");
+ log_error_errno(r, "Failed to wait for event: %m");
return r;
}
r = flush_fd(watch_fd);
if (r < 0) {
return r;
}
r = flush_fd(watch_fd);
if (r < 0) {
- log_error_errno(
-
r, "Failed to flush inotify events: %m");
+ log_error_errno(r, "Failed to flush inotify events: %m");
return r;
}
}
return r;
}
}
@@
-1789,7
+1788,7
@@
int main(int argc, char *argv[]) {
if (arg_action == ACTION_UPDATE_CATALOG) {
r = catalog_update(database, arg_root, catalog_file_dirs);
if (r < 0)
if (arg_action == ACTION_UPDATE_CATALOG) {
r = catalog_update(database, arg_root, catalog_file_dirs);
if (r < 0)
- log_error_errno(
-
r, "Failed to list catalog: %m");
+ log_error_errno(r, "Failed to list catalog: %m");
} else {
bool oneline = arg_action == ACTION_LIST_CATALOG;
} else {
bool oneline = arg_action == ACTION_LIST_CATALOG;
@@
-1799,7
+1798,7
@@
int main(int argc, char *argv[]) {
else
r = catalog_list(stdout, database, oneline);
if (r < 0)
else
r = catalog_list(stdout, database, oneline);
if (r < 0)
- log_error_errno(
-
r, "Failed to list catalog: %m");
+ log_error_errno(r, "Failed to list catalog: %m");
}
goto finish;
}
goto finish;
@@
-1814,9
+1813,8
@@
int main(int argc, char *argv[]) {
else
r = sd_journal_open(&j, !arg_merge*SD_JOURNAL_LOCAL_ONLY + arg_journal_type);
if (r < 0) {
else
r = sd_journal_open(&j, !arg_merge*SD_JOURNAL_LOCAL_ONLY + arg_journal_type);
if (r < 0) {
- log_error("Failed to open %s: %s",
- arg_directory ? arg_directory : arg_file ? "files" : "journal",
- strerror(-r));
+ log_error_errno(r, "Failed to open %s: %m",
+ arg_directory ? arg_directory : arg_file ? "files" : "journal");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-1859,7
+1857,7
@@
int main(int argc, char *argv[]) {
q = journal_directory_vacuum(d->path, arg_vacuum_size, arg_vacuum_time, NULL, true);
if (q < 0) {
q = journal_directory_vacuum(d->path, arg_vacuum_size, arg_vacuum_time, NULL, true);
if (q < 0) {
- log_error_errno(
-
q, "Failed to vacuum: %m");
+ log_error_errno(q, "Failed to vacuum: %m");
r = q;
}
}
r = q;
}
}
@@
-1887,25
+1885,25
@@
int main(int argc, char *argv[]) {
strv_free(arg_user_units);
if (r < 0) {
strv_free(arg_user_units);
if (r < 0) {
- log_error_errno(
-
r, "Failed to add filter for units: %m");
+ log_error_errno(r, "Failed to add filter for units: %m");
return EXIT_FAILURE;
}
r = add_syslog_identifier(j);
if (r < 0) {
return EXIT_FAILURE;
}
r = add_syslog_identifier(j);
if (r < 0) {
- log_error_errno(
-
r, "Failed to add filter for syslog identifiers: %m");
+ log_error_errno(r, "Failed to add filter for syslog identifiers: %m");
return EXIT_FAILURE;
}
r = add_priorities(j);
if (r < 0) {
return EXIT_FAILURE;
}
r = add_priorities(j);
if (r < 0) {
- log_error_errno(
-
r, "Failed to add filter for priorities: %m");
+ log_error_errno(r, "Failed to add filter for priorities: %m");
return EXIT_FAILURE;
}
r = add_matches(j, argv + optind);
if (r < 0) {
return EXIT_FAILURE;
}
r = add_matches(j, argv + optind);
if (r < 0) {
- log_error_errno(
-
r, "Failed to add filters: %m");
+ log_error_errno(r, "Failed to add filters: %m");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-1928,7
+1926,7
@@
int main(int argc, char *argv[]) {
r = sd_journal_query_unique(j, arg_field);
if (r < 0) {
r = sd_journal_query_unique(j, arg_field);
if (r < 0) {
- log_error_errno(
-
r, "Failed to query unique data objects: %m");
+ log_error_errno(r, "Failed to query unique data objects: %m");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-1960,7
+1958,7
@@
int main(int argc, char *argv[]) {
if (arg_cursor || arg_after_cursor) {
r = sd_journal_seek_cursor(j, arg_cursor ?: arg_after_cursor);
if (r < 0) {
if (arg_cursor || arg_after_cursor) {
r = sd_journal_seek_cursor(j, arg_cursor ?: arg_after_cursor);
if (r < 0) {
- log_error_errno(
-
r, "Failed to seek to cursor: %m");
+ log_error_errno(r, "Failed to seek to cursor: %m");
return EXIT_FAILURE;
}
if (!arg_reverse)
return EXIT_FAILURE;
}
if (!arg_reverse)
@@
-1975,7
+1973,7
@@
int main(int argc, char *argv[]) {
} else if (arg_since_set && !arg_reverse) {
r = sd_journal_seek_realtime_usec(j, arg_since);
if (r < 0) {
} else if (arg_since_set && !arg_reverse) {
r = sd_journal_seek_realtime_usec(j, arg_since);
if (r < 0) {
- log_error_errno(
-
r, "Failed to seek to date: %m");
+ log_error_errno(r, "Failed to seek to date: %m");
return EXIT_FAILURE;
}
r = sd_journal_next(j);
return EXIT_FAILURE;
}
r = sd_journal_next(j);
@@
-1983,7
+1981,7
@@
int main(int argc, char *argv[]) {
} else if (arg_until_set && arg_reverse) {
r = sd_journal_seek_realtime_usec(j, arg_until);
if (r < 0) {
} else if (arg_until_set && arg_reverse) {
r = sd_journal_seek_realtime_usec(j, arg_until);
if (r < 0) {
- log_error_errno(
-
r, "Failed to seek to date: %m");
+ log_error_errno(r, "Failed to seek to date: %m");
return EXIT_FAILURE;
}
r = sd_journal_previous(j);
return EXIT_FAILURE;
}
r = sd_journal_previous(j);
@@
-1991,7
+1989,7
@@
int main(int argc, char *argv[]) {
} else if (arg_lines >= 0) {
r = sd_journal_seek_tail(j);
if (r < 0) {
} else if (arg_lines >= 0) {
r = sd_journal_seek_tail(j);
if (r < 0) {
- log_error_errno(
-
r, "Failed to seek to tail: %m");
+ log_error_errno(r, "Failed to seek to tail: %m");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-2000,7
+1998,7
@@
int main(int argc, char *argv[]) {
} else if (arg_reverse) {
r = sd_journal_seek_tail(j);
if (r < 0) {
} else if (arg_reverse) {
r = sd_journal_seek_tail(j);
if (r < 0) {
- log_error_errno(
-
r, "Failed to seek to tail: %m");
+ log_error_errno(r, "Failed to seek to tail: %m");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-2009,7
+2007,7
@@
int main(int argc, char *argv[]) {
} else {
r = sd_journal_seek_head(j);
if (r < 0) {
} else {
r = sd_journal_seek_head(j);
if (r < 0) {
- log_error_errno(
-
r, "Failed to seek to head: %m");
+ log_error_errno(r, "Failed to seek to head: %m");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-2017,7
+2015,7
@@
int main(int argc, char *argv[]) {
}
if (r < 0) {
}
if (r < 0) {
- log_error_errno(
-
r, "Failed to iterate through journal: %m");
+ log_error_errno(r, "Failed to iterate through journal: %m");
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
@@
-2030,7
+2028,7
@@
int main(int argc, char *argv[]) {
r = sd_journal_get_cutoff_realtime_usec(j, &start, &end);
if (r < 0) {
r = sd_journal_get_cutoff_realtime_usec(j, &start, &end);
if (r < 0) {
- log_error_errno(
-
r, "Failed to get cutoff: %m");
+ log_error_errno(r, "Failed to get cutoff: %m");
goto finish;
}
goto finish;
}
@@
-2055,7
+2053,7
@@
int main(int argc, char *argv[]) {
else
r = sd_journal_previous(j);
if (r < 0) {
else
r = sd_journal_previous(j);
if (r < 0) {
- log_error_errno(
-
r, "Failed to iterate through journal: %m");
+ log_error_errno(r, "Failed to iterate through journal: %m");
goto finish;
}
if (r == 0)
goto finish;
}
if (r == 0)
@@
-2067,7
+2065,7
@@
int main(int argc, char *argv[]) {
r = sd_journal_get_realtime_usec(j, &usec);
if (r < 0) {
r = sd_journal_get_realtime_usec(j, &usec);
if (r < 0) {
- log_error_errno(
-
r, "Failed to determine timestamp: %m");
+ log_error_errno(r, "Failed to determine timestamp: %m");
goto finish;
}
if (usec > arg_until)
goto finish;
}
if (usec > arg_until)
@@
-2079,7
+2077,7
@@
int main(int argc, char *argv[]) {
r = sd_journal_get_realtime_usec(j, &usec);
if (r < 0) {
r = sd_journal_get_realtime_usec(j, &usec);
if (r < 0) {
- log_error_errno(
-
r, "Failed to determine timestamp: %m");
+ log_error_errno(r, "Failed to determine timestamp: %m");
goto finish;
}
if (usec < arg_since)
goto finish;
}
if (usec < arg_since)
@@
-2124,7
+2122,7
@@
int main(int argc, char *argv[]) {
r = sd_journal_get_cursor(j, &cursor);
if (r < 0 && r != -EADDRNOTAVAIL)
r = sd_journal_get_cursor(j, &cursor);
if (r < 0 && r != -EADDRNOTAVAIL)
- log_error_errno(
-
r, "Failed to get cursor: %m");
+ log_error_errno(r, "Failed to get cursor: %m");
else if (r >= 0)
printf("-- cursor: %s\n", cursor);
}
else if (r >= 0)
printf("-- cursor: %s\n", cursor);
}
@@
-2134,7
+2132,7
@@
int main(int argc, char *argv[]) {
r = sd_journal_wait(j, (uint64_t) -1);
if (r < 0) {
r = sd_journal_wait(j, (uint64_t) -1);
if (r < 0) {
- log_error_errno(
-
r, "Couldn't wait for journal event: %m");
+ log_error_errno(r, "Couldn't wait for journal event: %m");
goto finish;
}
goto finish;
}