Warning fix.

Author: davidgiven

lib/data/layout.cc

@@ -22,6 +22,9 @@ static unsigned getTrackStep()
 
                 case DRIVETYPE_APPLE2:
                     return 4;
+
+                default:
+                    error("bad drive_type {}", (int)drive_type);
             }
 
         case FORMATTYPE_80TRACK:
@@ -41,7 +44,13 @@ static unsigned getTrackStep()
                         "you can't read/write an 80 track image from/to an "
                         "Apple II "
                         "drive");
+
+                default:
+                    error("bad drive_type {}", (int)drive_type);
             }
+
+        default:
+            error("bad format_type {}", (int)drive_type);
     }
 
     return 1;

lib/imagereader/imdimagereader.cc

@@ -200,7 +200,7 @@ class IMDImageReader : public ImageReader
             headerPtr++;
             sectorSize = getSectorSize(header.SectorSize);
 
-            unsigned optionalsector_map[header.numSectors];
+            std::vector<unsigned> optionalsector_map(header.numSectors);
             // The Sector Cylinder Map has one entry for each sector, and
             // contains the logical Cylinder ID for the corresponding sector in
             // the Sector Numbering Map.
@@ -224,7 +224,7 @@ class IMDImageReader : public ImageReader
             // The Sector Head Map has one entry for each sector, and contains
             // the logical Head ID for the corresponding sector in the Sector
             // Numbering Map.
-            unsigned optionalhead_map[header.numSectors];
+            std::vector<unsigned> optionalhead_map(header.numSectors);
             if (header.Head & SEC_HEAD_MAP_FLAG)
             {
                 // Read optional sector head map