diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 01:35:51 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 01:35:51 +0000 |
| commit | b2968292db57db2a46c17b0b785f7224a0a63878 (patch) | |
| tree | f2a0b0c36e90393aaea82d567c3554606b354356 /crypto/cssm_init.cc | |
| parent | 6fdd4411046d735e9dba5a163d03262cc618a27f (diff) | |
| download | chromium_src-b2968292db57db2a46c17b0b785f7224a0a63878.zip chromium_src-b2968292db57db2a46c17b0b785f7224a0a63878.tar.gz chromium_src-b2968292db57db2a46c17b0b785f7224a0a63878.tar.bz2 | |
Fix a few warnings that -Wnull-conversion of a future clang will complain about.
BUG=none
TEST=none
TBR=OWNERS
NOTRY=true
Review URL: http://codereview.chromium.org/9845017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/cssm_init.cc')
| -rw-r--r-- | crypto/cssm_init.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/cssm_init.cc b/crypto/cssm_init.cc index 23c2660..cf5ac25 100644 --- a/crypto/cssm_init.cc +++ b/crypto/cssm_init.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -50,8 +50,8 @@ class CSSMInitSingleton { private: CSSMInitSingleton() : inited_(false), csp_loaded_(false), cl_loaded_(false), - tp_loaded_(false), csp_handle_(NULL), cl_handle_(NULL), - tp_handle_(NULL) { + tp_loaded_(false), csp_handle_(CSSM_INVALID_HANDLE), + cl_handle_(CSSM_INVALID_HANDLE), tp_handle_(CSSM_INVALID_HANDLE) { static CSSM_VERSION version = {2, 0}; // TODO(wtc): what should our caller GUID be? static const CSSM_GUID test_guid = { |