From 8ebb733a9857cb0e7d9b9e380ba0434d4a0b81f6 Mon Sep 17 00:00:00 2001 From: JimLee168 Date: Fri, 5 Apr 2013 17:31:42 +0800 Subject: [PATCH] spacing fix --- Core/HLE/sceDeflt.cpp | 67 +++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/Core/HLE/sceDeflt.cpp b/Core/HLE/sceDeflt.cpp index 1560870a6f..6a01e385ce 100644 --- a/Core/HLE/sceDeflt.cpp +++ b/Core/HLE/sceDeflt.cpp @@ -17,61 +17,53 @@ #include "Globals.h" #include "HLE.h" -#include "..\..\ext\zlib\zlib.h" +#include "zlib.h" -int sceZlibDecompress(u32 OutBuffer, int OutBufferLength, u32 InBuffer, u32 Crc32Addr) -{ - int err; +int sceZlibDecompress(u32 OutBuffer, int OutBufferLength, u32 InBuffer, u32 Crc32Addr) { + int err; uLong crc; - z_stream stream; + z_stream stream; u8 *outBufferPtr; u32 *crc32AddrPtr = 0; - if( !Memory::IsValidAddress( OutBuffer ) || !Memory::IsValidAddress( InBuffer ) ) - { - ERROR_LOG( HLE, "sceZlibDecompress: Bad address %08x %08x", OutBuffer, InBuffer ); + if (!Memory::IsValidAddress(OutBuffer) || !Memory::IsValidAddress(InBuffer)) { + ERROR_LOG(HLE, "sceZlibDecompress: Bad address %08x %08x", OutBuffer, InBuffer); return 0; } - if( Crc32Addr ) - { - if( !Memory::IsValidAddress( Crc32Addr ) ) - { - ERROR_LOG( HLE, "sceZlibDecompress: Bad address %08x", Crc32Addr ); + if (Crc32Addr) { + if (!Memory::IsValidAddress(Crc32Addr)) { + ERROR_LOG(HLE, "sceZlibDecompress: Bad address %08x", Crc32Addr); return 0; } - crc32AddrPtr = (u32 *)Memory::GetPointer( Crc32Addr ); + crc32AddrPtr = (u32 *)Memory::GetPointer(Crc32Addr); } - outBufferPtr = Memory::GetPointer( OutBuffer ); + outBufferPtr = Memory::GetPointer(OutBuffer); stream.next_in = (Bytef*)Memory::GetPointer(InBuffer); - stream.avail_in = (uInt)OutBufferLength; - stream.next_out = outBufferPtr; - stream.avail_out = (uInt)OutBufferLength; - stream.zalloc = (alloc_func)0; - stream.zfree = (free_func)0; - err = inflateInit(&stream); - if( err != Z_OK ) - { - ERROR_LOG( HLE, "sceZlibDecompress: inflateInit failed %08x", err ); + stream.avail_in = (uInt)OutBufferLength; + stream.next_out = outBufferPtr; + stream.avail_out = (uInt)OutBufferLength; + stream.zalloc = (alloc_func)0; + stream.zfree = (free_func)0; + err = inflateInit(&stream); + if (err != Z_OK) { + ERROR_LOG(HLE, "sceZlibDecompress: inflateInit failed %08x", err); return 0; } - err = inflate( &stream, Z_FINISH ); - if( err != Z_STREAM_END ) - { - inflateEnd( &stream ); - ERROR_LOG( HLE, "sceZlibDecompress: inflate failed %08x", err ); + err = inflate(&stream, Z_FINISH); + if (err != Z_STREAM_END) { + inflateEnd(&stream); + ERROR_LOG(HLE, "sceZlibDecompress: inflate failed %08x", err); return 0; } - inflateEnd( &stream ); - if( crc32AddrPtr ) - { - crc = crc32( 0L, Z_NULL, 0 ); - *crc32AddrPtr = crc32( crc, outBufferPtr, stream.total_out ); + inflateEnd(&stream); + if (crc32AddrPtr) { + crc = crc32(0L, Z_NULL, 0); + *crc32AddrPtr = crc32(crc, outBufferPtr, stream.total_out); } return stream.total_out; } -const HLEFunction sceDeflt[] = -{ +const HLEFunction sceDeflt[] = { {0x0BA3B9CC, 0, "sceGzipGetCompressedData"}, {0x106A3552, 0, "sceGzipGetName"}, {0x1B5B82BC, 0, "sceGzipIsValid"}, @@ -86,7 +78,6 @@ const HLEFunction sceDeflt[] = {0xE46EB986, 0, "sceZlibIsValid"}, }; -void Register_sceDeflt() -{ +void Register_sceDeflt() { RegisterModule("sceDeflt", ARRAY_SIZE(sceDeflt), sceDeflt); }