From eb95532f5c0e9e6891233ab7ca4d2a10e1fe1d32 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Tue, 3 Mar 2015 16:10:53 +0100 Subject: [PATCH] Remove unused variables --- common/network/TcpSocket.cxx | 1 - common/rfb/EncodeManagerBPP.cxx | 3 --- common/rfb/SMsgWriter.cxx | 1 - common/rfb/TightEncoder.cxx | 2 +- common/rfb/VNCSConnectionST.cxx | 1 - common/rfb/WinPasswdValidator.cxx | 2 -- vncviewer/OptionsDialog.cxx | 6 +----- vncviewer/X11PixelBuffer.cxx | 1 - vncviewer/keysym2ucs.c | 1 - vncviewer/parameters.cxx | 1 - 10 files changed, 2 insertions(+), 17 deletions(-) diff --git a/common/network/TcpSocket.cxx b/common/network/TcpSocket.cxx index ef7f55db..e19f52b1 100644 --- a/common/network/TcpSocket.cxx +++ b/common/network/TcpSocket.cxx @@ -598,7 +598,6 @@ TcpListener::accept() { void TcpListener::getMyAddresses(std::list* result) { #if defined(HAVE_GETADDRINFO) && defined(HAVE_INET_PTON) - vnc_sockaddr_t sa; struct addrinfo *ai, *current, hints; memset(&hints, 0, sizeof(struct addrinfo)); diff --git a/common/rfb/EncodeManagerBPP.cxx b/common/rfb/EncodeManagerBPP.cxx index f58466cb..03612914 100644 --- a/common/rfb/EncodeManagerBPP.cxx +++ b/common/rfb/EncodeManagerBPP.cxx @@ -59,9 +59,6 @@ inline bool EncodeManager::analyseRect(int width, int height, rdr::UBPP colour; int count; - rdr::UBPP c0, c1, ci = 0; - int i, n0, n1, ni; - info->rleRuns = 0; info->palette.clear(); diff --git a/common/rfb/SMsgWriter.cxx b/common/rfb/SMsgWriter.cxx index 9aee96d2..e4215086 100644 --- a/common/rfb/SMsgWriter.cxx +++ b/common/rfb/SMsgWriter.cxx @@ -301,7 +301,6 @@ void SMsgWriter::writePseudoRects() { if (needSetCursor) { rdr::U8* data; - int stride; const Cursor& cursor = cp->cursor(); diff --git a/common/rfb/TightEncoder.cxx b/common/rfb/TightEncoder.cxx index 3846ae08..ec19c2e0 100644 --- a/common/rfb/TightEncoder.cxx +++ b/common/rfb/TightEncoder.cxx @@ -163,7 +163,7 @@ void TightEncoder::writeFullColourRect(const PixelBuffer* pb, const Palette& pal int length; const rdr::U8* buffer; - int stride, w, h; + int stride, h; os = conn->getOutStream(); diff --git a/common/rfb/VNCSConnectionST.cxx b/common/rfb/VNCSConnectionST.cxx index e261cfba..b4613e16 100644 --- a/common/rfb/VNCSConnectionST.cxx +++ b/common/rfb/VNCSConnectionST.cxx @@ -760,7 +760,6 @@ void VNCSConnectionST::writeRTTPing() void VNCSConnectionST::handleRTTPong(const struct RTTInfo &rttInfo) { unsigned rtt, delay; - int bdp; pingCounter--; diff --git a/common/rfb/WinPasswdValidator.cxx b/common/rfb/WinPasswdValidator.cxx index 7f8fbf28..22efcc0c 100644 --- a/common/rfb/WinPasswdValidator.cxx +++ b/common/rfb/WinPasswdValidator.cxx @@ -45,7 +45,5 @@ bool WinPasswdValidator::validateInternal(rfb::SConnection* sc, return true; } - int err = GetLastError(); - return false; } diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx index 9fa9a665..d1495ef2 100644 --- a/vncviewer/OptionsDialog.cxx +++ b/vncviewer/OptionsDialog.cxx @@ -422,7 +422,7 @@ void OptionsDialog::createCompressionPage(int tx, int ty, int tw, int th) int orig_tx, orig_ty; int half_width, full_width; - int width, height; + int height; tx += OUTER_MARGIN; ty += OUTER_MARGIN; @@ -454,8 +454,6 @@ void OptionsDialog::createCompressionPage(int tx, int ty, int tw, int th) tx += GROUP_MARGIN; ty += GROUP_MARGIN; - width = encodingGroup->w() - GROUP_MARGIN * 2; - tightButton = new Fl_Round_Button(LBLRIGHT(tx, ty, RADIO_MIN_WIDTH, RADIO_HEIGHT, @@ -504,8 +502,6 @@ void OptionsDialog::createCompressionPage(int tx, int ty, int tw, int th) tx += GROUP_MARGIN; ty += GROUP_MARGIN; - width = colorlevelGroup->w() - GROUP_MARGIN * 2; - fullcolorCheckbox = new Fl_Round_Button(LBLRIGHT(tx, ty, RADIO_MIN_WIDTH, RADIO_HEIGHT, diff --git a/vncviewer/X11PixelBuffer.cxx b/vncviewer/X11PixelBuffer.cxx index 7e89a60b..9196fdca 100644 --- a/vncviewer/X11PixelBuffer.cxx +++ b/vncviewer/X11PixelBuffer.cxx @@ -157,7 +157,6 @@ int X11PixelBuffer::setupShm() int major, minor; Bool pixmaps; XErrorHandler old_handler; - Status status; const char *display_name = XDisplayName (NULL); /* Don't use MIT-SHM on remote displays */ diff --git a/vncviewer/keysym2ucs.c b/vncviewer/keysym2ucs.c index d91df677..33a5653d 100644 --- a/vncviewer/keysym2ucs.c +++ b/vncviewer/keysym2ucs.c @@ -899,7 +899,6 @@ unsigned ucs2keysym(unsigned ucs) { int cur = 0; int max = sizeof(keysymtab) / sizeof(struct codepair) - 1; - int mid; /* first check for Latin-1 characters (1:1 mapping) */ if ((ucs >= 0x0020 && ucs <= 0x007e) || diff --git a/vncviewer/parameters.cxx b/vncviewer/parameters.cxx index c975e99a..db9e92d6 100644 --- a/vncviewer/parameters.cxx +++ b/vncviewer/parameters.cxx @@ -551,7 +551,6 @@ char* loadViewerParameters(const char *filename) { char readError[buffersize*2]; char line[buffersize]; char decodingBuffer[buffersize]; - char decodedValue[buffersize]; static char servername[sizeof(line)]; // Load from the registry or a predefined file if no filename was specified. -- 2.39.5