diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-01-21 20:02:33 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2019-01-23 23:37:17 +0100 |
| commit | 0ffff81abdc7db82dc7fd72cd066074d6b3a476c (patch) | |
| tree | 1bb0ce12b9e93a5fe11fe3afb971dc913a211d60 /src/cryptsetup | |
| parent | cryptsetup: use free_and_replace() where appropriate (diff) | |
| download | systemd-0ffff81abdc7db82dc7fd72cd066074d6b3a476c.tar.xz systemd-0ffff81abdc7db82dc7fd72cd066074d6b3a476c.zip | |
cryptsetup: modernize some log message invocations
Diffstat (limited to 'src/cryptsetup')
| -rw-r--r-- | src/cryptsetup/cryptsetup.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index 49a7307809..7072a89325 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -485,10 +485,8 @@ static int attach_luks_or_plain(struct crypt_device *cd, if (!arg_type || STR_IN_SET(arg_type, ANY_LUKS, CRYPT_LUKS1)) { r = crypt_load(cd, CRYPT_LUKS, NULL); - if (r < 0) { - log_error("crypt_load() failed on device %s.\n", crypt_get_device_name(cd)); - return r; - } + if (r < 0) + return log_error_errno(r, "crypt_load() failed on device %s: %m", crypt_get_device_name(cd)); if (data_device) r = crypt_set_data_device(cd, data_device); @@ -623,10 +621,8 @@ static int run(int argc, char *argv[]) { /* Arguments: systemd-cryptsetup attach VOLUME SOURCE-DEVICE [PASSWORD] [OPTIONS] */ - if (argc < 4) { - log_error("attach requires at least two arguments."); - return -EINVAL; - } + if (argc < 4) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "attach requires at least two arguments."); if (argc >= 5 && argv[4][0] && @@ -718,10 +714,8 @@ static int run(int argc, char *argv[]) { log_warning("Invalid passphrase."); } - if (arg_tries != 0 && tries >= arg_tries) { - log_error("Too many attempts; giving up."); - return -EPERM; - } + if (arg_tries != 0 && tries >= arg_tries) + return log_error_errno(SYNTHETIC_ERRNO(EPERM), "Too many attempts to activate; giving up."); } else if (streq(argv[1], "detach")) { @@ -739,10 +733,8 @@ static int run(int argc, char *argv[]) { if (r < 0) return log_error_errno(r, "Failed to deactivate: %m"); - } else { - log_error("Unknown verb %s.", argv[1]); - return -EINVAL; - } + } else + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown verb %s.", argv[1]); return 0; } |