From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 1 Aug 2019 06:13:13 +0000 (+0200)
Subject: cryptsetup: use unabbrieviated variable names
X-Git-Tag: v243-rc2~70^2~1
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=5d2100dc4c32abbce4109e75cbfbbef6e1b2b7b1;p=systemd%2F.git

cryptsetup: use unabbrieviated variable names

Now that "ret_" has been added to the output variables, we can name
the internal variables without artificial abbrevs.
---

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 960f4762b7..8448314394 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -47,7 +47,7 @@ STATIC_DESTRUCTOR_REGISTER(arg_default_options, freep);
 STATIC_DESTRUCTOR_REGISTER(arg_default_keyfile, freep);
 
 static int split_keyspec(const char *keyspec, char **ret_keyfile, char **ret_keydev) {
-        _cleanup_free_ char *kfile = NULL, *kdev = NULL;
+        _cleanup_free_ char *keyfile = NULL, *keydev = NULL;
         const char *c;
 
         assert(keyspec);
@@ -56,20 +56,20 @@ static int split_keyspec(const char *keyspec, char **ret_keyfile, char **ret_key
 
         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();
         }
 
-        *ret_keyfile = TAKE_PTR(kfile);
-        *ret_keydev = TAKE_PTR(kdev);
+        *ret_keyfile = TAKE_PTR(keyfile);
+        *ret_keydev = TAKE_PTR(keydev);
 
         return 0;
 }