summaryrefslogtreecommitdiff
path: root/src/delta/delta.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/delta/delta.c')
-rw-r--r--src/delta/delta.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/delta/delta.c b/src/delta/delta.c
index b3272d916..4aaf1dfb1 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -431,7 +431,7 @@ static int process_suffix_chop(const char *prefixes, const char *suffix, const c
return -EINVAL;
}
-static void help(void) {
+static int help(void) {
printf("%s [OPTIONS...] [SUFFIX...]\n\n"
"Find overridden configuration files.\n\n"
@@ -441,6 +441,8 @@ static void help(void) {
" --diff[=1|0] Show a diff when overridden files differ\n"
" -t --type=LIST... Only display a selected set of override types\n",
program_invocation_short_name);
+
+ return 0;
}
static int parse_flags(const char *flag_str, int flags) {
@@ -482,7 +484,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "no-pager", no_argument, NULL, ARG_NO_PAGER },
{ "diff", optional_argument, NULL, ARG_DIFF },
{ "type", required_argument, NULL, 't' },
- { NULL, 0, NULL, 0 }
+ {}
};
int c;
@@ -507,9 +509,6 @@ static int parse_argv(int argc, char *argv[]) {
arg_no_pager = true;
break;
- case '?':
- return -EINVAL;
-
case 't': {
int f;
f = parse_flags(optarg, arg_flags);
@@ -538,9 +537,11 @@ static int parse_argv(int argc, char *argv[]) {
}
break;
- default:
- log_error("Unknown option code %c", c);
+ case '?':
return -EINVAL;
+
+ default:
+ assert_not_reached("Unhandled option");
}
}