[SERVER] iscsi: Reduce number of casts

In functions that can handle multiple different structs, instead of
picking an arbitrary one as the pointer type in the method signature,
pass an uint8_t and cast to the according struct in the sub-cases in the
method body.

1 files changed, 65 insertions, 63 deletions

diff --git a/src/server/iscsi.c b/src/server/iscsi.c
index 706e391..08d26a3 100644
--- a/src/server/iscsi.c
+++ b/src/server/iscsi.c
@@ -1626,32 +1626,33 @@ static int iscsi_scsi_emu_primary_report_luns( iscsi_scsi_report_luns_parameter_
  * is initialized, the sub page code
  * will also be set.
  *
- * @param[in] mode_sense_mode_page_pkt Pointer to mode sense parameter
+ * @param[in] buffer Pointer to mode sense parameter
  * mode page or sub page data packet
  * to initialize. If this is NULL,
  * this function does nothing.
- * @param[in] len Length in bytes to initialize with zeroes.
+ * @param[in] len Length in bytes to initialize. Any padding will be zeroed.
  * @param[in] page Page code.
  * @param[in] sub_page Sub page code.
  */
-static void iscsi_scsi_emu_primary_mode_sense_page_init(iscsi_scsi_mode_sense_mode_page_data_packet *mode_sense_mode_page_pkt, const uint len, const uint page, const uint sub_page)
+static void iscsi_scsi_emu_primary_mode_sense_page_init(uint8_t *buffer, const uint len, const uint page, const uint sub_page)
 {
-	if ( mode_sense_mode_page_pkt == NULL )
+	if ( buffer == NULL )
 		return;
 
 	if ( sub_page == 0U ) {
+		iscsi_scsi_mode_sense_mode_page_data_header *mode_sense_mode_page_pkt = (iscsi_scsi_mode_sense_mode_page_data_header *) buffer;
 		mode_sense_mode_page_pkt->page_code_flags = (uint8_t) ISCSI_SCSI_MODE_SENSE_MODE_PAGE_PUT_PAGE_CODE(page);
-		mode_sense_mode_page_pkt->page_len        = (uint8_t) (len - sizeof(struct iscsi_scsi_mode_sense_mode_page_data_packet));
+		mode_sense_mode_page_pkt->page_len        = (uint8_t) (len - sizeof(*mode_sense_mode_page_pkt));
 
-		memset( mode_sense_mode_page_pkt->params, 0, (len - offsetof(struct iscsi_scsi_mode_sense_mode_page_data_packet, params)) );
+		memset( mode_sense_mode_page_pkt + 1, 0, (len - sizeof(*mode_sense_mode_page_pkt)) );
 	} else {
-		iscsi_scsi_mode_sense_mode_sub_page_data_packet *mode_sense_mode_sub_page_pkt = (iscsi_scsi_mode_sense_mode_sub_page_data_packet *) mode_sense_mode_page_pkt;
+		iscsi_scsi_mode_sense_mode_sub_page_data_header *mode_sense_mode_sub_page_pkt = (iscsi_scsi_mode_sense_mode_sub_page_data_header *) buffer;
 
 		mode_sense_mode_sub_page_pkt->page_code_flags = (uint8_t) (ISCSI_SCSI_MODE_SENSE_MODE_PAGE_PUT_PAGE_CODE(page) | ISCSI_SCSI_MODE_SENSE_MODE_PAGE_FLAGS_SPF);
 		mode_sense_mode_sub_page_pkt->sub_page_code   = (uint8_t) sub_page;
-		iscsi_put_be16( (uint8_t *) &mode_sense_mode_sub_page_pkt->page_len, (uint16_t) (len - sizeof(struct iscsi_scsi_mode_sense_mode_sub_page_data_packet)) );
+		iscsi_put_be16( (uint8_t *) &mode_sense_mode_sub_page_pkt->page_len, (uint16_t) (len - sizeof(*mode_sense_mode_sub_page_pkt)) );
 
-		memset( mode_sense_mode_sub_page_pkt->params, 0, (len - offsetof(struct iscsi_scsi_mode_sense_mode_sub_page_data_packet, params)) );
+		memset( mode_sense_mode_sub_page_pkt + 1, 0, (len - sizeof(*mode_sense_mode_sub_page_pkt)) );
 	}
 }
 
@@ -1668,7 +1669,7 @@ static void iscsi_scsi_emu_primary_mode_sense_page_init(iscsi_scsi_mode_sense_mo
  * responsible for this mode sense
  * task. NULL is NOT allowed here,
  * take caution.
- * @param[in] mode_sense_mode_page_pkt Pointer to mode sense parameter
+ * @param[in] buffer Pointer to mode sense parameter
  * mode page or sub page data packet
  * to process. If this is NULL, only
  * the length of page is calculated.
@@ -1678,10 +1679,10 @@ static void iscsi_scsi_emu_primary_mode_sense_page_init(iscsi_scsi_mode_sense_mo
  * @return Number of bytes occupied or a
  * negative error code otherwise.
  */
-static int iscsi_scsi_emu_primary_mode_sense_page(dnbd3_image_t *image, iscsi_scsi_task *scsi_task, iscsi_scsi_mode_sense_mode_page_data_packet *mode_sense_mode_page_pkt, const uint pc, const uint page, const uint sub_page)
+static int iscsi_scsi_emu_primary_mode_sense_page(dnbd3_image_t *image, iscsi_scsi_task *scsi_task, uint8_t *buffer, const uint pc, const uint page, const uint sub_page)
 {
 	uint page_len;
-	int len = 0;
+	uint len = 0;
 	int tmplen;
 
 	switch ( pc ) {
@@ -1762,9 +1763,9 @@ static int iscsi_scsi_emu_primary_mode_sense_page(dnbd3_image_t *image, iscsi_sc
 			if ( sub_page != 0U )
 				break;
 
-			page_len = sizeof(struct iscsi_scsi_mode_sense_read_write_err_recovery_mode_page_data_packet);
+			page_len = sizeof(iscsi_scsi_mode_sense_read_write_err_recovery_mode_page_data_packet);
 
-			iscsi_scsi_emu_primary_mode_sense_page_init( mode_sense_mode_page_pkt, page_len, page, sub_page );
+			iscsi_scsi_emu_primary_mode_sense_page_init( buffer, page_len, page, sub_page );
 
 			len += page_len;
 
@@ -1774,9 +1775,9 @@ static int iscsi_scsi_emu_primary_mode_sense_page(dnbd3_image_t *image, iscsi_sc
 			if ( sub_page != 0U )
 				break;
 
-			page_len = sizeof(struct iscsi_scsi_mode_sense_disconnect_reconnect_mode_page_data_packet);
+			page_len = sizeof(iscsi_scsi_mode_sense_disconnect_reconnect_mode_page_data_packet);
 
-			iscsi_scsi_emu_primary_mode_sense_page_init( mode_sense_mode_page_pkt, page_len, page, sub_page );
+			iscsi_scsi_emu_primary_mode_sense_page_init( buffer, page_len, page, sub_page );
 
 			len += page_len;
 
@@ -1786,9 +1787,9 @@ static int iscsi_scsi_emu_primary_mode_sense_page(dnbd3_image_t *image, iscsi_sc
 			if ( sub_page != 0U )
 				break;
 
-			page_len = sizeof(struct iscsi_scsi_mode_sense_verify_err_recovery_mode_page_data_packet);
+			page_len = sizeof(iscsi_scsi_mode_sense_verify_err_recovery_mode_page_data_packet);
 
-			iscsi_scsi_emu_primary_mode_sense_page_init( mode_sense_mode_page_pkt, page_len, page, sub_page );
+			iscsi_scsi_emu_primary_mode_sense_page_init( buffer, page_len, page, sub_page );
 
 			len += page_len;
 
@@ -1798,13 +1799,13 @@ static int iscsi_scsi_emu_primary_mode_sense_page(dnbd3_image_t *image, iscsi_sc
 			if ( sub_page != 0U )
 				break;
 
-			iscsi_scsi_mode_sense_caching_mode_page_data_packet *mode_sense_caching_mode_page_pkt = (iscsi_scsi_mode_sense_caching_mode_page_data_packet *) mode_sense_mode_page_pkt;
+			iscsi_scsi_mode_sense_caching_mode_page_data_packet *mode_sense_caching_mode_page_pkt = (iscsi_scsi_mode_sense_caching_mode_page_data_packet *) buffer;
 
-			page_len = sizeof(struct iscsi_scsi_mode_sense_caching_mode_page_data_packet);
+			page_len = sizeof(iscsi_scsi_mode_sense_caching_mode_page_data_packet);
 
-			iscsi_scsi_emu_primary_mode_sense_page_init( mode_sense_mode_page_pkt, page_len, page, sub_page );
+			iscsi_scsi_emu_primary_mode_sense_page_init( buffer, page_len, page, sub_page );
 
-			if ( (mode_sense_mode_page_pkt != NULL) && (pc != ISCSI_SCSI_CDB_MODE_SENSE_6_PAGE_CONTROL_CHG_VALUES) )
+			if ( (buffer != NULL) && (pc != ISCSI_SCSI_CDB_MODE_SENSE_6_PAGE_CONTROL_CHG_VALUES) )
 				mode_sense_caching_mode_page_pkt->flags |= ISCSI_SCSI_MODE_SENSE_CACHING_MODE_PAGE_FLAGS_RCD;
 
 			len += page_len;
@@ -1814,9 +1815,9 @@ static int iscsi_scsi_emu_primary_mode_sense_page(dnbd3_image_t *image, iscsi_sc
 		case ISCSI_SCSI_MODE_SENSE_MODE_PAGE_CODE_CONTROL : {
 			switch ( sub_page ) {
 				case ISCSI_SCSI_MODE_SENSE_MODE_SUB_PAGE_CODE_CONTROL : {
-					page_len = sizeof(struct iscsi_scsi_mode_sense_control_mode_page_data_packet);
+					page_len = sizeof(iscsi_scsi_mode_sense_control_mode_page_data_packet);
 
-					iscsi_scsi_emu_primary_mode_sense_page_init( mode_sense_mode_page_pkt, page_len, page, sub_page );
+					iscsi_scsi_emu_primary_mode_sense_page_init( buffer, page_len, page, sub_page );
 
 					len += page_len;
 
@@ -1827,18 +1828,18 @@ static int iscsi_scsi_emu_primary_mode_sense_page(dnbd3_image_t *image, iscsi_sc
 
 					page_len = sizeof(struct iscsi_scsi_mode_sense_control_ext_mode_page_data_packet);
 
-					iscsi_scsi_emu_primary_mode_sense_page_init( mode_sense_mode_page_pkt, page_len, page, sub_page );
+					iscsi_scsi_emu_primary_mode_sense_page_init( buffer, page_len, page, sub_page );
 
 					len += page_len;
 
 					break;
 				}
 				case ISCSI_SCSI_MODE_SENSE_MODE_SUB_PAGE_CODE_CONTROL_ALL : {
-					tmplen = iscsi_scsi_emu_primary_mode_sense_page( image, scsi_task, ((mode_sense_mode_page_pkt != NULL) ? (iscsi_scsi_mode_sense_mode_page_data_packet *) (((uint8_t *) mode_sense_mode_page_pkt) + len) : NULL), pc, page, ISCSI_SCSI_MODE_SENSE_MODE_SUB_PAGE_CODE_CONTROL );
+					tmplen = iscsi_scsi_emu_primary_mode_sense_page( image, scsi_task, ((buffer != NULL) ? (buffer + len) : NULL), pc, page, ISCSI_SCSI_MODE_SENSE_MODE_SUB_PAGE_CODE_CONTROL );
 					if ( tmplen == -1 )
 						return -1;
 					len += tmplen;
-					tmplen = iscsi_scsi_emu_primary_mode_sense_page( image, scsi_task, ((mode_sense_mode_page_pkt != NULL) ? (iscsi_scsi_mode_sense_mode_page_data_packet *) (((uint8_t *) mode_sense_mode_page_pkt) + len) : NULL), pc, page, ISCSI_SCSI_MODE_SENSE_MODE_SUB_PAGE_CODE_CONTROL_EXT );
+					tmplen = iscsi_scsi_emu_primary_mode_sense_page( image, scsi_task, ((buffer != NULL) ? (buffer + len) : NULL), pc, page, ISCSI_SCSI_MODE_SENSE_MODE_SUB_PAGE_CODE_CONTROL_EXT );
 					if ( tmplen == -1 )
 						return -1;
 					len += tmplen;
@@ -1858,7 +1859,7 @@ static int iscsi_scsi_emu_primary_mode_sense_page(dnbd3_image_t *image, iscsi_sc
 
 			page_len = sizeof(struct iscsi_scsi_mode_sense_xor_ext_mode_page_data_packet);
 
-			iscsi_scsi_emu_primary_mode_sense_page_init( mode_sense_mode_page_pkt, page_len, page, sub_page );
+			iscsi_scsi_emu_primary_mode_sense_page_init( buffer, page_len, page, sub_page );
 
 			len += page_len;
 
@@ -1870,7 +1871,7 @@ static int iscsi_scsi_emu_primary_mode_sense_page(dnbd3_image_t *image, iscsi_sc
 
 			page_len = sizeof(struct iscsi_scsi_mode_sense_power_cond_mode_page_data_packet);
 
-			iscsi_scsi_emu_primary_mode_sense_page_init( mode_sense_mode_page_pkt, page_len, page, sub_page );
+			iscsi_scsi_emu_primary_mode_sense_page_init( buffer, page_len, page, sub_page );
 
 			len += page_len;
 
@@ -1882,19 +1883,17 @@ static int iscsi_scsi_emu_primary_mode_sense_page(dnbd3_image_t *image, iscsi_sc
 
 			page_len = sizeof(struct iscsi_scsi_mode_sense_info_exceptions_control_mode_page_data_packet);
 
-			iscsi_scsi_emu_primary_mode_sense_page_init( mode_sense_mode_page_pkt, page_len, page, sub_page );
+			iscsi_scsi_emu_primary_mode_sense_page_init( buffer, page_len, page, sub_page );
 
 			len += page_len;
 
 			break;
 		}
 		case ISCSI_SCSI_MODE_SENSE_MODE_PAGE_CODE_REPORT_ALL_MODE_PAGES : {
-			uint i;
-
 			switch ( sub_page ) {
 				case ISCSI_SCSI_MODE_SENSE_MODE_SUB_PAGE_CODE_REPORT_ALL_MODE_PAGES : {
-					for ( i = ISCSI_SCSI_MODE_SENSE_MODE_PAGE_CODE_VENDOR_SPEC; i < ISCSI_SCSI_MODE_SENSE_MODE_PAGE_CODE_REPORT_ALL_MODE_PAGES; i++ ) {
-						tmplen = iscsi_scsi_emu_primary_mode_sense_page( image, scsi_task, ((mode_sense_mode_page_pkt != NULL) ? (iscsi_scsi_mode_sense_mode_page_data_packet *) (((uint8_t *) mode_sense_mode_page_pkt) + len) : NULL), pc, i, ISCSI_SCSI_MODE_SENSE_MODE_SUB_PAGE_CODE_REPORT_ALL_MODE_PAGES );
+					for ( uint i = ISCSI_SCSI_MODE_SENSE_MODE_PAGE_CODE_VENDOR_SPEC; i < ISCSI_SCSI_MODE_SENSE_MODE_PAGE_CODE_REPORT_ALL_MODE_PAGES; i++ ) {
+						tmplen = iscsi_scsi_emu_primary_mode_sense_page( image, scsi_task, ((buffer != NULL) ? (buffer + len) : NULL), pc, i, ISCSI_SCSI_MODE_SENSE_MODE_SUB_PAGE_CODE_REPORT_ALL_MODE_PAGES );
 						if ( tmplen == -1 )
 							return -1;
 						len += tmplen;
@@ -1903,15 +1902,15 @@ static int iscsi_scsi_emu_primary_mode_sense_page(dnbd3_image_t *image, iscsi_sc
 					break;
 				}
 				case ISCSI_SCSI_MODE_SENSE_MODE_SUB_PAGE_CODE_REPORT_ALL_MODE_SUB_PAGES : {
-					for ( i = ISCSI_SCSI_MODE_SENSE_MODE_PAGE_CODE_VENDOR_SPEC; i < ISCSI_SCSI_MODE_SENSE_MODE_PAGE_CODE_REPORT_ALL_MODE_PAGES; i++ ) {
-						tmplen = iscsi_scsi_emu_primary_mode_sense_page( image, scsi_task, ((mode_sense_mode_page_pkt != NULL) ? (iscsi_scsi_mode_sense_mode_page_data_packet *) (((uint8_t *) mode_sense_mode_page_pkt) + len) : NULL), pc, i, ISCSI_SCSI_MODE_SENSE_MODE_SUB_PAGE_CODE_REPORT_ALL_MODE_PAGES );
+					for ( uint i = ISCSI_SCSI_MODE_SENSE_MODE_PAGE_CODE_VENDOR_SPEC; i < ISCSI_SCSI_MODE_SENSE_MODE_PAGE_CODE_REPORT_ALL_MODE_PAGES; i++ ) {
+						tmplen = iscsi_scsi_emu_primary_mode_sense_page( image, scsi_task, ((buffer != NULL) ? (buffer + len) : NULL), pc, i, ISCSI_SCSI_MODE_SENSE_MODE_SUB_PAGE_CODE_REPORT_ALL_MODE_PAGES );
 						if ( tmplen == -1 )
 							return -1;
 						len += tmplen;
 					}
 
-					for ( i = ISCSI_SCSI_MODE_SENSE_MODE_PAGE_CODE_VENDOR_SPEC; i < ISCSI_SCSI_MODE_SENSE_MODE_PAGE_CODE_REPORT_ALL_MODE_PAGES; i++ ) {
-						tmplen = iscsi_scsi_emu_primary_mode_sense_page( image, scsi_task, ((mode_sense_mode_page_pkt != NULL) ? (iscsi_scsi_mode_sense_mode_page_data_packet *) (((uint8_t *) mode_sense_mode_page_pkt) + len) : NULL), pc, i, ISCSI_SCSI_MODE_SENSE_MODE_SUB_PAGE_CODE_REPORT_ALL_MODE_SUB_PAGES );
+					for ( uint i = ISCSI_SCSI_MODE_SENSE_MODE_PAGE_CODE_VENDOR_SPEC; i < ISCSI_SCSI_MODE_SENSE_MODE_PAGE_CODE_REPORT_ALL_MODE_PAGES; i++ ) {
+						tmplen = iscsi_scsi_emu_primary_mode_sense_page( image, scsi_task, ((buffer != NULL) ? (buffer + len) : NULL), pc, i, ISCSI_SCSI_MODE_SENSE_MODE_SUB_PAGE_CODE_REPORT_ALL_MODE_SUB_PAGES );
 						if ( tmplen == -1 )
 							return -1;
 						len += tmplen;
@@ -1931,7 +1930,7 @@ static int iscsi_scsi_emu_primary_mode_sense_page(dnbd3_image_t *image, iscsi_sc
 		}
 	}
 
-	return len;
+	return (int)len;
 }
 
 /**
@@ -1947,7 +1946,7 @@ static int iscsi_scsi_emu_primary_mode_sense_page(dnbd3_image_t *image, iscsi_sc
  * responsible for this mode sense
  * task. NULL is NOT allowed here,
  * take caution.
- * @param[in] mode_sense_6_parameter_hdr_data_pkt Pointer to mode sense parameter
+ * @param[in] buffer Pointer to mode sense parameter
  * header data packet to fill the
  * mode sense data with. If this is
  * NULL, only the length of sense
@@ -1963,26 +1962,29 @@ static int iscsi_scsi_emu_primary_mode_sense_page(dnbd3_image_t *image, iscsi_sc
  * operation, a negative error code
  * otherwise.
  */
-static int iscsi_scsi_emu_primary_mode_sense(dnbd3_image_t *image, iscsi_scsi_task *scsi_task, iscsi_scsi_mode_sense_6_parameter_header_data_packet *mode_sense_6_parameter_hdr_data_pkt, const uint hdr_len, const uint block_desc_len, const uint long_lba, const uint pc, const uint page_code, const uint sub_page_code)
+static int iscsi_scsi_emu_primary_mode_sense(dnbd3_image_t *image, iscsi_scsi_task *scsi_task, uint8_t *buffer,
+		const uint hdr_len, const uint block_desc_len, const uint long_lba, const uint pc, const uint page_code, const uint sub_page_code)
 {
-	iscsi_scsi_mode_sense_mode_page_data_packet *mode_sense_mode_page_pkt = (iscsi_scsi_mode_sense_mode_page_data_packet *) ((mode_sense_6_parameter_hdr_data_pkt != NULL) ? (((uint8_t *) mode_sense_6_parameter_hdr_data_pkt) + hdr_len + block_desc_len) : NULL);
-	const int page_len = iscsi_scsi_emu_primary_mode_sense_page( image, scsi_task, mode_sense_mode_page_pkt, pc, page_code, sub_page_code );
+	// Pointer to right after header and LBA block description; where the pages go
+	uint8_t *mode_sense_payload = (buffer != NULL) ? (buffer + hdr_len + block_desc_len) : NULL;
+	const int page_len = iscsi_scsi_emu_primary_mode_sense_page( image, scsi_task, mode_sense_payload, pc, page_code, sub_page_code );
 
 	if ( page_len < 0 )
 		return -1;
 
 	const uint alloc_len = (hdr_len + block_desc_len + page_len);
 
-	if ( mode_sense_6_parameter_hdr_data_pkt == NULL )
-		return alloc_len;
+	if ( buffer == NULL )
+		return (int)alloc_len;
 
-	if ( hdr_len == sizeof(struct iscsi_scsi_mode_sense_6_parameter_header_data_packet) ) {
+	if ( hdr_len == sizeof(iscsi_scsi_mode_sense_6_parameter_header_data_packet) ) {
+		iscsi_scsi_mode_sense_6_parameter_header_data_packet *mode_sense_6_parameter_hdr_data_pkt = (iscsi_scsi_mode_sense_6_parameter_header_data_packet *) buffer;
 		mode_sense_6_parameter_hdr_data_pkt->mode_data_len  = (uint8_t) (alloc_len - sizeof(uint8_t));
 		mode_sense_6_parameter_hdr_data_pkt->medium_type    = 0U;
 		mode_sense_6_parameter_hdr_data_pkt->flags          = ISCSI_SCSI_MODE_SENSE_6_PARAM_HDR_DATA_FLAGS_WP;
 		mode_sense_6_parameter_hdr_data_pkt->block_desc_len = (uint8_t) block_desc_len;
-	} else if ( hdr_len == sizeof(struct iscsi_scsi_mode_sense_10_parameter_header_data_packet) ) {
-		iscsi_scsi_mode_sense_10_parameter_header_data_packet *mode_sense_10_parameter_hdr_data_pkt = (iscsi_scsi_mode_sense_10_parameter_header_data_packet *) mode_sense_6_parameter_hdr_data_pkt;
+	} else if ( hdr_len == sizeof(iscsi_scsi_mode_sense_10_parameter_header_data_packet) ) {
+		iscsi_scsi_mode_sense_10_parameter_header_data_packet *mode_sense_10_parameter_hdr_data_pkt = (iscsi_scsi_mode_sense_10_parameter_header_data_packet *) buffer;
 
 		iscsi_put_be16( (uint8_t *) &mode_sense_10_parameter_hdr_data_pkt->mode_data_len, (uint16_t) (alloc_len - sizeof(uint16_t)) );
 		mode_sense_10_parameter_hdr_data_pkt->medium_type    = 0U;
@@ -1998,8 +2000,8 @@ static int iscsi_scsi_emu_primary_mode_sense(dnbd3_image_t *image, iscsi_scsi_ta
 	const uint64_t num_blocks = iscsi_scsi_emu_block_get_count( image );
 	const uint32_t block_size = ISCSI_SCSI_EMU_LOGICAL_BLOCK_SIZE;
 
-	if ( block_desc_len == sizeof(struct iscsi_scsi_mode_sense_lba_parameter_block_desc_data_packet) ) {
-		iscsi_scsi_mode_sense_lba_parameter_block_desc_data_packet *lba_parameter_block_desc = (iscsi_scsi_mode_sense_lba_parameter_block_desc_data_packet *) (((uint8_t *) mode_sense_6_parameter_hdr_data_pkt) + hdr_len);
+	if ( block_desc_len == sizeof(iscsi_scsi_mode_sense_lba_parameter_block_desc_data_packet) ) {
+		iscsi_scsi_mode_sense_lba_parameter_block_desc_data_packet *lba_parameter_block_desc = (iscsi_scsi_mode_sense_lba_parameter_block_desc_data_packet *) (buffer + hdr_len);
 
 		if ( num_blocks > 0xFFFFFFFFULL )
 			lba_parameter_block_desc->num_blocks = 0xFFFFFFFFUL; // Minus one does not require endianess conversion
@@ -2008,15 +2010,15 @@ static int iscsi_scsi_emu_primary_mode_sense(dnbd3_image_t *image, iscsi_scsi_ta
 
 		lba_parameter_block_desc->reserved = 0U;
 		iscsi_put_be24( (uint8_t *) &lba_parameter_block_desc->block_len, block_size );
-	} else if ( block_desc_len == sizeof(struct iscsi_scsi_mode_sense_long_lba_parameter_block_desc_data_packet) ) {
-		iscsi_scsi_mode_sense_long_lba_parameter_block_desc_data_packet *long_lba_parameter_block_desc = (iscsi_scsi_mode_sense_long_lba_parameter_block_desc_data_packet *) (((uint8_t *) mode_sense_6_parameter_hdr_data_pkt) + hdr_len);
+	} else if ( block_desc_len == sizeof(iscsi_scsi_mode_sense_long_lba_parameter_block_desc_data_packet) ) {
+		iscsi_scsi_mode_sense_long_lba_parameter_block_desc_data_packet *long_lba_parameter_block_desc = (iscsi_scsi_mode_sense_long_lba_parameter_block_desc_data_packet *) (buffer + hdr_len);
 
 		iscsi_put_be64( (uint8_t *) &long_lba_parameter_block_desc->num_blocks, num_blocks );
 		long_lba_parameter_block_desc->reserved = 0UL;
 		iscsi_put_be32( (uint8_t *) &long_lba_parameter_block_desc->block_len, block_size );
 	}
 
-	return alloc_len;
+	return (int)alloc_len;
 }
 
 /**
@@ -2093,7 +2095,7 @@ static int iscsi_scsi_emu_primary_process(iscsi_scsi_task *scsi_task)
 
 			if ( rc >= 0 ) {
 				scsi_task->buf    = (uint8_t *) std_inquiry_data_pkt;
-				scsi_task->len    = MIN( rc, alloc_len );
+				scsi_task->len    = MIN( (uint)rc, alloc_len );
 				scsi_task->status = ISCSI_SCSI_STATUS_GOOD;
 			} else {
 				free( std_inquiry_data_pkt );
@@ -2122,7 +2124,7 @@ static int iscsi_scsi_emu_primary_process(iscsi_scsi_task *scsi_task)
 
 			if ( rc >= 0 ) {
 				scsi_task->buf    = (uint8_t *) report_luns_parameter_data_pkt;
-				scsi_task->len    = MIN( rc, alloc_len );
+				scsi_task->len    = MIN( (uint)rc, alloc_len );
 				scsi_task->status = ISCSI_SCSI_STATUS_GOOD;
 			} else {
 				free( report_luns_parameter_data_pkt );
@@ -2148,7 +2150,7 @@ static int iscsi_scsi_emu_primary_process(iscsi_scsi_task *scsi_task)
 
 			len = rc;
 
-			iscsi_scsi_mode_sense_6_parameter_header_data_packet *mode_sense_6_parameter_hdr_data_pkt = (iscsi_scsi_mode_sense_6_parameter_header_data_packet *) malloc( len );
+			uint8_t *mode_sense_6_parameter_hdr_data_pkt = malloc( len );
 
 			if ( mode_sense_6_parameter_hdr_data_pkt == NULL ) {
 				iscsi_scsi_task_status_set( scsi_task, ISCSI_SCSI_STATUS_CHECK_COND, ISCSI_SCSI_SENSE_KEY_NOT_READY, ISCSI_SCSI_ASC_LOGICAL_UNIT_NOT_READY, ISCSI_SCSI_ASCQ_BECOMING_READY );
@@ -2159,8 +2161,8 @@ static int iscsi_scsi_emu_primary_process(iscsi_scsi_task *scsi_task)
 			rc = iscsi_scsi_emu_primary_mode_sense( scsi_task->connection->client->image, scsi_task, mode_sense_6_parameter_hdr_data_pkt, sizeof(struct iscsi_scsi_mode_sense_6_parameter_header_data_packet), block_desc_len, 0U, pc, page, sub_page );
 
 			if ( rc >= 0 ) {
-				scsi_task->buf    = (uint8_t *) mode_sense_6_parameter_hdr_data_pkt;
-				scsi_task->len    = MIN( rc, alloc_len );
+				scsi_task->buf    = mode_sense_6_parameter_hdr_data_pkt;
+				scsi_task->len    = MIN( (uint)rc, alloc_len );
 				scsi_task->status = ISCSI_SCSI_STATUS_GOOD;
 			} else {
 				free( mode_sense_6_parameter_hdr_data_pkt );
@@ -2180,14 +2182,14 @@ static int iscsi_scsi_emu_primary_process(iscsi_scsi_task *scsi_task)
 			const uint page10         = ISCSI_SCSI_CDB_MODE_SENSE_10_GET_PAGE_CODE(cdb_mode_sense_10->page_code_control);
 			const uint sub_page10     = cdb_mode_sense_10->sub_page_code;
 
-			rc = iscsi_scsi_emu_primary_mode_sense( scsi_task->connection->client->image, scsi_task, NULL, sizeof(struct iscsi_scsi_mode_sense_10_parameter_header_data_packet), block_desc_len, long_lba, pc10, page10, sub_page10 );
+			rc = iscsi_scsi_emu_primary_mode_sense( scsi_task->connection->client->image, scsi_task, NULL, sizeof(iscsi_scsi_mode_sense_10_parameter_header_data_packet), block_desc_len, long_lba, pc10, page10, sub_page10 );
 
 			if ( rc < 0 )
 				break;
 
 			len = rc;
 
-			iscsi_scsi_mode_sense_10_parameter_header_data_packet *mode_sense_10_parameter_hdr_data_pkt = (iscsi_scsi_mode_sense_10_parameter_header_data_packet *) malloc( len );
+			uint8_t *mode_sense_10_parameter_hdr_data_pkt = malloc( len );
 
 			if ( mode_sense_10_parameter_hdr_data_pkt == NULL ) {
 				iscsi_scsi_task_status_set( scsi_task, ISCSI_SCSI_STATUS_CHECK_COND, ISCSI_SCSI_SENSE_KEY_NOT_READY, ISCSI_SCSI_ASC_LOGICAL_UNIT_NOT_READY, ISCSI_SCSI_ASCQ_BECOMING_READY );
@@ -2195,11 +2197,11 @@ static int iscsi_scsi_emu_primary_process(iscsi_scsi_task *scsi_task)
 				break;
 			}
 
-			rc = iscsi_scsi_emu_primary_mode_sense( scsi_task->connection->client->image, scsi_task, (iscsi_scsi_mode_sense_6_parameter_header_data_packet *) mode_sense_10_parameter_hdr_data_pkt, sizeof(struct iscsi_scsi_mode_sense_10_parameter_header_data_packet), block_desc_len, long_lba, pc10, page10, sub_page10 );
+			rc = iscsi_scsi_emu_primary_mode_sense( scsi_task->connection->client->image, scsi_task, mode_sense_10_parameter_hdr_data_pkt, sizeof(struct iscsi_scsi_mode_sense_10_parameter_header_data_packet), block_desc_len, long_lba, pc10, page10, sub_page10 );
 
 			if ( rc >= 0 ) {
-				scsi_task->buf    = (uint8_t *) mode_sense_10_parameter_hdr_data_pkt;
-				scsi_task->len    = MIN( rc, alloc_len );
+				scsi_task->buf    = mode_sense_10_parameter_hdr_data_pkt;
+				scsi_task->len    = MIN( (uint)rc, alloc_len );
 				scsi_task->status = ISCSI_SCSI_STATUS_GOOD;
 			} else {
 				free( mode_sense_10_parameter_hdr_data_pkt );