From 2793be9c6ddd2bf6331335a959fcda2408aa74d3 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Mon, 6 Aug 2012 11:19:22 +0200
Subject: [PATCH] crypt32: Avoid TRUE:FALSE conditional expressions.

---
 dlls/crypt32/base64.c  | 4 ++--
 dlls/crypt32/decode.c  | 2 +-
 dlls/crypt32/message.c | 9 ++++-----
 dlls/crypt32/oid.c     | 6 +++---
 dlls/crypt32/store.c   | 6 +++---
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c
index a01a7b6459c..9d6dcb468d2 100644
--- a/dlls/crypt32/base64.c
+++ b/dlls/crypt32/base64.c
@@ -827,7 +827,7 @@ BOOL WINAPI CryptStringToBinaryA(LPCSTR pszString,
     ret = decoder(pszString, cchString, pbBinary, pcbBinary, pdwSkip, pdwFlags);
     if (ret)
         SetLastError(ret);
-    return (ret == ERROR_SUCCESS) ? TRUE : FALSE;
+    return ret == ERROR_SUCCESS;
 }
 
 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);
     if (ret)
         SetLastError(ret);
-    return (ret == ERROR_SUCCESS) ? TRUE : FALSE;
+    return ret == ERROR_SUCCESS;
 }
diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c
index bdcb744bd2c..bfd61d02b18 100644
--- a/dlls/crypt32/decode.c
+++ b/dlls/crypt32/decode.c
@@ -2977,7 +2977,7 @@ static BOOL CRYPT_AsnDecodeBool(const BYTE *pbEncoded, DWORD cbEncoded,
     else
     {
         *pcbStructInfo = sizeof(BOOL);
-        *(BOOL *)pvStructInfo = pbEncoded[2] ? TRUE : FALSE;
+        *(BOOL *)pvStructInfo = pbEncoded[2] != 0;
         ret = TRUE;
     }
     TRACE("returning %d (%08x)\n", ret, GetLastError());
diff --git a/dlls/crypt32/message.c b/dlls/crypt32/message.c
index e5b6f2a6bfb..8668cb1daf2 100644
--- a/dlls/crypt32/message.c
+++ b/dlls/crypt32/message.c
@@ -140,7 +140,7 @@ BOOL WINAPI CryptVerifyDetachedMessageSignature(
 
             for (i = 0; ret && i < cToBeSigned; i++)
                 ret = CryptMsgUpdate(msg, rgpbToBeSigned[i], rgcbToBeSigned[i],
-                 i == cToBeSigned - 1 ? TRUE : FALSE);
+                 i == cToBeSigned - 1);
         }
         if (ret)
         {
@@ -304,8 +304,7 @@ BOOL WINAPI CryptHashMessage(PCRYPT_HASH_MESSAGE_PARA pHashPara,
     if (msg)
     {
         for (i = 0, ret = TRUE; ret && i < cToBeHashed; i++)
-            ret = CryptMsgUpdate(msg, rgpbToBeHashed[i], rgcbToBeHashed[i],
-             i == cToBeHashed - 1 ? TRUE : FALSE);
+            ret = CryptMsgUpdate(msg, rgpbToBeHashed[i], rgcbToBeHashed[i], i == cToBeHashed - 1);
         if (ret)
         {
             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++)
                 {
                     ret = CryptMsgUpdate(msg, rgpbToBeHashed[i],
-                     rgcbToBeHashed[i], i == cToBeHashed - 1 ? TRUE : FALSE);
+                     rgcbToBeHashed[i], i == cToBeHashed - 1);
                 }
             }
             else
@@ -511,7 +510,7 @@ BOOL WINAPI CryptSignMessage(PCRYPT_SIGN_MESSAGE_PARA pSignPara,
             for (i = 0; ret && i < cToBeSigned; ++i)
             {
                 ret = CryptMsgUpdate(msg, rgpbToBeSigned[i], rgcbToBeSigned[i],
-                 i == cToBeSigned - 1 ? TRUE : FALSE);
+                 i == cToBeSigned - 1);
             }
         }
         else
diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c
index d56fe83bd2b..4f09e7b8a6a 100644
--- a/dlls/crypt32/oid.c
+++ b/dlls/crypt32/oid.c
@@ -684,7 +684,7 @@ BOOL WINAPI CryptUnregisterOIDFunction(DWORD dwEncodingType, LPCSTR pszFuncName,
     CryptMemFree(szKey);
     if (rc)
         SetLastError(rc);
-    return rc ? FALSE : TRUE;
+    return !rc;
 }
 
 BOOL WINAPI CryptGetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName,
@@ -721,7 +721,7 @@ BOOL WINAPI CryptGetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName,
             SetLastError(rc);
         RegCloseKey(hKey);
     }
-    return rc ? FALSE : TRUE;
+    return !rc;
 }
 
 BOOL WINAPI CryptSetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName,
@@ -758,7 +758,7 @@ BOOL WINAPI CryptSetOIDFunctionValue(DWORD dwEncodingType, LPCSTR pszFuncName,
             SetLastError(rc);
         RegCloseKey(hKey);
     }
-    return rc ? FALSE : TRUE;
+    return !rc;
 }
 
 static LPCWSTR CRYPT_FindStringInMultiString(LPCWSTR multi, LPCWSTR toFind)
diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c
index b540e6189f5..6d27fc1c356 100644
--- a/dlls/crypt32/store.c
+++ b/dlls/crypt32/store.c
@@ -163,7 +163,7 @@ static BOOL CRYPT_MemAddCert(PWINECRYPT_CERTSTORE store, void *cert,
         if (ppStoreContext)
             *ppStoreContext = CertDuplicateCertificateContext(context);
     }
-    return context ? TRUE : FALSE;
+    return context != 0;
 }
 
 static void *CRYPT_MemEnumCert(PWINECRYPT_CERTSTORE store, void *pPrev)
@@ -208,7 +208,7 @@ static BOOL CRYPT_MemAddCrl(PWINECRYPT_CERTSTORE store, void *crl,
         if (ppStoreContext)
             *ppStoreContext = CertDuplicateCRLContext(context);
     }
-    return context ? TRUE : FALSE;
+    return context != 0;
 }
 
 static void *CRYPT_MemEnumCrl(PWINECRYPT_CERTSTORE store, void *pPrev)
@@ -253,7 +253,7 @@ static BOOL CRYPT_MemAddCtl(PWINECRYPT_CERTSTORE store, void *ctl,
         if (ppStoreContext)
             *ppStoreContext = CertDuplicateCTLContext(context);
     }
-    return context ? TRUE : FALSE;
+    return context != 0;
 }
 
 static void *CRYPT_MemEnumCtl(PWINECRYPT_CERTSTORE store, void *pPrev)
-- 
2.11.4.GIT