chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: update manager_save() to use fflush_and_check() to simplify things a bit
[elogind.git]
/
src
/
journal
/
journalctl.c
diff --git
a/src/journal/journalctl.c
b/src/journal/journalctl.c
index 52fd8beb22c9a753e5370cf3f3fd2685c87c972a..5c4a71d618248521fb4fabc1d868ca2722c69c1f 100644
(file)
--- a/
src/journal/journalctl.c
+++ b/
src/journal/journalctl.c
@@
-160,7
+160,7
@@
static int parse_boot_descriptor(const char *x, sd_id128_t *boot_id, int *offset
return 0;
}
return 0;
}
-static
int
help(void) {
+static
void
help(void) {
pager_open_if_enabled();
pager_open_if_enabled();
@@
-218,8
+218,6
@@
static int help(void) {
" --verify Verify journal file consistency\n"
#endif
, program_invocation_short_name);
" --verify Verify journal file consistency\n"
#endif
, program_invocation_short_name);
-
- return 0;
}
static int parse_argv(int argc, char *argv[]) {
}
static int parse_argv(int argc, char *argv[]) {
@@
-306,12
+304,13
@@
static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(argv);
assert(argc >= 0);
assert(argv);
- while ((c = getopt_long(argc, argv, "hefo:aln::qmb::kD:p:c:u:F:xrM:", options, NULL)) >= 0)
{
+ while ((c = getopt_long(argc, argv, "hefo:aln::qmb::kD:p:c:u:F:xrM:", options, NULL)) >= 0)
switch (c) {
case 'h':
switch (c) {
case 'h':
- return help();
+ help();
+ return 0;
case ARG_VERSION:
puts(PACKAGE_STRING);
case ARG_VERSION:
puts(PACKAGE_STRING);
@@
-633,7
+632,6
@@
static int parse_argv(int argc, char *argv[]) {
default:
assert_not_reached("Unhandled option");
}
default:
assert_not_reached("Unhandled option");
}
- }
if (arg_follow && !arg_no_tail && arg_lines < 0)
arg_lines = 10;
if (arg_follow && !arg_no_tail && arg_lines < 0)
arg_lines = 10;