diff options
author | 2016-07-06 10:38:54 -0400 | |
---|---|---|
committer | 2016-07-07 06:59:35 -0400 | |
commit | e3cb2c7d78a63f3ce3c4a244e0ba06356f422b95 (patch) | |
tree | b89be5cf6b90eff8fb0729d880dfccce641fe719 /src/lib/formats/basicdsk.cpp | |
parent | 6e64e3314ab53e17e74c1e664e23554d495eb85a (diff) |
C++-ification of src/lib/util/opresolv.[cpp|h] (moved to util:: namespace, changed option_resolution to be a class, etc)
Diffstat (limited to 'src/lib/formats/basicdsk.cpp')
-rw-r--r-- | src/lib/formats/basicdsk.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/src/lib/formats/basicdsk.cpp b/src/lib/formats/basicdsk.cpp index 9c08c97cc2b..35207c0c86b 100644 --- a/src/lib/formats/basicdsk.cpp +++ b/src/lib/formats/basicdsk.cpp @@ -22,7 +22,7 @@ static floperr_t basicdsk_get_sector_length(floppy_image_legacy *floppy, int hea static floperr_t basicdsk_get_indexed_sector_info(floppy_image_legacy *floppy, int head, int track, int sector_index, int *cylinder, int *side, int *sector, UINT32 *sector_length, unsigned long *flags); static int basicdsk_get_heads_per_disk(floppy_image_legacy *floppy); static int basicdsk_get_tracks_per_disk(floppy_image_legacy *floppy); -static floperr_t basicdsk_format_track(floppy_image_legacy *floppy, int head, int track, option_resolution *params); +static floperr_t basicdsk_format_track(floppy_image_legacy *floppy, int head, int track, util::option_resolution *params); @@ -180,7 +180,7 @@ static floperr_t basicdsk_write_indexed_sector(floppy_image_legacy *floppy, int -static floperr_t basicdsk_format_track(floppy_image_legacy *floppy, int head, int track, option_resolution *params) +static floperr_t basicdsk_format_track(floppy_image_legacy *floppy, int head, int track, util::option_resolution *params) { floperr_t err = FLOPPY_ERROR_SUCCESS; UINT8 local_buffer[512]; @@ -288,24 +288,23 @@ 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) { - optreserr_t err; int sector_length; memset(geometry, 0, sizeof(*geometry)); - err = option_resolution_getdefault(format->param_guidelines, PARAM_HEADS, &geometry->heads); - assert(!err); - err = option_resolution_getdefault(format->param_guidelines, PARAM_TRACKS, &geometry->tracks); - assert(!err); - err = option_resolution_getdefault(format->param_guidelines, PARAM_SECTORS, &geometry->sectors); - assert(!err); - err = option_resolution_getdefault(format->param_guidelines, PARAM_FIRST_SECTOR_ID, &geometry->first_sector_id); - assert(!err); - err = option_resolution_getdefault(format->param_guidelines, PARAM_INTERLEAVE, &geometry->interleave); - if (err!=0) { + auto err = util::option_resolution::get_default(format->param_guidelines, PARAM_HEADS, &geometry->heads); + assert(err == util::option_resolution::error::SUCCESS); + err = util::option_resolution::get_default(format->param_guidelines, PARAM_TRACKS, &geometry->tracks); + assert(err == util::option_resolution::error::SUCCESS); + err = util::option_resolution::get_default(format->param_guidelines, PARAM_SECTORS, &geometry->sectors); + assert(err == util::option_resolution::error::SUCCESS); + err = util::option_resolution::get_default(format->param_guidelines, PARAM_FIRST_SECTOR_ID, &geometry->first_sector_id); + assert(err == util::option_resolution::error::SUCCESS); + err = util::option_resolution::get_default(format->param_guidelines, PARAM_INTERLEAVE, &geometry->interleave); + if (err != util::option_resolution::error::SUCCESS) { geometry->interleave = 1; } - err = option_resolution_getdefault(format->param_guidelines, PARAM_SECTOR_LENGTH, §or_length); - assert(!err); + err = util::option_resolution::get_default(format->param_guidelines, PARAM_SECTOR_LENGTH, §or_length); + assert(err == util::option_resolution::error::SUCCESS); geometry->sector_length = sector_length; if (geometry->interleave > 1) |