Next round of sonarlint cleanups

src/disk/hdd_image.c

@@ -45,7 +45,8 @@ typedef struct
     FILE     *file; /* Used for HDD_IMAGE_RAW, HDD_IMAGE_HDI, and HDD_IMAGE_HDX. */
     MVHDMeta *vhd;  /* Used for HDD_IMAGE_VHD. */
     uint32_t  base;
-    uint32_t  pos, last_sector;
+    uint32_t  pos;
+    uint32_t  last_sector;
     uint8_t   type; /* HDD_IMAGE_RAW, HDD_IMAGE_HDI, HDD_IMAGE_HDX, or HDD_IMAGE_VHD */
     uint8_t   loaded;
 } hdd_image_t;
@@ -637,7 +638,7 @@ hdd_image_get_type(uint8_t id)
 }
 
 void
-hdd_image_unload(uint8_t id, int fn_preserve)
+hdd_image_unload(uint8_t id, UNUSED(int fn_preserve))
 {
     if (strlen(hdd[id].fn) == 0)
         return;