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

Rename encrypt helper function to avoid clash with unistd prototype.

Browse Source
This commit is contained in:
Milan Broz
2022-01-29 10:21:06 +01:00
parent 230b80404d
commit 0cb4f59006
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils_reencrypt.c
View File

@@ -962,7 +962,7 @@ static int reencrypt_luks2(struct crypt_device *cd, int action_argc, const char
return r; return r;
} }
static int encrypt(int action_argc, const char **action_argv) static int _encrypt(int action_argc, const char **action_argv)
{ {
const char *type = luksType(device_type); const char *type = luksType(device_type);
bool luks1_in_reencrypt = false; bool luks1_in_reencrypt = false;
@@ -996,7 +996,7 @@ static int encrypt(int action_argc, const char **action_argv)
return -EINVAL; return -EINVAL;
} }
static int decrypt(int action_argc, const char **action_argv) static int _decrypt(int action_argc, const char **action_argv)
{ {
enum device_status_info dev_st; enum device_status_info dev_st;
int r; int r;
@@ -1052,9 +1052,9 @@ int reencrypt(int action_argc, const char **action_argv)
} }
if (ARG_SET(OPT_ENCRYPT_ID)) if (ARG_SET(OPT_ENCRYPT_ID))
return encrypt(action_argc, action_argv); return _encrypt(action_argc, action_argv);
else if (ARG_SET(OPT_DECRYPT_ID)) else if (ARG_SET(OPT_DECRYPT_ID))
return decrypt(action_argc, action_argv); return _decrypt(action_argc, action_argv);
else else
return _reencrypt(action_argc, action_argv); return _reencrypt(action_argc, action_argv);
} }