diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-08-01 08:13:13 +0200 |
---|---|---|
committer | The Plumber <50238977+systemd-rhel-bot@users.noreply.github.com> | 2019-12-18 13:15:38 +0100 |
commit | 0577d8378645c1ecd909b74403cefe31ed569398 (patch) | |
tree | b11092c2ca9c86a37cc48cfe72818202bf10c4e3 | |
parent | fdb86185b56619c59602c6546fd0710eec4a6e85 (diff) | |
download | systemd-0577d8378645c1ecd909b74403cefe31ed569398.tar.gz |
cryptsetup: use unabbrieviated variable names
Now that "ret_" has been added to the output variables, we can name
the internal variables without artificial abbrevs.
(cherry picked from commit 5d2100dc4c32abbce4109e75cbfbbef6e1b2b7b1)
Related: #1763155
-rw-r--r-- | src/cryptsetup/cryptsetup-generator.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index 1e8e3ba00d..7b234e37be 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; } |