win: Fix a few minor issues found by clang.

crypto/rsa_private_key_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "crypto/rsa_private_key.h"
 
 #include <list>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 
 #pragma comment(lib, "crypt32.lib")
 
-namespace {
-  // Helper for error handling during key import.
-#define READ_ASSERT(truth) \
-  if (!(truth)) { \
-  NOTREACHED(); \
-  return false; \
-  }
-}  // namespace
-
 namespace crypto {
 
 // static
 RSAPrivateKey* RSAPrivateKey::Create(uint16 num_bits) {
   scoped_ptr<RSAPrivateKey> result(new RSAPrivateKey);
   if (!result->InitProvider())
     return NULL;
 
   DWORD flags = CRYPT_EXPORTABLE;
 
@@ skipping 61 matching lines @@
   memcpy(dest, &pki.exponent1()->front(), pki.exponent1()->size());
   dest += pki.exponent1()->size();
   memcpy(dest, &pki.exponent2()->front(), pki.exponent2()->size());
   dest += pki.exponent2()->size();
   memcpy(dest, &pki.coefficient()->front(), pki.coefficient()->size());
   dest += pki.coefficient()->size();
   memcpy(dest, &pki.private_exponent()->front(),
          pki.private_exponent()->size());
   dest += pki.private_exponent()->size();
 
-  READ_ASSERT(dest == blob.get() + blob_size);
+  if (dest != blob.get() + blob_size) {
+    NOTREACHED();
+    return NULL;
+  }
   if (!CryptImportKey(result->provider_,
                       reinterpret_cast<uint8*>(public_key_struc), blob_size, 0,
                       CRYPT_EXPORTABLE, result->key_.receive()))
     return NULL;
 
   return result.release();
 }
 
 // static
 RSAPrivateKey* RSAPrivateKey::CreateSensitiveFromPrivateKeyInfo(
@@ skipping 116 matching lines @@
       &encoded_length)) {
     NOTREACHED();
     return false;
   }
 
   output->assign(encoded.get(), encoded.get() + encoded_length);
   return true;
 }
 
 }  // namespace crypto