eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-19 14:50:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove some redundant brackets.

Browse Source
This commit is contained in:
Milan Broz
2012-06-19 15:49:56 +02:00
parent a38fcafcff
commit 42abcc0fac
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/cryptsetup.c
View File

@@ -1394,30 +1394,27 @@ int main(int argc, const char **argv)
/* FIXME: rewrite this from scratch */ /* FIXME: rewrite this from scratch */
if (opt_shared && strcmp(aname, "create")) { if (opt_shared && strcmp(aname, "create"))
usage(popt_context, EXIT_FAILURE, usage(popt_context, EXIT_FAILURE,
_("Option --shared is allowed only for create operation.\n"), _("Option --shared is allowed only for create operation.\n"),
poptGetInvocationName(popt_context)); poptGetInvocationName(popt_context));
}
if (opt_allow_discards && if (opt_allow_discards &&
strcmp(aname, "luksOpen") && strcmp(aname, "luksOpen") &&
strcmp(aname, "create") && strcmp(aname, "create") &&
strcmp(aname, "loopaesOpen")) { strcmp(aname, "loopaesOpen"))
usage(popt_context, EXIT_FAILURE, usage(popt_context, EXIT_FAILURE,
_("Option --allow-discards is allowed only for luksOpen, loopaesOpen and create operation.\n"), _("Option --allow-discards is allowed only for luksOpen, loopaesOpen and create operation.\n"),
poptGetInvocationName(popt_context)); poptGetInvocationName(popt_context));
}
if (opt_key_size && if (opt_key_size &&
strcmp(aname, "luksFormat") && strcmp(aname, "luksFormat") &&
strcmp(aname, "create") && strcmp(aname, "create") &&
strcmp(aname, "loopaesOpen")) { strcmp(aname, "loopaesOpen"))
usage(popt_context, EXIT_FAILURE, usage(popt_context, EXIT_FAILURE,
_("Option --key-size is allowed only for luksFormat, create and loopaesOpen.\n" _("Option --key-size is allowed only for luksFormat, create and loopaesOpen.\n"
"To limit read from keyfile use --keyfile-size=(bytes)."), "To limit read from keyfile use --keyfile-size=(bytes)."),
poptGetInvocationName(popt_context)); poptGetInvocationName(popt_context));
}
if (opt_without_activation && if (opt_without_activation &&
strcmp(aname, "luksOpen")) strcmp(aname, "luksOpen"))
@@ -1447,11 +1444,10 @@ int main(int argc, const char **argv)
} }
if (opt_keyfile_size < 0 || opt_new_keyfile_size < 0 || opt_key_size < 0 || if (opt_keyfile_size < 0 || opt_new_keyfile_size < 0 || opt_key_size < 0 ||
opt_keyfile_offset < 0 || opt_new_keyfile_offset < 0) { opt_keyfile_offset < 0 || opt_new_keyfile_offset < 0)
usage(popt_context, EXIT_FAILURE, usage(popt_context, EXIT_FAILURE,
_("Negative number for option not permitted."), _("Negative number for option not permitted."),
poptGetInvocationName(popt_context)); poptGetInvocationName(popt_context));
}
if (opt_random && opt_urandom) if (opt_random && opt_urandom)
usage(popt_context, EXIT_FAILURE, _("Only one of --use-[u]random options is allowed."), usage(popt_context, EXIT_FAILURE, _("Only one of --use-[u]random options is allowed."),