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

Fix some compiler warnings.

Browse Source
This commit is contained in:
Milan Broz
2018-07-19 12:49:59 +02:00
parent 081aa18f39
commit 1112da76f1
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/luks2/luks2_disk_metadata.c
View File

@@ -589,7 +589,8 @@ int LUKS2_disk_hdr_read(struct crypt_device *cd, struct luks2_hdr *hdr,
struct luks2_hdr_disk hdr_disk1, hdr_disk2; struct luks2_hdr_disk hdr_disk1, hdr_disk2;
char *json_area1 = NULL, *json_area2 = NULL; char *json_area1 = NULL, *json_area2 = NULL;
json_object *jobj_hdr1 = NULL, *jobj_hdr2 = NULL; json_object *jobj_hdr1 = NULL, *jobj_hdr2 = NULL;
int i, r; unsigned int i;
int r;
uint64_t hdr_size; uint64_t hdr_size;
uint64_t hdr2_offsets[] = LUKS2_HDR2_OFFSETS; uint64_t hdr2_offsets[] = LUKS2_HDR2_OFFSETS;

1
lib/setup.c
View File

@@ -1036,6 +1036,7 @@ static void crypt_free_type(struct crypt_device *cd)
crypt_free_volume_key(cd->u.integrity.journal_mac_key); crypt_free_volume_key(cd->u.integrity.journal_mac_key);
} else if (!cd->type) { } else if (!cd->type) {
free(cd->u.none.active_name); free(cd->u.none.active_name);
cd->u.none.active_name = NULL;
} }
crypt_set_null_type(cd); crypt_set_null_type(cd);

3
lib/utils_blkid.c
View File

@@ -139,8 +139,9 @@ int blk_superblocks_filter_luks(struct blkid_handle *h)
{ {
int r = -ENOTSUP; int r = -ENOTSUP;
#ifdef HAVE_BLKID #ifdef HAVE_BLKID
char luks[] = "crypto_LUKS";
char *luks_filter[] = { char *luks_filter[] = {
"crypto_LUKS", luks,
NULL NULL
}; };
r = blkid_probe_filter_superblocks_type(h->pr, BLKID_FLTR_NOTIN, luks_filter); r = blkid_probe_filter_superblocks_type(h->pr, BLKID_FLTR_NOTIN, luks_filter);