Remove unneeded variables.

diff --git a/disk.cpp b/disk.cpp
index d5a7504c02d56b9b806453f17eef37253f38767e..24e634b94cfa8836c6a684b2f07486d35cd8f116 100644 (file)
--- a/disk.cpp
+++ b/disk.cpp
@@ -2167,7 +2167,7 @@ static int decode_buffer (uae_u16 *mbuf, int cyl, int drvsec, int ddhd, int file
        int length = 2 * fwlen;
        uae_u32 odd, even, chksum, id, dlong;
        uae_u8 *secdata;
-       uae_u8 secbuf[544], secheadbuf[16];
+       uae_u8 secbuf[544];
        uae_u16 *mend = mbuf + length, *mstart;
        uae_u32 sechead[4];
        int shift = 0;
@@ -2417,7 +2417,7 @@ static int drive_write_pcdos (drive *drv, struct zfile *zf, bool count)
 
 static int drive_write_adf_amigados (drive *drv)
 {
-       int drvsec, i;
+       int drvsec;
        int sectable[MAX_SECTORS];
 
        if (decode_buffer (drv->bigmfmbuf, drv->cyl, drv->num_secs, drv->ddhd, drv->filetype, &drvsec, sectable, 0))

diff --git a/include/disk.h b/include/disk.h
index 06a7a095595860d33ca1ec070ba327f235f691a9..f0314a947b763e4d48b0d9d33ce39c7c461c4421 100644 (file)
--- a/include/disk.h
+++ b/include/disk.h
@@ -30,11 +30,14 @@ struct diskinfo
 {
        uae_u8 bootblock[1024];
        bool bb_crc_valid;
-       uae_u32 crc32;
+       uae_u32 imagecrc32;
+       uae_u32 bootblockcrc32;
        bool hd;
        bool unreadable;
        int bootblocktype;
        TCHAR diskname[110];
+       TCHAR bootblockinfo[256];
+       TCHAR bootblockclass[256];
 };
 
 #define FLOPPY_RATE_500K 0
@@ -83,7 +86,7 @@ extern bool disk_creatediskfile (struct uae_prefs *p, const TCHAR *name, int typ
 extern void dumpdisk (const TCHAR*);
 extern int DISK_history_add (const TCHAR *name, int idx, int type, int donotcheck);
 extern TCHAR *DISK_history_get (int idx, int type);
-int DISK_examine_image (struct uae_prefs *p, int num, struct diskinfo *di);
+int DISK_examine_image (struct uae_prefs *p, int num, struct diskinfo *di, bool deepcheck);
 extern TCHAR *DISK_get_saveimagepath(const TCHAR *name, int type);
 extern void DISK_reinsert (int num);
 extern int disk_prevnext (int drive, int dir);

diff --git a/od-win32/parser.cpp b/od-win32/parser.cpp
index 0280ef98a914d5d49a9db8049aafe3df880887fd..09a852415cc191511d63acb5ce9415961fd8979e 100644 (file)
--- a/od-win32/parser.cpp
+++ b/od-win32/parser.cpp
@@ -1289,7 +1289,6 @@ void serialuartbreak (int v)
 
 void getserstat (int *pstatus)
 {
-       DWORD err;
        DWORD stat;
        int status = 0;