Marcus Meissner : shlwapi: Removed superflous NULL check (Coverity).
Alexandre Julliard
julliard at winehq.org
Wed Jun 15 13:42:57 CDT 2011
Module: wine
Branch: master
Commit: e9d4ca069c92de1c9b567fb294d6fc50ab7d9418
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d4ca069c92de1c9b567fb294d6fc50ab7d9418
Author: Marcus Meissner <marcus at jet.franken.de>
Date: Wed Jun 15 10:07:55 2011 +0200
shlwapi: Removed superflous NULL check (Coverity).
---
dlls/shlwapi/string.c | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c
index 6102f3c..d0f0f0e 100644
--- a/dlls/shlwapi/string.c
+++ b/dlls/shlwapi/string.c
@@ -2473,17 +2473,12 @@ char WINAPI SHStripMneumonicA(LPCSTR lpszStr)
if ((lpszIter = StrChrA(lpszStr, '&')))
{
lpszTmp = CharNextA(lpszIter);
- if (lpszTmp && *lpszTmp)
+ if (*lpszTmp)
{
if (*lpszTmp != '&')
ch = *lpszTmp;
- while (lpszIter && *lpszIter)
- {
- lpszTmp = CharNextA(lpszIter);
- *lpszIter = *lpszTmp;
- lpszIter = lpszTmp;
- }
+ memmove( lpszIter, lpszTmp, strlen(lpszTmp) + 1 );
}
}
@@ -2507,17 +2502,12 @@ WCHAR WINAPI SHStripMneumonicW(LPCWSTR lpszStr)
if ((lpszIter = StrChrW(lpszStr, '&')))
{
lpszTmp = lpszIter + 1;
- if (lpszTmp && *lpszTmp)
+ if (*lpszTmp)
{
if (*lpszTmp != '&')
ch = *lpszTmp;
- while (lpszIter && *lpszIter)
- {
- lpszTmp = lpszIter + 1;
- *lpszIter = *lpszTmp;
- lpszIter = lpszTmp;
- }
+ memmove( lpszIter, lpszTmp, (strlenW(lpszTmp) + 1) * sizeof(WCHAR) );
}
}
More information about the wine-cvs
mailing list