[trafficserver] branch 6.2.x updated: Remove nullptr instances that were introduced from upstream backports and replace them with NULL.

[so...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sorber pushed a commit to branch 6.2.x
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/6.2.x by this push:
       new  6befbf6   Remove nullptr instances that were introduced from upstream backports and replace them with NULL.
6befbf6 is described below

commit 6befbf6efad84d8f76000582cea37406598d9f1b
Author: Phil Sorber <so...@apache.org>
AuthorDate: Mon Feb 13 09:54:39 2017 -0700

    Remove nullptr instances that were introduced from upstream backports and replace them with NULL.
---
 lib/raft/raft_impl.h                    | 4 ++--
 lib/ts/HashMD5.cc                       | 2 +-
 plugins/experimental/s3_auth/s3_auth.cc | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/raft/raft_impl.h b/lib/raft/raft_impl.h
index 5c29b38..f0d6cb6 100644
--- a/lib/raft/raft_impl.h
+++ b/lib/raft/raft_impl.h
@@ -338,8 +338,8 @@ private:
     if (!i_am_leader())
       return;
     // Attempt to pass leadership to a worthy successor.
-    const ::std::string *best_node = nullptr;
-    NodeState *best                = nullptr;
+    const ::std::string *best_node = NULL;
+    NodeState *best                = NULL;
     for (auto &n : other_nodes_) {
       auto &s = node_state_[n];
       if (!best || (s.last_log_term > best->last_log_term ||
diff --git a/lib/ts/HashMD5.cc b/lib/ts/HashMD5.cc
index d6546d3..ea67c04 100644
--- a/lib/ts/HashMD5.cc
+++ b/lib/ts/HashMD5.cc
@@ -71,7 +71,7 @@ ATSHashMD5::clear(void)
 #endif
   int ret = EVP_MD_CTX_reset(ctx);
   ink_assert(ret == 1);
-  ret = EVP_DigestInit_ex(ctx, EVP_md5(), nullptr);
+  ret = EVP_DigestInit_ex(ctx, EVP_md5(), NULL);
   ink_assert(ret == 1);
   md_len    = 0;
   finalized = false;
diff --git a/plugins/experimental/s3_auth/s3_auth.cc b/plugins/experimental/s3_auth/s3_auth.cc
index f9697c5..d748241 100644
--- a/plugins/experimental/s3_auth/s3_auth.cc
+++ b/plugins/experimental/s3_auth/s3_auth.cc
@@ -426,7 +426,7 @@ S3Request::authorize(S3Config *s3)
 #else
   ctx = HMAC_CTX_new();
 #endif
-  HMAC_Init_ex(ctx, s3->secret(), s3->secret_len(), EVP_sha1(), nullptr);
+  HMAC_Init_ex(ctx, s3->secret(), s3->secret_len(), EVP_sha1(), NULL);
   HMAC_Update(ctx, (unsigned char *)method, method_len);
   HMAC_Update(ctx, (unsigned char *)"\n", 1);
   HMAC_Update(ctx, (unsigned char *)con_md5, con_md5_len);

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].