Merge pull request #4510 from keszybz/tree-wide-cleanups

Tree wide cleanups

diff --cc src/basic/mount-util.c
Simple merge

diff --cc src/basic/path-util.c
Simple merge

diff --cc src/core/dbus-unit.c
Simple merge

diff --cc src/core/device.c
Simple merge

diff --cc src/core/execute.c
Simple merge

diff --cc src/core/manager.c
Simple merge

diff --cc src/core/service.c
Simple merge

diff --cc src/core/unit.c
Simple merge

diff --cc src/cryptsetup/cryptsetup.c
index ff5a3f36fb24862aaf9fed7274cafe6297d82c00,1e17fbbb0341546295d9ff528c64a8c2c9b98843..01e7ee9973e605dd3c537865196d53228bea0ef4
--- 1/src/cryptsetup/cryptsetup.c
--- 2/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@@ -180,20 -177,13 +178,21 @@@ static int parse_one_option(const char 
          } else if (streq(option, "tcrypt-system")) {
                  arg_type = CRYPT_TCRYPT;
                  arg_tcrypt_system = true;
 +        } else if (streq(option, "tcrypt-veracrypt")) {
 +#ifdef CRYPT_TCRYPT_VERA_MODES
 +                arg_type = CRYPT_TCRYPT;
 +                arg_tcrypt_veracrypt = true;
 +#else
 +                log_error("This version of cryptsetup does not support tcrypt-veracrypt; refusing.");
 +                return -EINVAL;
 +#endif
          } else if (STR_IN_SET(option, "plain", "swap", "tmp"))
                  arg_type = CRYPT_PLAIN;
-         else if (startswith(option, "timeout=")) {
+         else if ((val = startswith(option, "timeout="))) {
  
-                 if (parse_sec(option+8, &arg_timeout) < 0) {
-                         log_error("timeout= parse failure, ignoring.");
+                 r = parse_sec(val, &arg_timeout);
+                 if (r < 0) {
+                         log_error_errno(r, "Failed to parse %s, ignoring: %m", option);
                          return 0;
                  }
  

diff --cc src/hwdb/hwdb.c
Simple merge

diff --cc src/journal/journald-server.c
Simple merge

diff --cc src/nspawn/nspawn-mount.c
Simple merge

diff --cc src/nspawn/nspawn.c
Simple merge

diff --cc src/shared/install.c
Simple merge

diff --cc src/systemctl/systemctl.c
Simple merge