aboutsummaryrefslogtreecommitdiffstats
path: root/src/tls/tls_channel.cpp
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-05-18 20:44:34 +0000
committerlloyd <[email protected]>2012-05-18 20:44:34 +0000
commit8383b0b503c812e45f2780217b048a19a8946853 (patch)
tree939403bad80ee2b1e13b69c82adc316422a9c7d6 /src/tls/tls_channel.cpp
parentc691561f3198f481c13457433efbccc1c9fcd898 (diff)
Replace 0 and NULL pointer constants with nullptr. Also fix an old
style cast in secmem.h
Diffstat (limited to 'src/tls/tls_channel.cpp')
-rw-r--r--src/tls/tls_channel.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tls/tls_channel.cpp b/src/tls/tls_channel.cpp
index ff6722b5e..dadf26e90 100644
--- a/src/tls/tls_channel.cpp
+++ b/src/tls/tls_channel.cpp
@@ -22,7 +22,7 @@ Channel::Channel(std::function<void (const byte[], size_t)> socket_output_fn,
proc_fn(proc_fn),
handshake_fn(handshake_complete),
writer(socket_output_fn),
- state(0),
+ state(nullptr),
handshake_completed(false),
connection_closed(false),
m_peer_supports_heartbeats(false),
@@ -33,7 +33,7 @@ Channel::Channel(std::function<void (const byte[], size_t)> socket_output_fn,
Channel::~Channel()
{
delete state;
- state = 0;
+ state = nullptr;
}
size_t Channel::received_data(const byte buf[], size_t buf_size)
@@ -105,7 +105,7 @@ size_t Channel::received_data(const byte buf[], size_t buf_size)
alert_notify(alert_msg);
- proc_fn(0, 0, alert_msg);
+ proc_fn(nullptr, 0, alert_msg);
if(alert_msg.type() == Alert::CLOSE_NOTIFY)
{
@@ -120,7 +120,7 @@ size_t Channel::received_data(const byte buf[], size_t buf_size)
connection_closed = true;
delete state;
- state = 0;
+ state = nullptr;
writer.reset();
reader.reset();
@@ -238,7 +238,7 @@ void Channel::send_alert(const Alert& alert)
connection_closed = true;
delete state;
- state = 0;
+ state = nullptr;
writer.reset();
}