Merge branch 'compiler-warnings'

This shouldn't break anything so I will go ahead and merge it.  Disc scrubbing is tested and works.  There is a minor change to how the data is read by using the File::IOFile::ReadBytes method instead of directly using fread, but the data read is the same.
This commit is contained in:
Glenn Rice 2013-02-02 08:17:44 -06:00
commit b13b594905
8 changed files with 18 additions and 15 deletions

View File

@ -43,7 +43,8 @@ void MemArena::GrabLowMemSpace(size_t size)
mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH; mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
fd = open(ram_temp_file, O_RDWR | O_CREAT, mode); fd = open(ram_temp_file, O_RDWR | O_CREAT, mode);
unlink(ram_temp_file); unlink(ram_temp_file);
ftruncate(fd, size); if (ftruncate(fd, size) < 0)
ERROR_LOG(MEMMAP, "Failed to allocate low memory space");
return; return;
#endif #endif
} }

View File

@ -117,7 +117,8 @@ void* AllocateAlignedMemory(size_t size,size_t alignment)
void* ptr = _aligned_malloc(size,alignment); void* ptr = _aligned_malloc(size,alignment);
#else #else
void* ptr = NULL; void* ptr = NULL;
posix_memalign(&ptr, alignment, size); if (posix_memalign(&ptr, alignment, size) != 0)
ERROR_LOG(MEMMAP, "Failed to allocate aligned memory");
; ;
#endif #endif

View File

@ -69,7 +69,8 @@ std::string StringFromFormat(const char* format, ...)
delete[] buf; delete[] buf;
#else #else
va_start(args, format); va_start(args, format);
vasprintf(&buf, format, args); if (vasprintf(&buf, format, args) < 0)
ERROR_LOG(COMMON, "Unable to allocate memory for string");
va_end(args); va_end(args);
std::string temp = buf; std::string temp = buf;

View File

@ -382,18 +382,18 @@ void ExecuteCommand(u32 _Address)
} }
else else
{ {
IWII_IPC_HLE_Device* _pDevice = CreateFileIO(DeviceID, DeviceName); pDevice = CreateFileIO(DeviceID, DeviceName);
CmdSuccess = _pDevice->Open(_Address, Mode); CmdSuccess = pDevice->Open(_Address, Mode);
INFO_LOG(WII_IPC_FILEIO, "IOP: Open File (Device=%s, ID=%08x, Mode=%i)", INFO_LOG(WII_IPC_FILEIO, "IOP: Open File (Device=%s, ID=%08x, Mode=%i)",
_pDevice->GetDeviceName().c_str(), DeviceID, Mode); pDevice->GetDeviceName().c_str(), DeviceID, Mode);
if (Memory::Read_U32(_Address + 4) == (u32)DeviceID) if (Memory::Read_U32(_Address + 4) == (u32)DeviceID)
{ {
g_FdMap[DeviceID] = _pDevice; g_FdMap[DeviceID] = pDevice;
} }
else else
{ {
delete _pDevice; delete pDevice;
} }
} }

View File

@ -222,7 +222,7 @@ bool CompressFileToBlob(const char* infile, const char* outfile, u32 sub_type,
// u64 size = header.block_size; // u64 size = header.block_size;
std::fill(in_buf, in_buf + header.block_size, 0); std::fill(in_buf, in_buf + header.block_size, 0);
if (scrubbing) if (scrubbing)
DiscScrubber::GetNextBlock(inf.GetHandle(), in_buf); DiscScrubber::GetNextBlock(inf, in_buf);
else else
inf.ReadBytes(in_buf, header.block_size); inf.ReadBytes(in_buf, header.block_size);
z_stream z; z_stream z;

View File

@ -127,7 +127,7 @@ bool SetupScrub(const char* filename, int block_size)
return success; return success;
} }
void GetNextBlock(FILE* in, u8* buffer) void GetNextBlock(File::IOFile& in, u8* buffer)
{ {
u64 CurrentOffset = m_BlockCount * m_BlockSize; u64 CurrentOffset = m_BlockCount * m_BlockSize;
u64 i = CurrentOffset / CLUSTER_SIZE; u64 i = CurrentOffset / CLUSTER_SIZE;
@ -136,12 +136,12 @@ void GetNextBlock(FILE* in, u8* buffer)
{ {
DEBUG_LOG(DISCIO, "Freeing 0x%016llx", CurrentOffset); DEBUG_LOG(DISCIO, "Freeing 0x%016llx", CurrentOffset);
std::fill(buffer, buffer + m_BlockSize, 0xFF); std::fill(buffer, buffer + m_BlockSize, 0xFF);
fseeko(in, m_BlockSize, SEEK_CUR); in.Seek(m_BlockSize, SEEK_CUR);
} }
else else
{ {
DEBUG_LOG(DISCIO, "Used 0x%016llx", CurrentOffset); DEBUG_LOG(DISCIO, "Used 0x%016llx", CurrentOffset);
fread(buffer, m_BlockSize, 1, in); in.ReadBytes(buffer, m_BlockSize);
} }
m_BlockCount++; m_BlockCount++;

View File

@ -38,7 +38,7 @@ namespace DiscScrubber
{ {
bool SetupScrub(const char* filename, int block_size); bool SetupScrub(const char* filename, int block_size);
void GetNextBlock(FILE* in, u8* buffer); void GetNextBlock(File::IOFile& in, u8* buffer);
void Cleanup(); void Cleanup();
} // namespace DiscScrubber } // namespace DiscScrubber

View File

@ -431,7 +431,7 @@ static bool AlphaCompare(int alpha, int ref, int comp)
return true; return true;
} }
static bool AlphaTest(int alpha) static bool TevAlphaTest(int alpha)
{ {
bool comp0 = AlphaCompare(alpha, bpmem.alpha_test.ref0, bpmem.alpha_test.comp0); bool comp0 = AlphaCompare(alpha, bpmem.alpha_test.ref0, bpmem.alpha_test.comp0);
bool comp1 = AlphaCompare(alpha, bpmem.alpha_test.ref1, bpmem.alpha_test.comp1); bool comp1 = AlphaCompare(alpha, bpmem.alpha_test.ref1, bpmem.alpha_test.comp1);
@ -700,7 +700,7 @@ void Tev::Draw()
// convert to 8 bits per component // convert to 8 bits per component
u8 output[4] = {(u8)Reg[0][ALP_C], (u8)Reg[0][BLU_C], (u8)Reg[0][GRN_C], (u8)Reg[0][RED_C]}; u8 output[4] = {(u8)Reg[0][ALP_C], (u8)Reg[0][BLU_C], (u8)Reg[0][GRN_C], (u8)Reg[0][RED_C]};
if (!AlphaTest(output[ALP_C])) if (!TevAlphaTest(output[ALP_C]))
return; return;
// z texture // z texture