Fix multiple errors where jump skips variable initialization.

<file>: error: jump skips variable initialization [-Werror=jump-misses-init]

This has only just appeared, possibly related to previous gnulib
update.  In any case, this is just code motion / cleanup.

1 files changed, 7 insertions, 3 deletions

diff --git a/daemon/luks.c b/daemon/luks.c
index 3e3b4567..9ce8e2cf 100644
--- a/daemon/luks.c
+++ b/daemon/luks.c
@@ -40,19 +40,23 @@ optgroup_luks_available (void)
 static char *
 write_key_to_temp (const char *key)
 {
-  char *tempfile = strdup ("/tmp/luksXXXXXX");
+  char *tempfile;
+  int fd;
+  size_t len;
+
+  tempfile = strdup ("/tmp/luksXXXXXX");
   if (!tempfile) {
     reply_with_perror ("strdup");
     return NULL;
   }
 
-  int fd = mkstemp (tempfile);
+  fd = mkstemp (tempfile);
   if (fd == -1) {
     reply_with_perror ("mkstemp");
     goto error;
   }
 
-  size_t len = strlen (key);
+  len = strlen (key);
   if (xwrite (fd, key, len) == -1) {
     reply_with_perror ("write");
     close (fd);