diff options
Diffstat (limited to 'src/devices/imagedev/floppy.cpp')
-rw-r--r-- | src/devices/imagedev/floppy.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp index c4269c944ef..345d6bce3cd 100644 --- a/src/devices/imagedev/floppy.cpp +++ b/src/devices/imagedev/floppy.cpp @@ -295,9 +295,9 @@ void floppy_image_device::commit_image() io.procs = &image_ioprocs; io.filler = 0xff; - file_error err = image_core_file().truncate(0); - if (err != 0) - popmessage("Error, unable to truncate image: %d", err); + osd_file::error err = image_core_file().truncate(0); + if (err != osd_file::error::NONE) + popmessage("Error, unable to truncate image: %d", int(err)); output_format->save(&io, image); } @@ -365,8 +365,8 @@ floppy_image_format_t *floppy_image_device::identify(std::string filename) util::core_file::ptr fd; std::string revised_path; - file_error err = zippath_fopen(filename.c_str(), OPEN_FLAG_READ, fd, revised_path); - if(err) { + osd_file::error err = util::zippath_fopen(filename.c_str(), OPEN_FLAG_READ, fd, revised_path); + if(err != osd_file::error::NONE) { seterror(IMAGE_ERROR_INVALIDIMAGE, "Unable to open the image file"); return nullptr; } @@ -1000,12 +1000,12 @@ void ui_menu_control_floppy_image::hook_load(std::string filename, bool softlist bool can_in_place = input_format->supports_save(); if(can_in_place) { - file_error filerr; + osd_file::error filerr; std::string tmp_path; util::core_file::ptr tmp_file; /* attempt to open the file for writing but *without* create */ - filerr = zippath_fopen(filename.c_str(), OPEN_FLAG_READ | OPEN_FLAG_WRITE, tmp_file, tmp_path); - if(!filerr) + filerr = util::zippath_fopen(filename.c_str(), OPEN_FLAG_READ | OPEN_FLAG_WRITE, tmp_file, tmp_path); + if(filerr == osd_file::error::NONE) tmp_file.reset(); else can_in_place = false; @@ -1048,7 +1048,7 @@ void ui_menu_control_floppy_image::handle() state = START_FILE; handle(); } else { - zippath_combine(output_filename, current_directory.c_str(), current_file.c_str()); + util::zippath_combine(output_filename, current_directory.c_str(), current_file.c_str()); output_format = format_array[submenu_result]; do_load_create(); ui_menu::stack_pop(machine()); |