summaryrefslogtreecommitdiff
path: root/src/delta
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-02-15 19:41:39 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-02-17 21:08:47 +0100
commitc3470872c6c12d64c895643bd3b02022beb0589e (patch)
treebb46f589f8e8dd983e57b233e5736595b65ef169 /src/delta
parent599c7c545f689f7d19a73238eecc69bf94fa6a74 (diff)
downloadsystemd-c3470872c6c12d64c895643bd3b02022beb0589e.tar.gz
tree-wide: use parse_boolean_argument() for variables with non-boolean type
This still works nicely, but we need to assign the return value ourselves. As before, one nice effect is that error messages are uniform.
Diffstat (limited to 'src/delta')
-rw-r--r--src/delta/delta.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/src/delta/delta.c b/src/delta/delta.c
index 21be1b8f54..bb38db54a4 100644
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -15,6 +15,7 @@
#include "main-func.h"
#include "nulstr-util.h"
#include "pager.h"
+#include "parse-argument.h"
#include "parse-util.h"
#include "path-util.h"
#include "pretty-print.h"
@@ -586,7 +587,7 @@ static int parse_argv(int argc, char *argv[]) {
{}
};
- int c;
+ int c, r;
assert(argc >= 1);
assert(argv);
@@ -616,18 +617,10 @@ static int parse_argv(int argc, char *argv[]) {
}
case ARG_DIFF:
- if (!optarg)
- arg_diff = 1;
- else {
- int b;
-
- b = parse_boolean(optarg);
- if (b < 0)
- return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
- "Failed to parse diff boolean.");
-
- arg_diff = b;
- }
+ r = parse_boolean_argument("--diff", optarg, NULL);
+ if (r < 0)
+ return r;
+ arg_diff = r;
break;
case '?':