From 6917fdd3a85b10c6d6e2eaa5fa12699656a70d54 Mon Sep 17 00:00:00 2001
From: Juan Lang <juan.lang@gmail.com>
Date: Sat, 24 Jan 2009 13:07:02 -0800
Subject: [PATCH] crypt32: Set save function in switch statement rather than
 with trinary conditional operator.

---
 dlls/crypt32/serialize.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c
index 32a9ca0006f..af364413748 100644
--- a/dlls/crypt32/serialize.c
+++ b/dlls/crypt32/serialize.c
@@ -841,7 +841,16 @@ BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType,
     switch (dwSaveAs)
     {
     case CERT_STORE_SAVE_AS_STORE:
+        if (dwSaveTo == CERT_STORE_SAVE_TO_MEMORY)
+            saveFunc = CRYPT_SaveSerializedToMem;
+        else
+            saveFunc = CRYPT_SaveSerializedToFile;
+        break;
     case CERT_STORE_SAVE_AS_PKCS7:
+        if (dwSaveTo == CERT_STORE_SAVE_TO_MEMORY)
+            saveFunc = CRYPT_SavePKCSToMem;
+        else
+            saveFunc = CRYPT_SavePKCSToFile;
         break;
     default:
         WARN("unimplemented for %d\n", dwSaveAs);
@@ -852,25 +861,17 @@ BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType,
     {
     case CERT_STORE_SAVE_TO_FILE:
         handle = pvSaveToPara;
-        saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ?
-         CRYPT_SaveSerializedToFile : CRYPT_SavePKCSToFile;
         break;
     case CERT_STORE_SAVE_TO_FILENAME_A:
         handle = CreateFileA((LPCSTR)pvSaveToPara, GENERIC_WRITE, 0, NULL,
          CREATE_ALWAYS, 0, NULL);
-        saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ?
-         CRYPT_SaveSerializedToFile : CRYPT_SavePKCSToFile;
         break;
     case CERT_STORE_SAVE_TO_FILENAME_W:
         handle = CreateFileW((LPCWSTR)pvSaveToPara, GENERIC_WRITE, 0, NULL,
          CREATE_ALWAYS, 0, NULL);
-        saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ?
-         CRYPT_SaveSerializedToFile : CRYPT_SavePKCSToFile;
         break;
     case CERT_STORE_SAVE_TO_MEMORY:
         handle = pvSaveToPara;
-        saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ?
-         CRYPT_SaveSerializedToMem : CRYPT_SavePKCSToMem;
         break;
     default:
         WARN("unimplemented for %d\n", dwSaveTo);