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 /net | |
| 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 'net')
| -rw-r--r-- | net/base/x509_util_mac.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/base/x509_util_mac.cc b/net/base/x509_util_mac.cc index 5145467..d06009e 100644 --- a/net/base/x509_util_mac.cc +++ b/net/base/x509_util_mac.cc @@ -133,7 +133,7 @@ OSStatus CreateRevocationPolicies(bool enable_revocation_checking, } CSSMFieldValue::CSSMFieldValue() - : cl_handle_(NULL), + : cl_handle_(CSSM_INVALID_HANDLE), oid_(NULL), field_(NULL) { } @@ -146,7 +146,7 @@ CSSMFieldValue::CSSMFieldValue(CSSM_CL_HANDLE cl_handle, } CSSMFieldValue::~CSSMFieldValue() { - Reset(NULL, NULL, NULL); + Reset(CSSM_INVALID_HANDLE, NULL, NULL); } void CSSMFieldValue::Reset(CSSM_CL_HANDLE cl_handle, @@ -160,8 +160,8 @@ void CSSMFieldValue::Reset(CSSM_CL_HANDLE cl_handle, } CSSMCachedCertificate::CSSMCachedCertificate() - : cl_handle_(NULL), - cached_cert_handle_(NULL) { + : cl_handle_(CSSM_INVALID_HANDLE), + cached_cert_handle_(CSSM_INVALID_HANDLE) { } CSSMCachedCertificate::~CSSMCachedCertificate() { if (cl_handle_ && cached_cert_handle_) @@ -194,7 +194,7 @@ OSStatus CSSMCachedCertificate::GetField(const CSSM_OID* field_oid, CSSM_OID_PTR oid = const_cast<CSSM_OID_PTR>(field_oid); CSSM_DATA_PTR field_ptr = NULL; - CSSM_HANDLE results_handle = NULL; + CSSM_HANDLE results_handle = CSSM_INVALID_HANDLE; uint32 field_value_count = 0; CSSM_RETURN status = CSSM_CL_CertGetFirstCachedFieldValue( cl_handle_, cached_cert_handle_, oid, &results_handle, |