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

Remove unused arg argument from tool actions.

Browse Source
This commit is contained in:
Milan Broz
2021-02-05 12:45:00 +01:00
parent f05c9833ee
commit fe71fd469a
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/integritysetup.c
View File

@@ -118,7 +118,7 @@ static int _wipe_data_device(struct crypt_device *cd, const char *integrity_key)
return r; return r;
} }
static int action_format(int arg) static int action_format(void)
{ {
struct crypt_device *cd = NULL; struct crypt_device *cd = NULL;
struct crypt_params_integrity params = { struct crypt_params_integrity params = {
@@ -214,7 +214,7 @@ out:
return r; return r;
} }
static int action_open(int arg) static int action_open(void)
{ {
struct crypt_device *cd = NULL; struct crypt_device *cd = NULL;
struct crypt_params_integrity params = { struct crypt_params_integrity params = {
@@ -291,7 +291,7 @@ out:
return r; return r;
} }
static int action_close(int arg) static int action_close(void)
{ {
struct crypt_device *cd = NULL; struct crypt_device *cd = NULL;
crypt_status_info ci; crypt_status_info ci;
@@ -318,7 +318,7 @@ static int action_close(int arg)
return r; return r;
} }
static int action_status(int arg) static int action_status(void)
{ {
crypt_status_info ci; crypt_status_info ci;
struct crypt_active_device cad; struct crypt_active_device cad;
@@ -418,7 +418,7 @@ out:
return -EINVAL; return -EINVAL;
} }
static int action_dump(int arg) static int action_dump(void)
{ {
struct crypt_device *cd = NULL; struct crypt_device *cd = NULL;
struct crypt_params_integrity params = {}; struct crypt_params_integrity params = {};
@@ -437,7 +437,7 @@ static int action_dump(int arg)
static struct action_type { static struct action_type {
const char *type; const char *type;
int (*handler)(int); int (*handler)(void);
int required_action_argc; int required_action_argc;
const char *arg_desc; const char *arg_desc;
const char *desc; const char *desc;
@@ -490,7 +490,7 @@ static int run_action(struct action_type *action)
log_dbg("Running command %s.", action->type); log_dbg("Running command %s.", action->type);
r = action->handler(0); r = action->handler();
show_status(r); show_status(r);
return translate_errno(r); return translate_errno(r);

16
src/veritysetup.c
View File

@@ -72,7 +72,7 @@ static int _prepare_format(struct crypt_params_verity *params,
return 0; return 0;
} }
static int action_format(int arg) static int action_format(void)
{ {
struct crypt_device *cd = NULL; struct crypt_device *cd = NULL;
struct crypt_params_verity params = {}; struct crypt_params_verity params = {};
@@ -198,7 +198,7 @@ out:
return r; return r;
} }
static int action_open(int arg) static int action_open(void)
{ {
return _activate(action_argv[1], return _activate(action_argv[1],
action_argv[0], action_argv[0],
@@ -207,7 +207,7 @@ static int action_open(int arg)
ARG_SET(OPT_ROOT_HASH_SIGNATURE_ID) ? CRYPT_VERITY_ROOT_HASH_SIGNATURE : 0); ARG_SET(OPT_ROOT_HASH_SIGNATURE_ID) ? CRYPT_VERITY_ROOT_HASH_SIGNATURE : 0);
} }
static int action_verify(int arg) static int action_verify(void)
{ {
return _activate(NULL, return _activate(NULL,
action_argv[0], action_argv[0],
@@ -216,7 +216,7 @@ static int action_verify(int arg)
CRYPT_VERITY_CHECK_HASH); CRYPT_VERITY_CHECK_HASH);
} }
static int action_close(int arg) static int action_close(void)
{ {
struct crypt_device *cd = NULL; struct crypt_device *cd = NULL;
crypt_status_info ci; crypt_status_info ci;
@@ -243,7 +243,7 @@ static int action_close(int arg)
return r; return r;
} }
static int action_status(int arg) static int action_status(void)
{ {
crypt_status_info ci; crypt_status_info ci;
struct crypt_active_device cad; struct crypt_active_device cad;
@@ -370,7 +370,7 @@ out:
return r; return r;
} }
static int action_dump(int arg) static int action_dump(void)
{ {
struct crypt_device *cd = NULL; struct crypt_device *cd = NULL;
struct crypt_params_verity params = {}; struct crypt_params_verity params = {};
@@ -390,7 +390,7 @@ static int action_dump(int arg)
static struct action_type { static struct action_type {
const char *type; const char *type;
int (*handler)(int); int (*handler)(void);
int required_action_argc; int required_action_argc;
const char *arg_desc; const char *arg_desc;
const char *desc; const char *desc;
@@ -450,7 +450,7 @@ static int run_action(struct action_type *action)
log_dbg("Running command %s.", action->type); log_dbg("Running command %s.", action->type);
r = action->handler(0); r = action->handler();
show_status(r); show_status(r);
return translate_errno(r); return translate_errno(r);