Resolve [-Wzero-as-null-pointer-constant] in Source

dolphin-emu · Apr 15, 2023 · f3dd4ba · f3dd4ba
1 parent 550f1bf
commit f3dd4ba
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 1 deletion.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -34,7 +34,7 @@ else()
   #check_and_add_flag(SWITCH_DEFAULT -Wswitch-default)
   #check_and_add_flag(FLOAT_EQUAL -Wfloat-equal)
   #check_and_add_flag(CONVERSION -Wconversion)
-  #check_and_add_flag(ZERO_AS_NULL_POINTER_CONSTANT -Wzero-as-null-pointer-constant)
+  check_and_add_flag(ZERO_AS_NULL_POINTER_CONSTANT -Wzero-as-null-pointer-constant)
   check_and_add_flag(TYPE_LIMITS -Wtype-limits)
   check_and_add_flag(SIGN_COMPARE -Wsign-compare)
   check_and_add_flag(IGNORED_QUALIFIERS -Wignored-qualifiers)

diff --git a/Source/Core/Common/FatFsUtil.cpp b/Source/Core/Common/FatFsUtil.cpp
@@ -571,7 +571,15 @@ bool SyncSDFolderToSDImage(const std::function<bool()>& cancelled, bool determin
                   FatFsErrorToString(mount_error_code));
     return false;
   }
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
   Common::ScopeGuard unmount_guard{[] { f_unmount(""); }};
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
   if (!Pack(cancelled, root, true, tmp_buffer))
   {
@@ -795,7 +803,15 @@ bool SyncSDImageToSDFolder(const std::function<bool()>& cancelled)
                   FatFsErrorToString(mount_error_code));
     return false;
   }
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
   Common::ScopeGuard unmount_guard{[] { f_unmount(""); }};
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
   // Unpack() and GetTempFilenameForAtomicWrite() don't want the trailing separator.
   const std::string target_dir_without_slash = target_dir.substr(0, target_dir.length() - 1);

diff --git a/Source/Core/Core/IOS/Network/KD/VFF/VFFUtil.cpp b/Source/Core/Core/IOS/Network/KD/VFF/VFFUtil.cpp
@@ -294,7 +294,14 @@ ErrorCode OpenVFF(const std::string& path, const std::string& filename,
       return;
     }
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
     Common::ScopeGuard unmount_guard{[] { f_unmount(""); }};
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
     const auto write_error_code = WriteFile(filename, data);
     if (write_error_code != WC24_OK)

diff --git a/Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp b/Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp
@@ -16,7 +16,14 @@
 #include <vector>
 
 #include <fmt/format.h>
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
 #include <libusb.h>
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
 #include "Common/ChunkFile.h"
 #include "Common/Logging/Log.h"

diff --git a/Source/Core/Core/IOS/USB/Host.cpp b/Source/Core/Core/IOS/USB/Host.cpp
@@ -11,7 +11,14 @@
 #include <utility>
 
 #ifdef __LIBUSB__
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
 #include <libusb.h>
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 #endif
 
 #include "Common/Assert.h"

diff --git a/Source/Core/Core/IOS/USB/LibusbDevice.cpp b/Source/Core/Core/IOS/USB/LibusbDevice.cpp
@@ -13,7 +13,14 @@
 #include <utility>
 #include <vector>
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
 #include <libusb.h>
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
 #include "Common/Assert.h"
 #include "Common/Logging/Log.h"

diff --git a/Source/Core/Core/LibusbUtils.cpp b/Source/Core/Core/LibusbUtils.cpp
@@ -7,7 +7,14 @@
 #include <thread>
 
 #if defined(__LIBUSB__)
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
 #include <libusb.h>
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 #endif
 
 #include "Common/Assert.h"

diff --git a/Source/Core/Core/PowerPC/Expression.cpp b/Source/Core/Core/PowerPC/Expression.cpp
@@ -11,7 +11,14 @@
 #include <string_view>
 #include <utility>
 
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
 #include <expr.h>
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
 #include "Common/BitUtils.h"
 #include "Common/CommonTypes.h"

diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp
@@ -17,7 +17,14 @@
 #include <optional>
 
 #if GCADAPTER_USE_LIBUSB_IMPLEMENTATION
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
 #include <libusb.h>
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 #elif GCADAPTER_USE_ANDROID_IMPLEMENTATION
 #include <jni.h>
 #endif

diff --git a/Source/Core/UICommon/USBUtils.cpp b/Source/Core/UICommon/USBUtils.cpp
@@ -7,7 +7,14 @@
 
 #include <fmt/format.h>
 #ifdef __LIBUSB__
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
 #include <libusb.h>
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 #endif
 
 #include "Common/CommonTypes.h"