[comctl32] Remove deadcode (Coverity)
Paul Vriens
paul.vriens.wine at gmail.com
Tue Nov 21 04:33:48 CST 2006
Hi,
lpToolInfo is already checked for NULL.
Should please Coverity CID-20.
Changelog
Remove deadcode
Cheers,
Paul.
---
dlls/comctl32/tooltips.c | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index a05d8a5..7e2c264 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -1388,27 +1388,23 @@ TOOLTIPS_GetCurrentToolA (HWND hwnd, WPA
if (lpToolInfo->cbSize < TTTOOLINFOA_V1_SIZE)
return FALSE;
- if (lpToolInfo) {
- if (infoPtr->nCurrentTool > -1) {
- toolPtr = &infoPtr->tools[infoPtr->nCurrentTool];
+ if (infoPtr->nCurrentTool > -1) {
+ toolPtr = &infoPtr->tools[infoPtr->nCurrentTool];
- /* copy tool data */
- lpToolInfo->uFlags = toolPtr->uFlags;
- lpToolInfo->rect = toolPtr->rect;
- lpToolInfo->hinst = toolPtr->hinst;
-/* lpToolInfo->lpszText = toolPtr->lpszText; */
- lpToolInfo->lpszText = NULL; /* FIXME */
+ /* copy tool data */
+ lpToolInfo->uFlags = toolPtr->uFlags;
+ lpToolInfo->rect = toolPtr->rect;
+ lpToolInfo->hinst = toolPtr->hinst;
+ /* lpToolInfo->lpszText = toolPtr->lpszText; */
+ lpToolInfo->lpszText = NULL; /* FIXME */
- if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA))
- lpToolInfo->lParam = toolPtr->lParam;
+ if (lpToolInfo->cbSize >= sizeof(TTTOOLINFOA))
+ lpToolInfo->lParam = toolPtr->lParam;
- return TRUE;
- }
- else
- return FALSE;
+ return TRUE;
}
else
- return (infoPtr->nCurrentTool != -1);
+ return FALSE;
}
--
1.4.4
More information about the wine-patches
mailing list