summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/formats/basicdsk.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/formats/basicdsk.cpp')
-rw-r--r--src/lib/formats/basicdsk.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/formats/basicdsk.cpp b/src/lib/formats/basicdsk.cpp
index 9de079232e0..1984f0bd7ca 100644
--- a/src/lib/formats/basicdsk.cpp
+++ b/src/lib/formats/basicdsk.cpp
@@ -8,12 +8,14 @@
*********************************************************************/
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
#include "basicdsk.h"
+#include "opresolv.h"
+
+#include <cstdlib>
+#include <cstring>
+#include <cassert>
+
static floperr_t basicdsk_read_sector(floppy_image_legacy *floppy, int head, int track, int sector, void *buffer, size_t buflen);
static floperr_t basicdsk_write_sector(floppy_image_legacy *floppy, int head, int track, int sector, const void *buffer, size_t buflen, int ddam);
static floperr_t basicdsk_read_indexed_sector(floppy_image_legacy *floppy, int head, int track, int sector, void *buffer, size_t buflen);
@@ -288,7 +290,7 @@ static floperr_t basicdsk_get_indexed_sector_info(floppy_image_legacy *floppy, i
static void basicdsk_default_geometry(const struct FloppyFormat *format, struct basicdsk_geometry *geometry)
{
- int sector_length;
+ int sector_length = 0;
memset(geometry, 0, sizeof(*geometry));
auto err = util::option_resolution::get_default(format->param_guidelines, PARAM_HEADS, &geometry->heads);