Avoid using NULL

ThreeDeeJay · Apr 20, 2023 · 4815119 · 4815119
1 parent b217979
commit 4815119
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/buffer.cpp b/src/buffer.cpp
@@ -542,7 +542,7 @@ HRESULT STDMETHODCALLTYPE Buffer::QueryInterface(REFIID riid, void** ppvObject)
     DEBUG(PREFIX "QueryInterface (%p)->(%s, %p)\n", voidp{this}, GuidPrinter{riid}.c_str(),
         voidp{ppvObject});
 
-    *ppvObject = NULL;
+    *ppvObject = nullptr;
     if(riid == IID_IUnknown)
     {
         mUnknownIface.AddRef();
@@ -880,9 +880,9 @@ HRESULT STDMETHODCALLTYPE Buffer::Lock(DWORD offset, DWORD bytes, void **audioPt
         return DSERR_INVALIDPARAM;
     }
 
-    *audioPtr1 = NULL;
+    *audioPtr1 = nullptr;
     *audioBytes1 = 0;
-    if(audioPtr2) *audioPtr2 = NULL;
+    if(audioPtr2) *audioPtr2 = nullptr;
     if(audioBytes2) *audioBytes2 = 0;
 
     if((flags&DSBLOCK_FROMWRITECURSOR))
@@ -1830,7 +1830,7 @@ HRESULT STDMETHODCALLTYPE Buffer::Prop::Get(REFGUID guidPropSet, ULONG dwPropID,
 
     if(cbPropData > 0 && !pPropData)
     {
-        WARN(PREFIX "Get pPropData is NULL with cbPropData > 0\n");
+        WARN(PREFIX "Get pPropData is null with cbPropData > 0\n");
         return E_POINTER;
     }
 
@@ -1924,7 +1924,7 @@ HRESULT STDMETHODCALLTYPE Buffer::Prop::Set(REFGUID guidPropSet, ULONG dwPropID,
 
     if(cbPropData > 0 && !pPropData)
     {
-        WARN(PREFIX "Set pPropData is NULL with cbPropData > 0\n");
+        WARN(PREFIX "Set pPropData is null with cbPropData > 0\n");
         return E_POINTER;
     }
 

diff --git a/src/capture.cpp b/src/capture.cpp
@@ -26,7 +26,7 @@ HRESULT STDMETHODCALLTYPE DSCapture::QueryInterface(REFIID riid, void **ppvObjec
     DEBUG(PREFIX "QueryInterface (%p)->(%s, %p)\n", voidp{this}, GuidPrinter{riid}.c_str(),
         voidp{ppvObject});
 
-    *ppvObject = NULL;
+    *ppvObject = nullptr;
     if(riid == IID_IUnknown)
     {
         mUnknownIface.AddRef();

diff --git a/src/dsoal.cpp b/src/dsoal.cpp
@@ -360,7 +360,7 @@ HRESULT WINAPI DSOAL_DirectSoundCreate(const GUID *deviceId, IDirectSound **ds,
         WARN("DirectSoundCreate invalid parameter: ppDS == NULL\n");
         return DSERR_INVALIDPARAM;
     }
-    *ds = NULL;
+    *ds = nullptr;
 
     if(outer)
     {
@@ -396,7 +396,7 @@ HRESULT WINAPI DSOAL_DirectSoundCreate8(const GUID *deviceId, IDirectSound8 **ds
         WARN("DirectSoundCreate8 invalid parameter: ppDS == NULL\n");
         return DSERR_INVALIDPARAM;
     }
-    *ds = NULL;
+    *ds = nullptr;
 
     if(outer)
     {
@@ -433,7 +433,7 @@ HRESULT WINAPI DSOAL_DirectSoundCaptureCreate(const GUID *deviceId, IDirectSound
         WARN("DirectSoundCaptureCreate invalid parameter: ppDS == NULL\n");
         return DSERR_INVALIDPARAM;
     }
-    *ds = NULL;
+    *ds = nullptr;
 
     if(outer)
     {
@@ -470,7 +470,7 @@ HRESULT WINAPI DSOAL_DirectSoundCaptureCreate8(const GUID *deviceId, IDirectSoun
         WARN("DirectSoundCaptureCreate8 invalid parameter: ppDS == NULL\n");
         return DSERR_INVALIDPARAM;
     }
-    *ds = NULL;
+    *ds = nullptr;
 
     if(outer)
     {

diff --git a/src/dsoundoal.cpp b/src/dsoundoal.cpp
@@ -176,7 +176,7 @@ ds::expected<std::unique_ptr<SharedDevice>,HRESULT> CreateDeviceShare(const GUID
         ERR("CreateDeviceShare Failed to convert GUID to string\n");
         return ds::unexpected(hr);
     }
-    WideCharToMultiByte(CP_UTF8, 0, guid_str, -1, drv_name, sizeof(drv_name), NULL, NULL);
+    WideCharToMultiByte(CP_UTF8, 0, guid_str, -1, drv_name, sizeof(drv_name), nullptr, nullptr);
     drv_name[sizeof(drv_name)-1] = 0;
     CoTaskMemFree(guid_str);
     guid_str = nullptr;
@@ -459,7 +459,7 @@ HRESULT STDMETHODCALLTYPE DSound8OAL::QueryInterface(REFIID riid, void** ppvObje
 {
     DEBUG(PREFIX "(%p)->(%s, %p)\n", voidp{this}, GuidPrinter{riid}.c_str(), voidp{ppvObject});
 
-    *ppvObject = NULL;
+    *ppvObject = nullptr;
     if(riid == IID_IUnknown)
     {
         mUnknownIface.AddRef();

diff --git a/src/primarybuffer.cpp b/src/primarybuffer.cpp
@@ -27,7 +27,7 @@ HRESULT STDMETHODCALLTYPE PrimaryBuffer::QueryInterface(REFIID riid, void** ppvO
     DEBUG(PREFIX "QueryInterface (%p)->(%s, %p)\n", voidp{this}, GuidPrinter{riid}.c_str(),
         voidp{ppvObject});
 
-    *ppvObject = NULL;
+    *ppvObject = nullptr;
     if(riid == IID_IUnknown)
     {
         AddRef();