From 2fdefc4fb54c76db5c3c6873dc404f5eab8e0e37 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 27 Apr 2014 20:34:33 -0700 Subject: [PATCH] Fix some int/ptr comparisons. --- rpcs3/Crypto/unself.cpp | 4 ++-- rpcs3/Emu/SysCalls/Modules/cellFont.cpp | 6 +++--- rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp | 8 ++++---- rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp | 2 +- rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp | 2 +- rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp | 4 ++-- rpcs3/Emu/SysCalls/Modules/cellResc.cpp | 6 +++--- rpcs3/Emu/SysCalls/Modules/sys_net.cpp | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/rpcs3/Crypto/unself.cpp b/rpcs3/Crypto/unself.cpp index df8d0838ae..5fababbb02 100644 --- a/rpcs3/Crypto/unself.cpp +++ b/rpcs3/Crypto/unself.cpp @@ -421,7 +421,7 @@ bool SELFDecrypter::MakeElf(const std::string& elf, bool isElf32) } // Write section headers. - if(self_hdr.se_shdroff != NULL) + if(self_hdr.se_shdroff != 0) { e.Seek(elf32_hdr.e_shoff); @@ -482,7 +482,7 @@ bool SELFDecrypter::MakeElf(const std::string& elf, bool isElf32) } // Write section headers. - if(self_hdr.se_shdroff != NULL) + if(self_hdr.se_shdroff != 0) { e.Seek(elf64_hdr.e_shoff); diff --git a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp index 036fc17005..085c04326f 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellFont.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellFont.cpp @@ -219,7 +219,7 @@ struct CCellFontInternal //Module cellFont bool m_bFontGcmInitialized; CCellFontInternal() - : m_buffer_addr(NULL) + : m_buffer_addr(0) , m_buffer_size(0) , m_bInitialized(false) , m_bFontGcmInitialized(false) @@ -301,7 +301,7 @@ int cellFontOpenFontMemory(mem_ptr_t library, u32 fontAddr, u32 if (!stbtt_InitFont(&(font->stbfont), (unsigned char*)Memory.VirtualToRealAddr(fontAddr), 0)) return CELL_FONT_ERROR_FONT_OPEN_FAILED; - font->renderer_addr = NULL; + font->renderer_addr = 0; font->fontdata_addr = fontAddr; font->origin = CELL_FONT_OPEN_MEMORY; return CELL_FONT_OK; @@ -531,7 +531,7 @@ int cellFontUnbindRenderer(mem_ptr_t font) if (!font->renderer_addr) return CELL_FONT_ERROR_RENDERER_UNBIND; - font->renderer_addr = NULL; + font->renderer_addr = 0; return CELL_FONT_OK; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp index 7872146ed9..140a1523f1 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp @@ -9,7 +9,7 @@ void cellGcmSys_unload(); Module cellGcmSys(0x0010, cellGcmSys_init, cellGcmSys_load, cellGcmSys_unload); u32 local_size = 0; -u32 local_addr = NULL; +u32 local_addr = 0; enum { @@ -956,10 +956,10 @@ void cellGcmSys_init() void cellGcmSys_load() { - current_config.ioAddress = NULL; - current_config.localAddress = NULL; + current_config.ioAddress = 0; + current_config.localAddress = 0; local_size = 0; - local_addr = NULL; + local_addr = 0; } void cellGcmSys_unload() diff --git a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp index 439602605f..f3ed4eab19 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGifDec.cpp @@ -57,7 +57,7 @@ int cellGifDecOpen(u32 mainHandle, mem32_t subHandle, const mem_ptr_t> fd; - int ret = cellFsOpen(src->fileName, 0, fd, NULL, 0); + int ret = cellFsOpen(src->fileName, 0, fd, 0, 0); current_subHandle->fd = fd->ToLE(); if(ret != CELL_OK) return CELL_GIFDEC_ERROR_OPEN_FILE; diff --git a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp index 7049153dd6..c22cc072f5 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellJpgDec.cpp @@ -37,7 +37,7 @@ int cellJpgDecOpen(u32 mainHandle, mem32_t subHandle, mem_ptr_t s // Get file descriptor MemoryAllocator> fd; - int ret = cellFsOpen(src->fileName, 0, fd, NULL, 0); + int ret = cellFsOpen(src->fileName, 0, fd, 0, 0); current_subHandle->fd = fd->ToLE(); if(ret != CELL_OK) return CELL_JPGDEC_ERROR_OPEN_FILE; diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp index b0ace5ef72..06aa19d629 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp @@ -29,7 +29,7 @@ int cellPngDecOpen(u32 mainHandle, mem32_t subHandle, mem_ptr_t s CellPngDecSubHandle *current_subHandle = new CellPngDecSubHandle; - current_subHandle->fd = NULL; + current_subHandle->fd = 0; current_subHandle->src = *src; switch(src->srcSelect.ToBE()) @@ -41,7 +41,7 @@ int cellPngDecOpen(u32 mainHandle, mem32_t subHandle, mem_ptr_t s case const_se_t::value: // Get file descriptor MemoryAllocator> fd; - int ret = cellFsOpen(src->fileName_addr, 0, fd.GetAddr(), NULL, 0); + int ret = cellFsOpen(src->fileName_addr, 0, fd.GetAddr(), 0, 0); current_subHandle->fd = fd->ToLE(); if(ret != CELL_OK) return CELL_PNGDEC_ERROR_OPEN_FILE; diff --git a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp index 95585c1d17..7e44764af9 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellResc.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellResc.cpp @@ -517,7 +517,7 @@ int cellRescSetDisplayMode(u32 displayMode) videocfg->aspect = CELL_VIDEO_OUT_ASPECT_AUTO; videocfg->pitch = s_rescInternalInstance->m_dstPitch; - cellVideoOutConfigure(CELL_VIDEO_OUT_PRIMARY, videocfg.GetAddr(), NULL, 0); + cellVideoOutConfigure(CELL_VIDEO_OUT_PRIMARY, videocfg.GetAddr(), 0, 0); if (IsPalInterpolate()) { @@ -527,7 +527,7 @@ int cellRescSetDisplayMode(u32 displayMode) cellGcmSetSecondVFrequency(CELL_GCM_DISPLAY_FREQUENCY_59_94HZ); //cellGcmSetVBlankHandler(CCellRescInternal::IntrHandler50); //cellGcmSetSecondVHandler(CCellRescInternal::IntrHandler60); - cellGcmSetFlipHandler(NULL); + cellGcmSetFlipHandler(0); } else if (IsPalDrop()) { @@ -535,7 +535,7 @@ int cellRescSetDisplayMode(u32 displayMode) cellGcmSetSecondVFrequency(CELL_GCM_DISPLAY_FREQUENCY_59_94HZ); //cellGcmSetVBlankHandler(NULL); //cellGcmSetSecondVHandler(CCellRescInternal::IntrHandler60Drop); - cellGcmSetFlipHandler(NULL); + cellGcmSetFlipHandler(0); } else if (IsPal60Hsync()) { diff --git a/rpcs3/Emu/SysCalls/Modules/sys_net.cpp b/rpcs3/Emu/SysCalls/Modules/sys_net.cpp index 5ae038f0ae..237963cac2 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_net.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_net.cpp @@ -19,7 +19,7 @@ extern "C" void sys_net_init(); Module sys_net((u16)0x0000, sys_net_init); -mem32_t g_lastError(NULL); +mem32_t g_lastError(0); // Auxiliary Functions @@ -476,7 +476,7 @@ int sys_net_finalize_network() { sys_net.Warning("sys_net_initialize_network_ex()"); Memory.Free(g_lastError.GetAddr()); - g_lastError.SetAddr(NULL); + g_lastError.SetAddr(0); #ifdef _WIN32 WSACleanup(); #endif