diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index 1e8e3ba..7b234e3 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -40,30 +40,30 @@ static Hashmap *arg_disks = NULL; static char *arg_default_options = NULL; static char *arg_default_keyfile = NULL; -static int split_keyspec(const char *keyspec, char **keyfile, char **keydev) { - _cleanup_free_ char *kfile = NULL, *kdev = NULL; - char *c; +static int split_keyspec(const char *keyspec, char **ret_keyfile, char **ret_keydev) { + _cleanup_free_ char *keyfile = NULL, *keydev = NULL; + 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) + keyfile = strndup(keyspec, c-keyspec); + keydev = strdup(c + 1); + if (!keyfile || !keydev) return log_oom(); } else { /* No keydev specified */ - kfile = strdup(keyspec); - kdev = NULL; - if (!*kfile) + keyfile = strdup(keyspec); + keydev = NULL; + if (!keyfile) return log_oom(); } - *keyfile = TAKE_PTR(kfile); - *keydev = TAKE_PTR(kdev); + *ret_keyfile = TAKE_PTR(keyfile); + *ret_keydev = TAKE_PTR(keydev); return 0; }