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

Fix some warnings if compiled with clang.

Browse Source 
git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@371 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
Milan Broz
2010-11-15 16:19:19 +00:00
parent 655007995b
commit a70b27762d
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/setup.c
View File

@@ -932,7 +932,7 @@ int crypt_luksDump(struct crypt_options *options)
r = crypt_dump(cd);
crypt_free(cd);
return 0;
return r;
}
void crypt_get_error(char *buf, size_t size)
@@ -1263,7 +1263,7 @@ int crypt_load(struct crypt_device *cd,
if (!r) {
memcpy(&cd->hdr, &hdr, sizeof(hdr));
cd->type = strdup(requested_type);
cd->type = strdup(CRYPT_LUKS1);
if (!cd->type)
r = -ENOMEM;
}
@@ -1776,6 +1776,7 @@ int crypt_activate_by_passphrase(struct crypt_device *cd,
crypt_status_info ci;
struct volume_key *vk = NULL;
char *read_passphrase = NULL;
unsigned int passphraseLen = 0;
int r;
log_dbg("%s volume %s [keyslot %d] using %spassphrase.",
@@ -1796,10 +1797,11 @@ int crypt_activate_by_passphrase(struct crypt_device *cd,
if (isPLAIN(cd->type)) {
if (!passphrase) {
r = key_from_terminal(cd, NULL, &read_passphrase,
&passphrase_size, 0);
&passphraseLen, 0);
if (r < 0)
goto out;
passphrase = read_passphrase;
passphrase_size = passphraseLen;
}
r = create_device_helper(cd, name, cd->plain_hdr.hash,
cd->plain_cipher, cd->plain_cipher_mode,