shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-05 09:17:44 +03:00
Code

cryptsetup: minor coding style clean-ups

Browse Source
This commit is contained in:
Lennart Poettering 2019-08-21 10:40:04 +02:00
parent 88b860034e
commit 9c5253ffec
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/cryptsetup/cryptsetup.c
View File

@ -253,10 +253,10 @@ static int parse_options(const char *options) {
} }
/* sanity-check options */ /* sanity-check options */
if (arg_type != NULL && !streq(arg_type, CRYPT_PLAIN)) { if (arg_type && !streq(arg_type, CRYPT_PLAIN)) {
if (arg_offset) if (arg_offset != 0)
log_warning("offset= ignored with type %s", arg_type); log_warning("offset= ignored with type %s", arg_type);
if (arg_skip) if (arg_skip != 0)
log_warning("skip= ignored with type %s", arg_type); log_warning("skip= ignored with type %s", arg_type);
} }
@ -462,11 +462,13 @@ static int attach_tcrypt(
return 0; return 0;
} }
static int attach_luks_or_plain(struct crypt_device *cd, static int attach_luks_or_plain(
const char *name, struct crypt_device *cd,
const char *key_file, const char *name,
char **passwords, const char *key_file,
uint32_t flags) { char **passwords,
uint32_t flags) {
int r = 0; int r = 0;
bool pass_volume_key = false; bool pass_volume_key = false;
@ -538,6 +540,7 @@ static int attach_luks_or_plain(struct crypt_device *cd,
} }
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to activate with key file '%s': %m", key_file); return log_error_errno(r, "Failed to activate with key file '%s': %m", key_file);
} else { } else {
char **p; char **p;
@ -650,7 +653,7 @@ static int run(int argc, char *argv[]) {
} }
/* A delicious drop of snake oil */ /* A delicious drop of snake oil */
mlockall(MCL_FUTURE); (void) mlockall(MCL_FUTURE);
if (arg_header) { if (arg_header) {
log_debug("LUKS header: %s", arg_header); log_debug("LUKS header: %s", arg_header);
@ -723,11 +726,7 @@ static int run(int argc, char *argv[]) {
if (streq_ptr(arg_type, CRYPT_TCRYPT)) if (streq_ptr(arg_type, CRYPT_TCRYPT))
r = attach_tcrypt(cd, argv[2], key_file, passwords, flags); r = attach_tcrypt(cd, argv[2], key_file, passwords, flags);
else else
r = attach_luks_or_plain(cd, r = attach_luks_or_plain(cd, argv[2], key_file, passwords, flags);
argv[2],
key_file,
passwords,
flags);
if (r >= 0) if (r >= 0)
break; break;
if (r != -EAGAIN) if (r != -EAGAIN)