Marcus Meissner : dmloader: pObject NULL checks are not necessary (Coverity ).
Alexandre Julliard
julliard at winehq.org
Fri Dec 11 11:04:46 CST 2009
Module: wine
Branch: master
Commit: 6891b963645b01909bdcec9830cf5f43004fffe0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6891b963645b01909bdcec9830cf5f43004fffe0
Author: Marcus Meissner <marcus at jet.franken.de>
Date: Fri Dec 11 00:10:02 2009 +0100
dmloader: pObject NULL checks are not necessary (Coverity).
---
dlls/dmloader/loader.c | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c
index 17a8eb2..393b6b9 100644
--- a/dlls/dmloader/loader.c
+++ b/dlls/dmloader/loader.c
@@ -333,18 +333,14 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject (LPDIR
if (!pObjectEntry) {
pObjectEntry = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(WINE_LOADER_ENTRY));
DM_STRUCT_INIT(&pObjectEntry->Desc);
- if (pObject) {
- DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc);
- pObjectEntry->pObject = pObject;
- pObjectEntry->bInvalidDefaultDLS = FALSE;
- }
+ DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc);
+ pObjectEntry->pObject = pObject;
+ pObjectEntry->bInvalidDefaultDLS = FALSE;
list_add_head (This->pObjects, &pObjectEntry->entry);
} else {
- if (pObject) {
- DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc);
- pObjectEntry->pObject = pObject;
- pObjectEntry->bInvalidDefaultDLS = FALSE;
- }
+ DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc);
+ pObjectEntry->pObject = pObject;
+ pObjectEntry->bInvalidDefaultDLS = FALSE;
}
TRACE(": filled in cache entry\n");
} else TRACE(": caching disabled\n");
More information about the wine-cvs
mailing list