marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Avoid TRUE:FALSE conditional expressions.

oldstable
Michael Stefaniuc 2012-08-06 11:19:22 +02:00 committed by Alexandre Julliard
parent fdfb86589e
commit 2793be9c6d
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/crypt32/base64.c
View File

@ -827,7 +827,7 @@ BOOL WINAPI CryptStringToBinaryA(LPCSTR pszString,
ret = decoder(pszString, cchString, pbBinary, pcbBinary, pdwSkip, pdwFlags); ret = decoder(pszString, cchString, pbBinary, pcbBinary, pdwSkip, pdwFlags);
if (ret) if (ret)
SetLastError(ret); SetLastError(ret);
return (ret == ERROR_SUCCESS) ? TRUE : FALSE; return ret == ERROR_SUCCESS;
} }
static LONG decodeBase64BlockW(const WCHAR *in_buf, int in_len, static LONG decodeBase64BlockW(const WCHAR *in_buf, int in_len,
@ -1159,5 +1159,5 @@ BOOL WINAPI CryptStringToBinaryW(LPCWSTR pszString,
ret = decoder(pszString, cchString, pbBinary, pcbBinary, pdwSkip, pdwFlags); ret = decoder(pszString, cchString, pbBinary, pcbBinary, pdwSkip, pdwFlags);
if (ret) if (ret)
SetLastError(ret); SetLastError(ret);
return (ret == ERROR_SUCCESS) ? TRUE : FALSE; return ret == ERROR_SUCCESS;
} }

2
dlls/crypt32/decode.c
View File

@ -2977,7 +2977,7 @@ static BOOL CRYPT_AsnDecodeBool(const BYTE *pbEncoded, DWORD cbEncoded,
else else
{ {
*pcbStructInfo = sizeof(BOOL); *pcbStructInfo = sizeof(BOOL);
*(BOOL *)pvStructInfo = pbEncoded[2] ? TRUE : FALSE; *(BOOL *)pvStructInfo = pbEncoded[2] != 0;
ret = TRUE; ret = TRUE;
} }
TRACE("returning %d (%08x)\n", ret, GetLastError()); TRACE("returning %d (%08x)\n", ret, GetLastError());

9
dlls/crypt32/message.c
View File

@ -140,7 +140,7 @@ BOOL WINAPI CryptVerifyDetachedMessageSignature(
for (i = 0; ret && i < cToBeSigned; i++) for (i = 0; ret && i < cToBeSigned; i++)
ret = CryptMsgUpdate(msg, rgpbToBeSigned[i], rgcbToBeSigned[i], ret = CryptMsgUpdate(msg, rgpbToBeSigned[i], rgcbToBeSigned[i],
i == cToBeSigned - 1 ? TRUE : FALSE); i == cToBeSigned - 1);
} }
if (ret) if (ret)
{ {
@ -304,8 +304,7 @@ BOOL WINAPI CryptHashMessage(PCRYPT_HASH_MESSAGE_PARA pHashPara,
if (msg) if (msg)
{ {
for (i = 0, ret = TRUE; ret && i < cToBeHashed; i++) for (i = 0, ret = TRUE; ret && i < cToBeHashed; i++)
ret = CryptMsgUpdate(msg, rgpbToBeHashed[i], rgcbToBeHashed[i], ret = CryptMsgUpdate(msg, rgpbToBeHashed[i], rgcbToBeHashed[i], i == cToBeHashed - 1);
i == cToBeHashed - 1 ? TRUE : FALSE);
if (ret) if (ret)
{ {
ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, pbHashedBlob, ret = CryptMsgGetParam(msg, CMSG_CONTENT_PARAM, 0, pbHashedBlob,
@ -356,7 +355,7 @@ BOOL WINAPI CryptVerifyDetachedMessageHash(PCRYPT_HASH_MESSAGE_PARA pHashPara,
for (i = 0; ret && i < cToBeHashed; i++) for (i = 0; ret && i < cToBeHashed; i++)
{ {
ret = CryptMsgUpdate(msg, rgpbToBeHashed[i], ret = CryptMsgUpdate(msg, rgpbToBeHashed[i],
rgcbToBeHashed[i], i == cToBeHashed - 1 ? TRUE : FALSE); rgcbToBeHashed[i], i == cToBeHashed - 1);
} }
} }
else else
@ -511,7 +510,7 @@ BOOL WINAPI CryptSignMessage(PCRYPT_SIGN_MESSAGE_PARA pSignPara,
for (i = 0; ret && i < cToBeSigned; ++i) for (i = 0; ret && i < cToBeSigned; ++i)
{ {
ret = CryptMsgUpdate(msg, rgpbToBeSigned[i], rgcbToBeSigned[i], ret = CryptMsgUpdate(msg, rgpbToBeSigned[i], rgcbToBeSigned[i],
i == cToBeSigned - 1 ? TRUE : FALSE); i == cToBeSigned - 1);
} }
} }
else else

6
dlls/crypt32/oid.c
View File

@ -684,7 +684,7 @@ BOOL WINAPI CryptUnregisterOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName,
CryptMemFree(szKey); CryptMemFree(szKey);
if (rc) if (rc)
SetLastError(rc); SetLastError(rc);
return rc ? FALSE : TRUE; return !rc;
} }
BOOL WINAPI CryptGetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName, BOOL WINAPI CryptGetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName,
@ -721,7 +721,7 @@ BOOL WINAPI CryptGetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName,
SetLastError(rc); SetLastError(rc);
RegCloseKey(hKey); RegCloseKey(hKey);
} }
return rc ? FALSE : TRUE; return !rc;
} }
BOOL WINAPI CryptSetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName, BOOL WINAPI CryptSetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName,
@ -758,7 +758,7 @@ BOOL WINAPI CryptSetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName,
SetLastError(rc); SetLastError(rc);
RegCloseKey(hKey); RegCloseKey(hKey);
} }
return rc ? FALSE : TRUE; return !rc;
} }
static LPCWSTR CRYPT_FindStringInMultiString(LPCWSTR multi, LPCWSTR toFind) static LPCWSTR CRYPT_FindStringInMultiString(LPCWSTR multi, LPCWSTR toFind)

