summaryrefslogtreecommitdiff
path: root/src/cryptsetup
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2019-07-31 09:38:15 +0200
committerLennart Poettering <lennart@poettering.net>2019-07-31 09:38:59 +0200
commitf4ea8432e67110b73b07dd0e47a5339d83b350fb (patch)
tree589a65cacdcad6d30bf495997b6bdd247d93cda7 /src/cryptsetup
parent5c76ca6093de7ca9695929db7b5497b15e681850 (diff)
downloadsystemd-f4ea8432e67110b73b07dd0e47a5339d83b350fb.tar.gz
cryptsetup-generator: fix coverity issue
Fixes coverity issue 1403772
Diffstat (limited to 'src/cryptsetup')
-rw-r--r--src/cryptsetup/cryptsetup-generator.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index c51bb9ae18..960f4762b7 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -46,30 +46,30 @@ STATIC_DESTRUCTOR_REGISTER(arg_disks, hashmap_freep);
STATIC_DESTRUCTOR_REGISTER(arg_default_options, freep);
STATIC_DESTRUCTOR_REGISTER(arg_default_keyfile, freep);
-static int split_keyspec(const char *keyspec, char **keyfile, char **keydev) {
+static int split_keyspec(const char *keyspec, char **ret_keyfile, char **ret_keydev) {
_cleanup_free_ char *kfile = NULL, *kdev = NULL;
- char *c;
+ const char *c;
assert(keyspec);
- assert(keyfile);
- assert(keydev);
+ assert(ret_keyfile);
+ assert(ret_keydev);
c = strrchr(keyspec, ':');
if (c) {
kfile = strndup(keyspec, c-keyspec);
kdev = strdup(c + 1);
- if (!*kfile || !*kdev)
+ if (!kfile || !kdev)
return log_oom();
} else {
/* No keydev specified */
kfile = strdup(keyspec);
kdev = NULL;
- if (!*kfile)
+ if (!kfile)
return log_oom();
}
- *keyfile = TAKE_PTR(kfile);
- *keydev = TAKE_PTR(kdev);
+ *ret_keyfile = TAKE_PTR(kfile);
+ *ret_keydev = TAKE_PTR(kdev);
return 0;
}