Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lib/formats/fs_cbmdos.cpp: Fix display of all directory entries. #12370

Merged
merged 2 commits into from
May 13, 2024
Merged

lib/formats/fs_cbmdos.cpp: Fix display of all directory entries. #12370

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f9ccc7
lib/formats/fs_cbmdos.cpp: Fix display of all directory entries.
wilbertpol May 13, 2024
630f70e
Give the magic number a name.
wilbertpol May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/lib/formats/fs_cbmdos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ namespace {

class impl : public filesystem_t {
public:
static constexpr u8 SECTOR_DIRECTORY_COUNT = 8;

struct cbmdos_dirent
{
u8 m_next_directory_track;
Expand All @@ -55,7 +57,7 @@ class impl : public filesystem_t {
block_iterator(const impl &fs, u8 first_track, u8 first_sector);
bool next();
const void *data() const;
const std::array<cbmdos_dirent, 4> &dirent_data() const;
const std::array<cbmdos_dirent, SECTOR_DIRECTORY_COUNT> &dirent_data() const;
u8 size() const;

private:
Expand Down Expand Up @@ -458,9 +460,9 @@ const void *impl::block_iterator::data() const
// impl::block_iterator::dirent_data
//-------------------------------------------------

const std::array<impl::cbmdos_dirent, 4> &impl::block_iterator::dirent_data() const
const std::array<impl::cbmdos_dirent, impl::SECTOR_DIRECTORY_COUNT> &impl::block_iterator::dirent_data() const
{
return *reinterpret_cast<const std::array<impl::cbmdos_dirent, 4> *>(m_block.rodata());
return *reinterpret_cast<const std::array<impl::cbmdos_dirent, SECTOR_DIRECTORY_COUNT> *>(m_block.rodata());
}


Expand Down