6
dlls/crypt32/store.c
View File

@ -163,7 +163,7 @@ static BOOL CRYPT_MemAddCert(PWINECRYPT_CERTSTORE store, void *cert,
if (ppStoreContext) if (ppStoreContext)
*ppStoreContext = CertDuplicateCertificateContext(context); *ppStoreContext = CertDuplicateCertificateContext(context);
} }
return context ? TRUE : FALSE; return context != 0;
} }
static void *CRYPT_MemEnumCert(PWINECRYPT_CERTSTORE store, void *pPrev) static void *CRYPT_MemEnumCert(PWINECRYPT_CERTSTORE store, void *pPrev)
@ -208,7 +208,7 @@ static BOOL CRYPT_MemAddCrl(PWINECRYPT_CERTSTORE store, void *crl,
if (ppStoreContext) if (ppStoreContext)
*ppStoreContext = CertDuplicateCRLContext(context); *ppStoreContext = CertDuplicateCRLContext(context);
} }
return context ? TRUE : FALSE; return context != 0;
} }
static void *CRYPT_MemEnumCrl(PWINECRYPT_CERTSTORE store, void *pPrev) static void *CRYPT_MemEnumCrl(PWINECRYPT_CERTSTORE store, void *pPrev)
@ -253,7 +253,7 @@ static BOOL CRYPT_MemAddCtl(PWINECRYPT_CERTSTORE store, void *ctl,
if (ppStoreContext) if (ppStoreContext)
*ppStoreContext = CertDuplicateCTLContext(context); *ppStoreContext = CertDuplicateCTLContext(context);
} }
return context ? TRUE : FALSE; return context != 0;
} }
static void *CRYPT_MemEnumCtl(PWINECRYPT_CERTSTORE store, void *pPrev) static void *CRYPT_MemEnumCtl(PWINECRYPT_CERTSTORE store, void *pPrev)