picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journalctl: don't introduce numeric constants with special names, give them names

Browse source
This commit is contained in:
Lennart Poettering 2014-10-22 20:23:45 +02:00
parent 8f44e3ea3e
commit 97e1cc8b59
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/journal/journalctl.c
View file

@ -62,6 +62,12 @@
#define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE) #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE)
enum {
/* Special values for arg_lines */
ARG_LINES_DEFAULT = -2,
ARG_LINES_ALL = -1,
};
static OutputMode arg_output = OUTPUT_SHORT; static OutputMode arg_output = OUTPUT_SHORT;
static bool arg_utc = false; static bool arg_utc = false;
static bool arg_pager_end = false; static bool arg_pager_end = false;
@ -69,7 +75,7 @@ static bool arg_follow = false;
static bool arg_full = true; static bool arg_full = true;
static bool arg_all = false; static bool arg_all = false;
static bool arg_no_pager = false; static bool arg_no_pager = false;
static int arg_lines = -2; static int arg_lines = ARG_LINES_DEFAULT;
static bool arg_no_tail = false; static bool arg_no_tail = false;
static bool arg_quiet = false; static bool arg_quiet = false;
static bool arg_merge = false; static bool arg_merge = false;
@ -339,7 +345,7 @@ static int parse_argv(int argc, char *argv[]) {
case 'e': case 'e':
arg_pager_end = true; arg_pager_end = true;
if (arg_lines < -1) if (arg_lines == ARG_LINES_DEFAULT)
arg_lines = 1000; arg_lines = 1000;
break; break;
@ -379,7 +385,7 @@ static int parse_argv(int argc, char *argv[]) {
case 'n': case 'n':
if (optarg) { if (optarg) {
if (streq(optarg, "all")) if (streq(optarg, "all"))
arg_lines = -1; arg_lines = ARG_LINES_ALL;
else { else {
r = safe_atoi(optarg, &arg_lines); r = safe_atoi(optarg, &arg_lines);
if (r < 0 || arg_lines < 0) { if (r < 0 || arg_lines < 0) {
@ -398,7 +404,7 @@ static int parse_argv(int argc, char *argv[]) {
if (optind < argc) { if (optind < argc) {
int n; int n;
if (streq(argv[optind], "all")) { if (streq(argv[optind], "all")) {
arg_lines = -1; arg_lines = ARG_LINES_ALL;
optind++; optind++;
} else if (safe_atoi(argv[optind], &n) >= 0 && n >= 0) { } else if (safe_atoi(argv[optind], &n) >= 0 && n >= 0) {
arg_lines = n; arg_lines = n;
@ -662,7 +668,7 @@ static int parse_argv(int argc, char *argv[]) {
assert_not_reached("Unhandled option"); assert_not_reached("Unhandled option");
} }
if (arg_follow && !arg_no_tail && arg_lines < -1) if (arg_follow && !arg_no_tail && arg_lines == ARG_LINES_DEFAULT)
arg_lines = 10; arg_lines = 10;
if (!!arg_directory + !!arg_file + !!arg_machine > 1) { if (!!arg_directory + !!arg_file + !!arg_machine > 1) {