mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 14:19:46 -06:00
Fixes spacing for "for", "while", "switch" and "if"
Also moved && and || to ends of lines instead of start. Fixed misc vertical alignments and some { needed newlining.
This commit is contained in:
@ -26,7 +26,7 @@ static inline u64 align(u64 value, u64 bounds)
|
||||
WbfsFileReader::WbfsFileReader(const char* filename)
|
||||
: m_total_files(0), m_size(0), m_wlba_table(nullptr), m_good(true)
|
||||
{
|
||||
if(!filename || (strlen(filename) < 4) || !OpenFiles(filename) || !ReadHeader())
|
||||
if (!filename || (strlen(filename) < 4) || !OpenFiles(filename) || !ReadHeader())
|
||||
{
|
||||
m_good = false;
|
||||
return;
|
||||
@ -40,7 +40,7 @@ WbfsFileReader::WbfsFileReader(const char* filename)
|
||||
|
||||
WbfsFileReader::~WbfsFileReader()
|
||||
{
|
||||
for(u32 i = 0; i != m_files.size(); ++ i)
|
||||
for (u32 i = 0; i != m_files.size(); ++ i)
|
||||
{
|
||||
delete m_files[i];
|
||||
}
|
||||
@ -52,18 +52,18 @@ bool WbfsFileReader::OpenFiles(const char* filename)
|
||||
{
|
||||
m_total_files = 0;
|
||||
|
||||
while(true)
|
||||
while (true)
|
||||
{
|
||||
file_entry* new_entry = new file_entry;
|
||||
|
||||
// Replace last character with index (e.g. wbfs = wbf1)
|
||||
std::string path = filename;
|
||||
if(0 != m_total_files)
|
||||
if (0 != m_total_files)
|
||||
{
|
||||
path[path.length() - 1] = '0' + m_total_files;
|
||||
}
|
||||
|
||||
if(!new_entry->file.Open(path, "rb"))
|
||||
if (!new_entry->file.Open(path, "rb"))
|
||||
{
|
||||
delete new_entry;
|
||||
return 0 != m_total_files;
|
||||
@ -89,7 +89,7 @@ bool WbfsFileReader::ReadHeader()
|
||||
m_files[0]->file.ReadBytes(&hd_sector_shift, 1);
|
||||
hd_sector_size = 1ull << hd_sector_shift;
|
||||
|
||||
if(m_size != hd_sector_count * hd_sector_size)
|
||||
if (m_size != hd_sector_count * hd_sector_size)
|
||||
{
|
||||
//printf("File size doesn't match expected size\n");
|
||||
return false;
|
||||
@ -100,7 +100,7 @@ bool WbfsFileReader::ReadHeader()
|
||||
wbfs_sector_size = 1ull << wbfs_sector_shift;
|
||||
wbfs_sector_count = m_size / wbfs_sector_size;
|
||||
|
||||
if(wbfs_sector_size < wii_sector_size)
|
||||
if (wbfs_sector_size < wii_sector_size)
|
||||
{
|
||||
//Setting this too low would case a very large memory allocation
|
||||
return false;
|
||||
@ -113,7 +113,7 @@ bool WbfsFileReader::ReadHeader()
|
||||
m_files[0]->file.Seek(2, SEEK_CUR);
|
||||
m_files[0]->file.ReadBytes(disc_table, 500);
|
||||
|
||||
if(0 == disc_table[0])
|
||||
if (0 == disc_table[0])
|
||||
{
|
||||
//printf("Game must be in 'slot 0'\n");
|
||||
return false;
|
||||
@ -124,7 +124,7 @@ bool WbfsFileReader::ReadHeader()
|
||||
|
||||
bool WbfsFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
|
||||
{
|
||||
while(nbytes)
|
||||
while (nbytes)
|
||||
{
|
||||
u64 read_size = 0;
|
||||
File::IOFile& data_file = SeekToCluster(offset, &read_size);
|
||||
@ -143,18 +143,18 @@ bool WbfsFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr)
|
||||
File::IOFile& WbfsFileReader::SeekToCluster(u64 offset, u64* available)
|
||||
{
|
||||
u64 base_cluster = offset >> wbfs_sector_shift;
|
||||
if(base_cluster < m_blocks_per_disc)
|
||||
if (base_cluster < m_blocks_per_disc)
|
||||
{
|
||||
u64 cluster_address = wbfs_sector_size * Common::swap16(m_wlba_table[base_cluster]);
|
||||
u64 cluster_offset = offset & (wbfs_sector_size - 1);
|
||||
u64 final_address = cluster_address + cluster_offset;
|
||||
|
||||
for(u32 i = 0; i != m_total_files; i ++)
|
||||
for (u32 i = 0; i != m_total_files; i ++)
|
||||
{
|
||||
if(final_address < (m_files[i]->base_address + m_files[i]->size))
|
||||
if (final_address < (m_files[i]->base_address + m_files[i]->size))
|
||||
{
|
||||
m_files[i]->file.Seek(final_address - m_files[i]->base_address, SEEK_SET);
|
||||
if(available)
|
||||
if (available)
|
||||
{
|
||||
u64 till_end_of_file = m_files[i]->size - (final_address - m_files[i]->base_address);
|
||||
u64 till_end_of_sector = wbfs_sector_size - cluster_offset;
|
||||
@ -175,7 +175,7 @@ WbfsFileReader* WbfsFileReader::Create(const char* filename)
|
||||
{
|
||||
WbfsFileReader* reader = new WbfsFileReader(filename);
|
||||
|
||||
if(reader->IsGood())
|
||||
if (reader->IsGood())
|
||||
{
|
||||
return reader;
|
||||
}
|
||||
|
Reference in New Issue
Block a user