From 07eec1b59bcc4c03c4b3f090be8458b8e4836555 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Mon, 9 Nov 2015 15:26:56 +0100 Subject: [PATCH] Remove unused deleteReaderAndWriter() method --- common/rfb/CConnection.cxx | 5 ----- common/rfb/CConnection.h | 7 ------- common/rfb/SConnection.cxx | 5 ----- common/rfb/SConnection.h | 7 ------- 4 files changed, 24 deletions(-) diff --git a/common/rfb/CConnection.cxx b/common/rfb/CConnection.cxx index 8ccd948b..8cfc2b26 100644 --- a/common/rfb/CConnection.cxx +++ b/common/rfb/CConnection.cxx @@ -43,11 +43,6 @@ CConnection::CConnection() CConnection::~CConnection() { if (csecurity) csecurity->destroy(); - deleteReaderAndWriter(); -} - -void CConnection::deleteReaderAndWriter() -{ delete reader_; reader_ = 0; delete writer_; diff --git a/common/rfb/CConnection.h b/common/rfb/CConnection.h index 0109fe86..b767ede3 100644 --- a/common/rfb/CConnection.h +++ b/common/rfb/CConnection.h @@ -101,13 +101,6 @@ namespace rfb { // Other methods - // deleteReaderAndWriter() deletes the reader and writer associated with - // this connection. This may be useful if you want to delete the streams - // before deleting the SConnection to make sure that no attempt by the - // SConnection is made to read or write. - // XXX Do we really need this at all??? - void deleteReaderAndWriter(); - CMsgReader* reader() { return reader_; } CMsgWriter* writer() { return writer_; } diff --git a/common/rfb/SConnection.cxx b/common/rfb/SConnection.cxx index bfff70cf..cc15d7c4 100644 --- a/common/rfb/SConnection.cxx +++ b/common/rfb/SConnection.cxx @@ -67,11 +67,6 @@ SConnection::SConnection() SConnection::~SConnection() { if (ssecurity) ssecurity->destroy(); - deleteReaderAndWriter(); -} - -void SConnection::deleteReaderAndWriter() -{ delete reader_; reader_ = 0; delete writer_; diff --git a/common/rfb/SConnection.h b/common/rfb/SConnection.h index ef1de2b3..b43cf086 100644 --- a/common/rfb/SConnection.h +++ b/common/rfb/SConnection.h @@ -140,13 +140,6 @@ namespace rfb { bool authenticated() { return (state_ == RFBSTATE_INITIALISATION || state_ == RFBSTATE_NORMAL); } - // deleteReaderAndWriter() deletes the reader and writer associated with - // this connection. This may be useful if you want to delete the streams - // before deleting the SConnection to make sure that no attempt by the - // SConnection is made to read or write. - // XXX Do we really need this at all??? - void deleteReaderAndWriter(); - // throwConnFailedException() prints a message to the log, sends a conn // failed message to the client (if possible) and throws a // ConnFailedException. -- 2.39.5