Fix "empty body in an if/else-statement" warnings.

This commit is contained in:
Mike McCormack 2005-09-21 09:46:28 +00:00 committed by Alexandre Julliard
parent 6dc309187c
commit c818a4e662
4 changed files with 20 additions and 8 deletions

View File

@ -888,7 +888,7 @@ static int TIME_GetTimeZoneInfoFromReg(RTL_TIME_ZONE_INFORMATION *tzinfo)
if (!NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, KpInfo,\
sizeof(buf), &size )) { \
if( size >= (sizeof((tofield)) + \
offsetof(KEY_VALUE_PARTIAL_INFORMATION,Data))); { \
offsetof(KEY_VALUE_PARTIAL_INFORMATION,Data))) { \
memcpy(&(tofield), \
KpInfo->Data, sizeof(tofield)); \
} \

View File

@ -3687,16 +3687,25 @@ static HRESULT WINAPI ITypeLib2_fnGetDocumentation(
if(pBstrName)
{
if (This->Name)
if(!(*pBstrName = SysAllocString(This->Name))) goto memerr1;else;
{
if(!(*pBstrName = SysAllocString(This->Name)))
goto memerr1;
}
else
*pBstrName = NULL;
}
if(pBstrDocString)
{
if (This->DocString)
if(!(*pBstrDocString = SysAllocString(This->DocString))) goto memerr2;else;
{
if(!(*pBstrDocString = SysAllocString(This->DocString)))
goto memerr2;
}
else if (This->Name)
if(!(*pBstrDocString = SysAllocString(This->Name))) goto memerr2;else;
{
if(!(*pBstrDocString = SysAllocString(This->Name)))
goto memerr2;
}
else
*pBstrDocString = NULL;
}
@ -3707,7 +3716,10 @@ static HRESULT WINAPI ITypeLib2_fnGetDocumentation(
if(pBstrHelpFile)
{
if (This->HelpFile)
if(!(*pBstrHelpFile = SysAllocString(This->HelpFile))) goto memerr3;else;
{
if(!(*pBstrHelpFile = SysAllocString(This->HelpFile)))
goto memerr3;
}
else
*pBstrHelpFile = NULL;
}

View File

@ -472,9 +472,10 @@ static void TEXT_SkipChars (int *new_count, const WCHAR **new_str,
assert (max >= n);
max -= n;
while (n--)
{
if (*start_str++ == PREFIX && max--)
start_str++;
else;
}
start_count -= (start_str - str_on_entry);
}
else
@ -532,7 +533,6 @@ static int TEXT_Reprefix (const WCHAR *str, unsigned int ns,
str++;
ns--;
}
else;
i++;
}
return result;

View File

@ -776,7 +776,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bAgain )
{
LPITEMIDLIST pidl = NULL;
IShellLinkW_GetIDList( sl, &pidl );
if( pidl && SHGetPathFromIDListW( pidl, szPath ) );
if( pidl && SHGetPathFromIDListW( pidl, szPath ) )
WINE_TRACE("pidl path : %s\n", wine_dbgstr_w(szPath));
}