Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: webrtc/base/openssldigest.cc

Issue 2718663005: Replace NULL with nullptr or null in webrtc/base/. (Closed)
Patch Set: Fixing Windows and formatting issues. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/openssladapter.cc ('k') | webrtc/base/opensslidentity.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/openssldigest.cc
diff --git a/webrtc/base/openssldigest.cc b/webrtc/base/openssldigest.cc
index 37f2d0e86baea5a770e7c67c016f0d61a8901382..3115074eb6ab7a337124949fcb5f86403bb30937 100644
--- a/webrtc/base/openssldigest.cc
+++ b/webrtc/base/openssldigest.cc
@@ -18,9 +18,9 @@ namespace rtc {
OpenSSLDigest::OpenSSLDigest(const std::string& algorithm) {
EVP_MD_CTX_init(&ctx_);
if (GetDigestEVP(algorithm, &md_)) {
- EVP_DigestInit_ex(&ctx_, md_, NULL);
+ EVP_DigestInit_ex(&ctx_, md_, nullptr);
} else {
- md_ = NULL;
+ md_ = nullptr;
}
}
@@ -48,7 +48,7 @@ size_t OpenSSLDigest::Finish(void* buf, size_t len) {
}
unsigned int md_len;
EVP_DigestFinal_ex(&ctx_, static_cast<unsigned char*>(buf), &md_len);
- EVP_DigestInit_ex(&ctx_, md_, NULL); // prepare for future Update()s
+ EVP_DigestInit_ex(&ctx_, md_, nullptr); // prepare for future Update()s
RTC_DCHECK(md_len == Size());
return md_len;
}
@@ -80,8 +80,8 @@ bool OpenSSLDigest::GetDigestEVP(const std::string& algorithm,
bool OpenSSLDigest::GetDigestName(const EVP_MD* md,
std::string* algorithm) {
- RTC_DCHECK(md != NULL);
- RTC_DCHECK(algorithm != NULL);
+ RTC_DCHECK(md != nullptr);
+ RTC_DCHECK(algorithm != nullptr);
int md_type = EVP_MD_type(md);
if (md_type == NID_md5) {
« no previous file with comments | « webrtc/base/openssladapter.cc ('k') | webrtc/base/opensslidentity.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698