6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-20 14:29:11 +00:00
Code Issues Projects Releases Wiki Activity

Avoid macro.

Browse Source
This commit is contained in:
Thomas Harte 2024-01-22 21:37:04 -05:00
parent 030f49db83
commit 584aa78695
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Storage/Disk/DiskImage/Formats/WOZ.cpp
View File

@ -15,6 +15,12 @@
using namespace Storage::Disk; using namespace Storage::Disk;
namespace {
constexpr uint32_t chunk(const char *str) {
return uint32_t(str[0] | (str[1] << 8) | (str[2] << 16) | (str[3] << 24));
}
}
WOZ::WOZ(const std::string &file_name) : WOZ::WOZ(const std::string &file_name) :
file_(file_name) { file_(file_name) {
@ -58,9 +64,8 @@ WOZ::WOZ(const std::string &file_name) :
long end_of_chunk = file_.tell() + long(chunk_size); long end_of_chunk = file_.tell() + long(chunk_size);
#define CK(str) (str[0] | (str[1] << 8) | (str[2] << 16) | (str[3] << 24))
switch(chunk_id) { switch(chunk_id) {
case CK("INFO"): { case chunk("INFO"): {
const uint8_t version = file_.get8(); const uint8_t version = file_.get8();
if(version > 2) break; if(version > 2) break;
is_3_5_disk_ = file_.get8() == 2; is_3_5_disk_ = file_.get8() == 2;
@ -81,12 +86,12 @@ WOZ::WOZ(const std::string &file_name) :
*/ */
} break; } break;
case CK("TMAP"): { case chunk("TMAP"): {
file_.read(track_map_, 160); file_.read(track_map_, 160);
has_tmap = true; has_tmap = true;
} break; } break;
case CK("TRKS"): { case chunk("TRKS"): {
tracks_offset_ = file_.tell(); tracks_offset_ = file_.tell();
} break; } break;
@ -95,7 +100,6 @@ WOZ::WOZ(const std::string &file_name) :
default: default:
break; break;
} }
#undef CK
file_.seek(end_of_chunk, SEEK_SET); file_.seek(end_of_chunk, SEEK_SET);
} }