Skip to content
Snippets Groups Projects
Commit cd1510b0 authored by Brian Carrier's avatar Brian Carrier
Browse files

Fix compiler warnings. Closes #2508

parent 8d88cfff
No related branches found
No related tags found
No related merge requests found
......@@ -206,7 +206,7 @@ tsk_fs_open_img_decrypt(TSK_IMG_INFO * a_img_info, TSK_OFF_T a_offset,
unsupportedSignatureFound = 1;
tsk_error_reset();
tsk_error_set_errno(TSK_ERR_IMG_UNSUPTYPE);
tsk_error_set_errstr(imageType);
tsk_error_set_errstr("%s", imageType);
free(imageType);
}
}
......@@ -217,11 +217,11 @@ tsk_fs_open_img_decrypt(TSK_IMG_INFO * a_img_info, TSK_OFF_T a_offset,
if (result != NULL) {
if (result->encryptionType == ENCRYPTION_DETECTED_SIGNATURE) {
tsk_error_set_errno(TSK_ERR_FS_ENCRYPTED);
tsk_error_set_errstr(result->desc);
tsk_error_set_errstr("%s", result->desc);
}
else if (result->encryptionType == ENCRYPTION_DETECTED_ENTROPY) {
tsk_error_set_errno(TSK_ERR_FS_POSSIBLY_ENCRYPTED);
tsk_error_set_errstr(result->desc);
tsk_error_set_errstr("%s", result->desc);
}
else {
tsk_error_set_errno(TSK_ERR_FS_UNKTYPE);
......
......@@ -121,11 +121,11 @@ calculateEntropy(TSK_IMG_INFO * img_info, TSK_DADDR_T offset) {
break;
}
if (tsk_img_read(img_info, offset + i * bufLen, buf, bufLen) != bufLen) {
if (tsk_img_read(img_info, offset + i * bufLen, buf, bufLen) != (ssize_t) bufLen) {
break;
}
for (int j = 0; j < bufLen; j++) {
for (size_t j = 0; j < bufLen; j++) {
unsigned char b = buf[j] & 0xff;
byteCounts[b]++;
}
......@@ -176,7 +176,7 @@ detectVolumeEncryption(TSK_IMG_INFO * img_info, TSK_DADDR_T offset) {
if (buf == NULL) {
return result;
}
if (tsk_img_read(img_info, offset, buf, len) != len) {
if (tsk_img_read(img_info, offset, buf, len) != (ssize_t)len) {
free(buf);
return result;
}
......@@ -250,7 +250,7 @@ detectDiskEncryption(TSK_IMG_INFO * img_info, TSK_DADDR_T offset) {
if (buf == NULL) {
return result;
}
if (tsk_img_read(img_info, offset, buf, len) != len) {
if (tsk_img_read(img_info, offset, buf, len) != (ssize_t)len) {
free(buf);
return result;
}
......
......@@ -184,7 +184,7 @@ tsk_vs_open(TSK_IMG_INFO * img_info, TSK_DADDR_T offset,
if (result != NULL) {
if (result->encryptionType == ENCRYPTION_DETECTED_SIGNATURE) {
tsk_error_set_errno(TSK_ERR_VS_ENCRYPTED);
tsk_error_set_errstr(result->desc);
tsk_error_set_errstr("%s", result->desc);
}
free(result);
result = NULL;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment