From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 31 Mar 2022 09:21:37 +0000 (+0200)
Subject: integritysetup: also port to mangle_none()
X-Git-Tag: v251-rc2~236^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=752d8594427ff141293c27a0e9aa84fb3796c419;p=thirdparty%2Fsystemd.git

integritysetup: also port to mangle_none()

Let's make the tool work more like veritysetup/cryptsetup in this regard
too.
---

diff --git a/src/integritysetup/integritysetup.c b/src/integritysetup/integritysetup.c
index 5fd220c515d..f95840a8d0f 100644
--- a/src/integritysetup/integritysetup.c
+++ b/src/integritysetup/integritysetup.c
@@ -121,8 +121,8 @@ static int run(int argc, char *argv[]) {
                         return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "attach has a maximum of five arguments.");
 
                 device = argv[3];
-                key_file = (argc > 4) ? empty_or_dash_to_null(argv[4]) : NULL;
-                options = (argc > 5) ? empty_or_dash_to_null(argv[5]) : NULL;
+                key_file = mangle_none(argc > 4 ? argv[4] : NULL);
+                options = mangle_none(argc > 5 ? argv[5] : NULL);
 
                 if (key_file) {
                         r = load_key_file(key_file, &key_buf, &key_buf_size);