From f4ea8432e67110b73b07dd0e47a5339d83b350fb Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 31 Jul 2019 09:38:15 +0200 Subject: [PATCH] cryptsetup-generator: fix coverity issue Fixes coverity issue 1403772 --- src/cryptsetup/cryptsetup-generator.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index c51bb9a..960f476 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; } -- 2.7.4