This is an automated email from the ASF dual-hosted git repository. paziz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push: new 7cb5e40 replace NULL with nullptr 7cb5e40 is described below commit 7cb5e407bf2e007bfcfc5f8f586d5e4ec7bc339c Author: Syeda Persia Aziz <persia.a...@yahoo.com> AuthorDate: Thu Jul 6 18:10:06 2017 -0500 replace NULL with nullptr --- proxy/Prefetch.cc | 2 +- proxy/http/HttpSM.cc | 8 ++++---- proxy/http/HttpSM.h | 2 +- proxy/http/HttpServerSession.h | 2 +- proxy/http/HttpTunnel.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/proxy/Prefetch.cc b/proxy/Prefetch.cc index 966b2d9..35c9175 100644 --- a/proxy/Prefetch.cc +++ b/proxy/Prefetch.cc @@ -464,7 +464,7 @@ PrefetchTransform::handle_event(int event, void *edata) return 0; } - ink_assert(m_output_vc != NULL); + ink_assert(m_output_vc != nullptr); MUTEX_TRY_LOCK(trylock, m_write_vio.mutex, this_ethread()); if (!trylock.is_locked()) { diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc index 93e3a0a..b699087 100644 --- a/proxy/http/HttpSM.cc +++ b/proxy/http/HttpSM.cc @@ -5337,10 +5337,10 @@ HttpSM::handle_http_server_open() // server session's first transaction. if (nullptr != server_session) { NetVConnection *vc = server_session->get_netvc(); - if (vc != NULL && (vc->options.sockopt_flags != t_state.txn_conf->sock_option_flag_out || - vc->options.packet_mark != t_state.txn_conf->sock_packet_mark_out || - vc->options.packet_tos != t_state.txn_conf->sock_packet_tos_out || - vc->options.clientVerificationFlag != t_state.txn_conf->ssl_client_verify_server)) { + if (vc != nullptr && (vc->options.sockopt_flags != t_state.txn_conf->sock_option_flag_out || + vc->options.packet_mark != t_state.txn_conf->sock_packet_mark_out || + vc->options.packet_tos != t_state.txn_conf->sock_packet_tos_out || + vc->options.clientVerificationFlag != t_state.txn_conf->ssl_client_verify_server)) { vc->options.sockopt_flags = t_state.txn_conf->sock_option_flag_out; vc->options.packet_mark = t_state.txn_conf->sock_packet_mark_out; vc->options.packet_tos = t_state.txn_conf->sock_packet_tos_out; diff --git a/proxy/http/HttpSM.h b/proxy/http/HttpSM.h index 3226403..23f061a 100644 --- a/proxy/http/HttpSM.h +++ b/proxy/http/HttpSM.h @@ -128,7 +128,7 @@ inline bool HttpVCTable::is_table_clear() const { for (int i = 0; i < vc_table_max_entries; i++) { - if (vc_table[i].vc != NULL) { + if (vc_table[i].vc != nullptr) { return false; } } diff --git a/proxy/http/HttpServerSession.h b/proxy/http/HttpServerSession.h index f110ed3..dcc841c 100644 --- a/proxy/http/HttpServerSession.h +++ b/proxy/http/HttpServerSession.h @@ -133,7 +133,7 @@ public: IpEndpoint const & get_server_ip() const { - ink_release_assert(server_vc != NULL); + ink_release_assert(server_vc != nullptr); return server_vc->get_remote_endpoint(); } diff --git a/proxy/http/HttpTunnel.h b/proxy/http/HttpTunnel.h index 2e9d32f..c68e0bc 100644 --- a/proxy/http/HttpTunnel.h +++ b/proxy/http/HttpTunnel.h @@ -542,7 +542,7 @@ inline bool HttpTunnel::has_cache_writer() const { for (int i = 0; i < MAX_CONSUMERS; i++) { - if (consumers[i].vc_type == HT_CACHE_WRITE && consumers[i].vc != NULL) { + if (consumers[i].vc_type == HT_CACHE_WRITE && consumers[i].vc != nullptr) { return true; } } -- To stop receiving notification emails like this one, please contact ['"commits@trafficserver.apache.org" <commits@trafficserver.apache.org>'].