From 3f4675ebfd6ea83c250bef732a7d022dd858d5b3 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 1 Nov 2015 23:32:22 -0500
Subject: [PATCH] Change some zero literals to nullptr

---
 src/mem/mem.cpp                             | 5 ++---
 src/modules/coreinit/coreinit_expheap.cpp   | 2 +-
 src/modules/coreinit/coreinit_ghs.cpp       | 2 +-
 src/modules/coreinit/coreinit_memheap.cpp   | 4 ++--
 src/modules/coreinit/coreinit_taskqueue.cpp | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/mem/mem.cpp b/src/mem/mem.cpp
index 459f70e7..76d8735a 100644
--- a/src/mem/mem.cpp
+++ b/src/mem/mem.cpp
@@ -53,7 +53,7 @@ static uint8_t *
 gBase = nullptr;
 
 static void *
-sFile = NULL;
+sFile = nullptr;
 
 static std::vector<MemoryView>
 sViews;
@@ -188,8 +188,7 @@ valid(ppcaddr_t address)
 bool
 protect(ppcaddr_t address, size_t size)
 {
-   auto result = VirtualAlloc(gBase + address, size, MEM_RESERVE, PAGE_NOACCESS);
-   return result != NULL;
+   return VirtualAlloc(gBase + address, size, MEM_RESERVE, PAGE_NOACCESS) != nullptr;
 }
 
 
diff --git a/src/modules/coreinit/coreinit_expheap.cpp b/src/modules/coreinit/coreinit_expheap.cpp
index 7a201179..95e81786 100644
--- a/src/modules/coreinit/coreinit_expheap.cpp
+++ b/src/modules/coreinit/coreinit_expheap.cpp
@@ -270,7 +270,7 @@ MEMAllocFromExpHeapEx(ExpandedHeap *heap, uint32_t size, int alignment)
    if (!freeBlock) {
       gLog->error("MEMAllocFromExpHeapEx failed, no free block found for size {:08x} ({:08x}+{:x}+{:x})", size, originalSize, sizeof(ExpandedHeapBlock), alignment);
       MEMiDumpExpHeap(heap);
-      return 0;
+      return nullptr;
    }
 
    if (direction == HeapDirection::FromBottom) {
diff --git a/src/modules/coreinit/coreinit_ghs.cpp b/src/modules/coreinit/coreinit_ghs.cpp
index 091659be..f92fed54 100644
--- a/src/modules/coreinit/coreinit_ghs.cpp
+++ b/src/modules/coreinit/coreinit_ghs.cpp
@@ -80,7 +80,7 @@ ghsExit(int code)
    tracePrint(GetCurrentFiberState(), 0, 0);
 
    // Must never return...
-   *static_cast<uint32_t*>(0) = 0;
+   *static_cast<uint32_t*>(nullptr) = 0;
 }
 
 void ghs_mtx_init(void *mtx)
diff --git a/src/modules/coreinit/coreinit_memheap.cpp b/src/modules/coreinit/coreinit_memheap.cpp
index 4103fc20..5ad36a6e 100644
--- a/src/modules/coreinit/coreinit_memheap.cpp
+++ b/src/modules/coreinit/coreinit_memheap.cpp
@@ -158,7 +158,7 @@ MEMGetBaseHeapHandle(BaseHeapType type)
    if (type >= BaseHeapType::Min && type < BaseHeapType::Max) {
       return gMemArenas[static_cast<size_t>(type)];
    } else {
-      return 0;
+      return nullptr;
    }
 }
 
@@ -170,7 +170,7 @@ MEMSetBaseHeapHandle(BaseHeapType type, CommonHeap *heap)
       gMemArenas[static_cast<size_t>(type)] = heap;
       return previous;
    } else {
-      return 0;
+      return nullptr;
    }
 }
 
diff --git a/src/modules/coreinit/coreinit_taskqueue.cpp b/src/modules/coreinit/coreinit_taskqueue.cpp
index 9b85734e..dddd7acb 100755
--- a/src/modules/coreinit/coreinit_taskqueue.cpp
+++ b/src/modules/coreinit/coreinit_taskqueue.cpp
@@ -242,7 +242,7 @@ MPInitTask(MPTask *task, MPTaskFunc func, uint32_t userArg1, uint32_t userArg2)
    task->result = 0;
    task->coreID = CoreCount;
    task->duration = 0;
-   task->userData = 0;
+   task->userData = nullptr;
 }