diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-01-11 17:48:15 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-01-11 17:48:15 -0500 |
| commit | 05485a47ea107737ada8b0941a7a066c6a075f40 (patch) | |
| tree | 8bf8a5fee750b20a631f02f60e6db21788ecc14f /cpp/src/IceSSL/Util.cpp | |
| parent | Moved UniquePtr to IceInternal (diff) | |
| download | ice-05485a47ea107737ada8b0941a7a066c6a075f40.tar.bz2 ice-05485a47ea107737ada8b0941a7a066c6a075f40.tar.xz ice-05485a47ea107737ada8b0941a7a066c6a075f40.zip | |
Replace NULL by ICE_NULLPTR
Diffstat (limited to 'cpp/src/IceSSL/Util.cpp')
| -rwxr-xr-x | cpp/src/IceSSL/Util.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp index 5a0f815b12d..26608354fa2 100755 --- a/cpp/src/IceSSL/Util.cpp +++ b/cpp/src/IceSSL/Util.cpp @@ -556,7 +556,7 @@ IceSSL::getSslErrors(bool verbose) else { const char* reason = ERR_reason_error_string(err); - ostr << (reason == NULL ? "unknown reason" : reason); + ostr << (reason == ICE_NULLPTR ? "unknown reason" : reason); if(flags & ERR_TXT_STRING) { ostr << ": " << data; @@ -622,7 +622,7 @@ IceSSL::fromCFString(CFStringRef v) CFDictionaryRef IceSSL::getCertificateProperty(SecCertificateRef cert, CFTypeRef key) { - CFArrayRef keys = CFArrayCreate(NULL, &key , 1, &kCFTypeArrayCallBacks); + CFArrayRef keys = CFArrayCreate(ICE_NULLPTR, &key , 1, &kCFTypeArrayCallBacks); CFErrorRef err = 0; CFDictionaryRef values = SecCertificateCopyValues(cert, keys, &err); CFRelease(keys); @@ -1409,7 +1409,7 @@ IceSSL::findCertificateChain(const std::string& keychainPath, const std::string& err = SecItemCopyMatching(query.get(), (CFTypeRef*)&identity); if(err == noErr) { - SecCertificateRef cert2 = NULL; + SecCertificateRef cert2 = ICE_NULLPTR; if((err = SecIdentityCopyCertificate(identity, &cert2)) == noErr) { err = CFEqual(cert2, cert) ? noErr : errSecItemNotFound; |