From 65a742ea572863af39026df77fc1ab10a43baafd Mon Sep 17 00:00:00 2001 From: Frank Ueberschar Date: Mon, 13 Aug 2018 10:42:22 +0200 Subject: [PATCH] bsock: replaced NULL with nullptr --- core/src/lib/bsock_tcp.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/core/src/lib/bsock_tcp.cc b/core/src/lib/bsock_tcp.cc index fff3ad60268..931811228c2 100644 --- a/core/src/lib/bsock_tcp.cc +++ b/core/src/lib/bsock_tcp.cc @@ -932,25 +932,23 @@ void BareosSocketTCP::destroy() { if (msg) { FreePoolMemory(msg); - msg = NULL; - } else { - ASSERT(1 == 0); /* double close */ + msg = nullptr; } if (errmsg) { FreePoolMemory(errmsg); - errmsg = NULL; + errmsg = nullptr; } if (who_) { free(who_); - who_ = NULL; + who_ = nullptr; } if (host_) { free(host_); - host_ = NULL; + host_ = nullptr; } if (src_addr) { free(src_addr); - src_addr = NULL; + src_addr = nullptr; } if (fd_ >= 0) { socketClose(fd_); @@ -962,6 +960,7 @@ void BareosSocketTCP::destroy() } if(src_addr) { delete (src_addr); + src_addr = nullptr; } }