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

Some more gcc warnings fixes.

Browse Source
This commit is contained in:
Milan Broz
2018-09-29 17:32:33 +02:00
parent 874fa5810d
commit 0b10d877b0
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/api-test-2.c
View File

@@ -426,13 +426,11 @@ static int test_open(struct crypt_device *cd,
void *usrptr) void *usrptr)
{ {
const char *str = (const char *)usrptr; const char *str = (const char *)usrptr;
char *buf = malloc(strlen(str));
if (!buf)
return -ENOMEM;
strncpy(buf, str, strlen(str)); *buffer = strdup(str);
*buffer = buf; if (!*buffer)
*buffer_len = strlen(str); return -ENOMEM;
*buffer_len = strlen(*buffer);
return 0; return 0;
} }

9
tests/api-test.c
View File

@@ -100,13 +100,18 @@ static int get_luks_offsets(int metadata_device,
uint64_t current_sector; uint64_t current_sector;
uint32_t sectors_per_stripes_set; uint32_t sectors_per_stripes_set;
if (!keylength) if (!keylength) {
if (r_header_size)
*r_header_size = 0;
if (r_payload_offset)
*r_payload_offset = 0;
return -1; return -1;
}
sectors_per_stripes_set = DIV_ROUND_UP(keylength*LUKS_STRIPES, SECTOR_SIZE); sectors_per_stripes_set = DIV_ROUND_UP(keylength*LUKS_STRIPES, SECTOR_SIZE);
current_sector = DIV_ROUND_UP_MODULO(DIV_ROUND_UP(LUKS_PHDR_SIZE_B, SECTOR_SIZE), current_sector = DIV_ROUND_UP_MODULO(DIV_ROUND_UP(LUKS_PHDR_SIZE_B, SECTOR_SIZE),
LUKS_ALIGN_KEYSLOTS / SECTOR_SIZE); LUKS_ALIGN_KEYSLOTS / SECTOR_SIZE);
for(i=0;i < (LUKS_NUMKEYS - 1);i++) for (i=0; i < (LUKS_NUMKEYS - 1); i++)
current_sector = DIV_ROUND_UP_MODULO(current_sector + sectors_per_stripes_set, current_sector = DIV_ROUND_UP_MODULO(current_sector + sectors_per_stripes_set,
LUKS_ALIGN_KEYSLOTS / SECTOR_SIZE); LUKS_ALIGN_KEYSLOTS / SECTOR_SIZE);
if (r_header_size) if (r_header_size)