From ba9a09dd0cc5ed8148ea2833c665c221f2debea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francesco=20Borz=C3=AC?= <borzifrancesco@gmail.com>
Date: Tue, 23 Mar 2021 16:30:25 +0100
Subject: [PATCH] fix(Core/GUARD_RETURN): correct typo (#3743)

---
 src/common/Threading/PolicyLock.h       | 2 +-
 src/tools/mesh_extractor/Cache.h        | 4 ++--
 src/tools/mesh_extractor/MPQManager.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/common/Threading/PolicyLock.h b/src/common/Threading/PolicyLock.h
index 16b3e8c6f..2b7fd20b2 100644
--- a/src/common/Threading/PolicyLock.h
+++ b/src/common/Threading/PolicyLock.h
@@ -9,7 +9,7 @@
 
 #include <mutex>
 
-#define RETURN_GUARD(mutex, retval) if (!mutex.try_lock())    \
+#define GUARD_RETURN(mutex, retval) if (!mutex.try_lock())    \
                                         return retval;        \
                                     std::lock_guard<decltype(mutex)> guard(mutex, std::adopt_lock)
 
diff --git a/src/tools/mesh_extractor/Cache.h b/src/tools/mesh_extractor/Cache.h
index ccd1222a8..c4910603e 100644
--- a/src/tools/mesh_extractor/Cache.h
+++ b/src/tools/mesh_extractor/Cache.h
@@ -24,7 +24,7 @@ public:
 
     void Insert(K key, T* val)
     {
-        std::lock_guard<std::mutex> guard(_mutex);
+        std::lock_guard<std::mutex> guard(mutex);
 
         if (_items.size() > FlushLimit)
             Clear();
@@ -33,7 +33,7 @@ public:
 
     T* Get(K key)
     {
-        RETURN_GUAD(mutex, false);
+        GUARD_RETURN(mutex, nullptr);
         typename std::map<K, T*>::iterator itr = _items.find(key);
         if (itr != _items.end())
             return itr->second;
diff --git a/src/tools/mesh_extractor/MPQManager.cpp b/src/tools/mesh_extractor/MPQManager.cpp
index c2a0eb564..7d7ffffe8 100644
--- a/src/tools/mesh_extractor/MPQManager.cpp
+++ b/src/tools/mesh_extractor/MPQManager.cpp
@@ -72,7 +72,7 @@ void MPQManager::InitializeDBC()
 
 FILE* MPQManager::GetFile(const std::string& path )
 {
-    RETURN_GUAD(mutex, false);
+    GUARD_RETURN(mutex, nullptr);
     MPQFile file(path.c_str());
     if (file.isEof())
         return nullptr;
@@ -87,7 +87,7 @@ DBC* MPQManager::GetDBC(const std::string& name )
 
 FILE* MPQManager::GetFileFrom(const std::string& path, MPQArchive* file )
 {
-    RETURN_GUAD(mutex, false);
+    GUARD_RETURN(mutex, nullptr);
     mpq_archive* mpq_a = file->mpq_a;
 
     uint32_t filenum;