diff options
Diffstat (limited to 'common/rfb')
30 files changed, 94 insertions, 77 deletions
diff --git a/common/rfb/CConnection.cxx b/common/rfb/CConnection.cxx index 43cd0165..27942764 100644 --- a/common/rfb/CConnection.cxx +++ b/common/rfb/CConnection.cxx @@ -635,11 +635,11 @@ void CConnection::handleClipboardRequest() { } -void CConnection::handleClipboardAnnounce(bool available) +void CConnection::handleClipboardAnnounce(bool /*available*/) { } -void CConnection::handleClipboardData(const char* data) +void CConnection::handleClipboardData(const char* /*data*/) { } diff --git a/common/rfb/CMsgHandler.cxx b/common/rfb/CMsgHandler.cxx index 9200e82b..f4f785b2 100644 --- a/common/rfb/CMsgHandler.cxx +++ b/common/rfb/CMsgHandler.cxx @@ -68,7 +68,8 @@ void CMsgHandler::setName(const char* name) server.setName(name); } -void CMsgHandler::fence(rdr::U32 flags, unsigned len, const char data[]) +void CMsgHandler::fence(rdr::U32 /*flags*/, unsigned /*len*/, + const char /*data*/ []) { server.supportsFence = true; } @@ -150,7 +151,7 @@ void CMsgHandler::handleClipboardCaps(rdr::U32 flags, const rdr::U32* lengths) server.setClipboardCaps(flags, lengths); } -void CMsgHandler::handleClipboardRequest(rdr::U32 flags) +void CMsgHandler::handleClipboardRequest(rdr::U32 /*flags*/) { } @@ -158,12 +159,12 @@ void CMsgHandler::handleClipboardPeek() { } -void CMsgHandler::handleClipboardNotify(rdr::U32 flags) +void CMsgHandler::handleClipboardNotify(rdr::U32 /*flags*/) { } -void CMsgHandler::handleClipboardProvide(rdr::U32 flags, - const size_t* lengths, - const rdr::U8* const* data) +void CMsgHandler::handleClipboardProvide(rdr::U32 /*flags*/, + const size_t* /*lengths*/, + const rdr::U8* const* /*data*/) { } diff --git a/common/rfb/Congestion.cxx b/common/rfb/Congestion.cxx index 32339a14..f642752e 100644 --- a/common/rfb/Congestion.cxx +++ b/common/rfb/Congestion.cxx @@ -313,6 +313,8 @@ size_t Congestion::getBandwidth() void Congestion::debugTrace(const char* filename, int fd) { + (void)filename; + (void)fd; #ifdef CONGESTION_TRACE #ifdef __linux__ FILE *f; diff --git a/common/rfb/CopyRectDecoder.cxx b/common/rfb/CopyRectDecoder.cxx index 82ae06f1..fb05dcbd 100644 --- a/common/rfb/CopyRectDecoder.cxx +++ b/common/rfb/CopyRectDecoder.cxx @@ -36,8 +36,10 @@ CopyRectDecoder::~CopyRectDecoder() { } -bool CopyRectDecoder::readRect(const Rect& r, rdr::InStream* is, - const ServerParams& server, rdr::OutStream* os) +bool CopyRectDecoder::readRect(const Rect& /*r*/, + rdr::InStream* is, + const ServerParams& /*server*/, + rdr::OutStream* os) { if (!is->hasData(4)) return false; @@ -63,7 +65,8 @@ void CopyRectDecoder::getAffectedRegion(const Rect& rect, } void CopyRectDecoder::decodeRect(const Rect& r, const void* buffer, - size_t buflen, const ServerParams& server, + size_t buflen, + const ServerParams& /*server*/, ModifiablePixelBuffer* pb) { rdr::MemInStream is(buffer, buflen); diff --git a/common/rfb/Decoder.cxx b/common/rfb/Decoder.cxx index 924f86d8..832d8cf0 100644 --- a/common/rfb/Decoder.cxx +++ b/common/rfb/Decoder.cxx @@ -45,17 +45,22 @@ Decoder::~Decoder() { } -void Decoder::getAffectedRegion(const Rect& rect, const void* buffer, - size_t buflen, const ServerParams& server, +void Decoder::getAffectedRegion(const Rect& rect, + const void* /*buffer*/, + size_t /*buflen*/, + const ServerParams& /*server*/, Region* region) { region->reset(rect); } -bool Decoder::doRectsConflict(const Rect& rectA, const void* bufferA, - size_t buflenA, const Rect& rectB, - const void* bufferB, size_t buflenB, - const ServerParams& server) +bool Decoder::doRectsConflict(const Rect& /*rectA*/, + const void* /*bufferA*/, + size_t /*buflenA*/, + const Rect& /*rectB*/, + const void* /*bufferB*/, + size_t /*buflenB*/, + const ServerParams& /*server*/) { return false; } diff --git a/common/rfb/EncodeManager.cxx b/common/rfb/EncodeManager.cxx index e49fa254..6a78939e 100644 --- a/common/rfb/EncodeManager.cxx +++ b/common/rfb/EncodeManager.cxx @@ -1060,7 +1060,7 @@ void EncodeManager::OffsetPixelBuffer::update(const PixelFormat& pf, setBuffer(width, height, (rdr::U8*)data_, stride_); } -rdr::U8* EncodeManager::OffsetPixelBuffer::getBufferRW(const Rect& r, int* stride) +rdr::U8* EncodeManager::OffsetPixelBuffer::getBufferRW(const Rect& /*r*/, int* /*stride*/) { throw rfb::Exception("Invalid write attempt to OffsetPixelBuffer"); } diff --git a/common/rfb/Encoder.h b/common/rfb/Encoder.h index d5a0288e..76079930 100644 --- a/common/rfb/Encoder.h +++ b/common/rfb/Encoder.h @@ -51,9 +51,10 @@ namespace rfb { // checking the list of encodings in the connection parameters. virtual bool isSupported()=0; - virtual void setCompressLevel(int level) {}; - virtual void setQualityLevel(int level) {}; - virtual void setFineQualityLevel(int quality, int subsampling) {}; + virtual void setCompressLevel(int /*level*/) {}; + virtual void setQualityLevel(int /*level*/) {}; + virtual void setFineQualityLevel(int /*quality*/, + int /*subsampling*/) {}; virtual int getCompressLevel() { return -1; }; virtual int getQualityLevel() { return -1; }; diff --git a/common/rfb/H264Decoder.cxx b/common/rfb/H264Decoder.cxx index 1341366d..92231fcd 100644 --- a/common/rfb/H264Decoder.cxx +++ b/common/rfb/H264Decoder.cxx @@ -65,8 +65,10 @@ H264DecoderContext* H264Decoder::findContext(const Rect& r) return NULL; } -bool H264Decoder::readRect(const Rect& r, rdr::InStream* is, - const ServerParams& server, rdr::OutStream* os) +bool H264Decoder::readRect(const Rect& /*r*/, + rdr::InStream* is, + const ServerParams& /*server*/, + rdr::OutStream* os) { rdr::U32 len; @@ -92,7 +94,8 @@ bool H264Decoder::readRect(const Rect& r, rdr::InStream* is, } void H264Decoder::decodeRect(const Rect& r, const void* buffer, - size_t buflen, const ServerParams& server, + size_t buflen, + const ServerParams& /*server*/, ModifiablePixelBuffer* pb) { rdr::MemInStream is(buffer, buflen); diff --git a/common/rfb/H264DecoderContext.h b/common/rfb/H264DecoderContext.h index 20c65774..f261f4f2 100644 --- a/common/rfb/H264DecoderContext.h +++ b/common/rfb/H264DecoderContext.h @@ -33,8 +33,9 @@ namespace rfb { virtual ~H264DecoderContext() = 0; - virtual void decode(const rdr::U8* h264_buffer, rdr::U32 len, - ModifiablePixelBuffer* pb) {} + virtual void decode(const rdr::U8* /*h264_buffer*/, + rdr::U32 /*len*/, + ModifiablePixelBuffer* /*pb*/) {} void reset(); inline bool isEqualRect(const Rect &r) const { return r.equals(rect); } diff --git a/common/rfb/HextileEncoder.cxx b/common/rfb/HextileEncoder.cxx index e3845a83..f9db06b8 100644 --- a/common/rfb/HextileEncoder.cxx +++ b/common/rfb/HextileEncoder.cxx @@ -63,7 +63,8 @@ bool HextileEncoder::isSupported() return conn->client.supportsEncoding(encodingHextile); } -void HextileEncoder::writeRect(const PixelBuffer* pb, const Palette& palette) +void HextileEncoder::writeRect(const PixelBuffer* pb, + const Palette& /*palette*/) { rdr::OutStream* os = conn->getOutStream(); switch (pb->getPF().bpp) { diff --git a/common/rfb/InputHandler.h b/common/rfb/InputHandler.h index b91f0e42..4719eca0 100644 --- a/common/rfb/InputHandler.h +++ b/common/rfb/InputHandler.h @@ -32,12 +32,11 @@ namespace rfb { class InputHandler { public: virtual ~InputHandler() {} - virtual void keyEvent(rdr::U32 __unused_attr keysym, - rdr::U32 __unused_attr keycode, - bool __unused_attr down) { } - virtual void pointerEvent(const Point& __unused_attr pos, - int __unused_attr buttonMask) { } - virtual void clientCutText(const char* __unused_attr str) { } + virtual void keyEvent(rdr::U32 /*keysym*/, rdr::U32 /*keycode*/, + bool /*down*/) { } + virtual void pointerEvent(const Point& /*pos*/, + int /*buttonMask*/) { } + virtual void clientCutText(const char* /*str*/) { } }; } diff --git a/common/rfb/JpegCompressor.cxx b/common/rfb/JpegCompressor.cxx index 18d34c3d..0ecc6de9 100644 --- a/common/rfb/JpegCompressor.cxx +++ b/common/rfb/JpegCompressor.cxx @@ -252,7 +252,7 @@ void JpegCompressor::compress(const rdr::U8 *buf, int stride, const Rect& r, delete[] rowPointer; } -void JpegCompressor::writeBytes(const void* data, int length) +void JpegCompressor::writeBytes(const void* /*data*/, int /*length*/) { throw rdr::Exception("writeBytes() is not valid with a JpegCompressor instance. Use compress() instead."); } diff --git a/common/rfb/JpegDecompressor.cxx b/common/rfb/JpegDecompressor.cxx index 7b24e783..b879ae32 100644 --- a/common/rfb/JpegDecompressor.cxx +++ b/common/rfb/JpegDecompressor.cxx @@ -84,7 +84,7 @@ struct JPEG_SRC_MGR { }; static void -JpegNoOp(j_decompress_ptr dinfo) +JpegNoOp(j_decompress_ptr /*dinfo*/) { } diff --git a/common/rfb/LogWriter.cxx b/common/rfb/LogWriter.cxx index 7feee2fe..6df82d8e 100644 --- a/common/rfb/LogWriter.cxx +++ b/common/rfb/LogWriter.cxx @@ -51,7 +51,7 @@ void LogWriter::setLevel(int level) { } void -LogWriter::listLogWriters(int width) { +LogWriter::listLogWriters(int /*width*/) { // *** make this respect width... LogWriter* current = log_writers; fprintf(stderr, " "); diff --git a/common/rfb/Logger_file.cxx b/common/rfb/Logger_file.cxx index 89ff7433..684614cc 100644 --- a/common/rfb/Logger_file.cxx +++ b/common/rfb/Logger_file.cxx @@ -45,7 +45,7 @@ Logger_File::~Logger_File() delete mutex; } -void Logger_File::write(int level, const char *logname, const char *message) +void Logger_File::write(int /*level*/, const char *logname, const char *message) { os::AutoMutex a(mutex); diff --git a/common/rfb/PixelBuffer.cxx b/common/rfb/PixelBuffer.cxx index 1b39a9ec..1b534b7b 100644 --- a/common/rfb/PixelBuffer.cxx +++ b/common/rfb/PixelBuffer.cxx @@ -339,7 +339,7 @@ rdr::U8* FullFramePixelBuffer::getBufferRW(const Rect& r, int* stride_) return &data[(r.tl.x + (r.tl.y * stride)) * (format.bpp/8)]; } -void FullFramePixelBuffer::commitBufferRW(const Rect& r) +void FullFramePixelBuffer::commitBufferRW(const Rect& /*r*/) { } @@ -371,7 +371,7 @@ void FullFramePixelBuffer::setBuffer(int width, int height, data = data_; } -void FullFramePixelBuffer::setSize(int w, int h) +void FullFramePixelBuffer::setSize(int /*w*/, int /*h*/) { // setBuffer() should be used throw rfb::Exception("Invalid call to FullFramePixelBuffer::setSize()"); diff --git a/common/rfb/PixelBuffer.h b/common/rfb/PixelBuffer.h index 3e4018f9..b12a734e 100644 --- a/common/rfb/PixelBuffer.h +++ b/common/rfb/PixelBuffer.h @@ -86,7 +86,7 @@ namespace rfb { // Ensure that the specified rectangle of buffer is up to date. // Overridden by derived classes implementing framebuffer access // to copy the required display data into place. - virtual void grabRegion(const Region& __unused_attr region) {} + virtual void grabRegion(const Region& /*region*/) {} protected: PixelBuffer(); diff --git a/common/rfb/RREDecoder.cxx b/common/rfb/RREDecoder.cxx index a0818987..a01cbe74 100644 --- a/common/rfb/RREDecoder.cxx +++ b/common/rfb/RREDecoder.cxx @@ -48,7 +48,7 @@ RREDecoder::~RREDecoder() { } -bool RREDecoder::readRect(const Rect& r, rdr::InStream* is, +bool RREDecoder::readRect(const Rect& /*r*/, rdr::InStream* is, const ServerParams& server, rdr::OutStream* os) { rdr::U32 numRects; diff --git a/common/rfb/RREEncoder.cxx b/common/rfb/RREEncoder.cxx index f5b9be72..31f94e7c 100644 --- a/common/rfb/RREEncoder.cxx +++ b/common/rfb/RREEncoder.cxx @@ -107,7 +107,7 @@ void RREEncoder::writeRect(const PixelBuffer* pb, const Palette& palette) mos.clear(); } -void RREEncoder::writeSolidRect(int width, int height, +void RREEncoder::writeSolidRect(int /*width*/, int /*height*/, const PixelFormat& pf, const rdr::U8* colour) { diff --git a/common/rfb/RawEncoder.cxx b/common/rfb/RawEncoder.cxx index a820c32c..28115588 100644 --- a/common/rfb/RawEncoder.cxx +++ b/common/rfb/RawEncoder.cxx @@ -44,7 +44,8 @@ bool RawEncoder::isSupported() return true; } -void RawEncoder::writeRect(const PixelBuffer* pb, const Palette& palette) +void RawEncoder::writeRect(const PixelBuffer* pb, + const Palette& /*palette*/) { const rdr::U8* buffer; int stride; diff --git a/common/rfb/SConnection.cxx b/common/rfb/SConnection.cxx index 00116414..8e0bff8c 100644 --- a/common/rfb/SConnection.cxx +++ b/common/rfb/SConnection.cxx @@ -286,7 +286,7 @@ bool SConnection::processInitMsg() return reader_->readClientInit(); } -bool SConnection::handleAuthFailureTimeout(Timer* t) +bool SConnection::handleAuthFailureTimeout(Timer* /*t*/) { if (state_ != RFBSTATE_SECURITY_FAILURE) { close("SConnection::handleAuthFailureTimeout: invalid state"); @@ -452,7 +452,7 @@ void SConnection::authSuccess() { } -void SConnection::queryConnection(const char* userName) +void SConnection::queryConnection(const char* /*userName*/) { approveConnection(true); } @@ -491,14 +491,14 @@ void SConnection::approveConnection(bool accept, const char* reason) } } -void SConnection::clientInit(bool shared) +void SConnection::clientInit(bool /*shared*/) { writer_->writeServerInit(client.width(), client.height(), client.pf(), client.name()); state_ = RFBSTATE_NORMAL; } -void SConnection::close(const char* reason) +void SConnection::close(const char* /*reason*/) { state_ = RFBSTATE_CLOSING; cleanup(); @@ -512,7 +512,8 @@ void SConnection::setPixelFormat(const PixelFormat& pf) writeFakeColourMap(); } -void SConnection::framebufferUpdateRequest(const Rect& r, bool incremental) +void SConnection::framebufferUpdateRequest(const Rect& /*r*/, + bool /*incremental*/) { if (!readyForSetColourMapEntries) { readyForSetColourMapEntries = true; @@ -533,8 +534,9 @@ void SConnection::fence(rdr::U32 flags, unsigned len, const char data[]) writer()->writeFence(flags, len, data); } -void SConnection::enableContinuousUpdates(bool enable, - int x, int y, int w, int h) +void SConnection::enableContinuousUpdates(bool /*enable*/, + int /*x*/, int /*y*/, + int /*w*/, int /*h*/) { } @@ -542,11 +544,11 @@ void SConnection::handleClipboardRequest() { } -void SConnection::handleClipboardAnnounce(bool available) +void SConnection::handleClipboardAnnounce(bool /*available*/) { } -void SConnection::handleClipboardData(const char* data) +void SConnection::handleClipboardData(const char* /*data*/) { } diff --git a/common/rfb/SDesktop.h b/common/rfb/SDesktop.h index b4104ea7..6d2a5dd8 100644 --- a/common/rfb/SDesktop.h +++ b/common/rfb/SDesktop.h @@ -84,9 +84,9 @@ namespace rfb { // setScreenLayout() requests to reconfigure the framebuffer and/or // the layout of screens. - virtual unsigned int setScreenLayout(int __unused_attr fb_width, - int __unused_attr fb_height, - const ScreenSet& __unused_attr layout) { + virtual unsigned int setScreenLayout(int /*fb_width*/, + int /*fb_height*/, + const ScreenSet& /*layout*/) { return resultProhibited; } @@ -104,14 +104,14 @@ namespace rfb { // handleClipboardAnnounce() is called to indicate a change in the // clipboard on a client. Call VNCServer::requestClipboard() to // access the actual data. - virtual void handleClipboardAnnounce(bool __unused_attr available) {} + virtual void handleClipboardAnnounce(bool /*available*/) {} // handleClipboardData() is called when a client has sent over // the clipboard data as a result of a previous call to // VNCServer::requestClipboard(). Note that this function might // never be called if the clipboard data was no longer available // when the client received the request. - virtual void handleClipboardData(const char* __unused_attr data) {} + virtual void handleClipboardData(const char* /*data*/) {} protected: virtual ~SDesktop() {} @@ -149,7 +149,7 @@ namespace rfb { server = 0; } virtual void queryConnection(network::Socket* sock, - const char* userName) { + const char* /*userName*/) { server->approveConnection(sock, true, NULL); } diff --git a/common/rfb/SMsgHandler.cxx b/common/rfb/SMsgHandler.cxx index f00b570b..4f008039 100644 --- a/common/rfb/SMsgHandler.cxx +++ b/common/rfb/SMsgHandler.cxx @@ -40,7 +40,7 @@ SMsgHandler::~SMsgHandler() { } -void SMsgHandler::clientInit(bool shared) +void SMsgHandler::clientInit(bool /*shared*/) { } @@ -118,7 +118,7 @@ void SMsgHandler::handleClipboardCaps(rdr::U32 flags, const rdr::U32* lengths) client.setClipboardCaps(flags, lengths); } -void SMsgHandler::handleClipboardRequest(rdr::U32 flags) +void SMsgHandler::handleClipboardRequest(rdr::U32 /*flags*/) { } @@ -126,13 +126,13 @@ void SMsgHandler::handleClipboardPeek() { } -void SMsgHandler::handleClipboardNotify(rdr::U32 flags) +void SMsgHandler::handleClipboardNotify(rdr::U32 /*flags*/) { } -void SMsgHandler::handleClipboardProvide(rdr::U32 flags, - const size_t* lengths, - const rdr::U8* const* data) +void SMsgHandler::handleClipboardProvide(rdr::U32 /*flags*/, + const size_t* /*lengths*/, + const rdr::U8* const* /*data*/) { } diff --git a/common/rfb/TightDecoder.cxx b/common/rfb/TightDecoder.cxx index ce01104e..69971dbc 100644 --- a/common/rfb/TightDecoder.cxx +++ b/common/rfb/TightDecoder.cxx @@ -199,13 +199,13 @@ bool TightDecoder::readRect(const Rect& r, rdr::InStream* is, return true; } -bool TightDecoder::doRectsConflict(const Rect& rectA, +bool TightDecoder::doRectsConflict(const Rect& /*rectA*/, const void* bufferA, size_t buflenA, - const Rect& rectB, + const Rect& /*rectB*/, const void* bufferB, size_t buflenB, - const ServerParams& server) + const ServerParams& /*server*/) { rdr::U8 comp_ctl_a, comp_ctl_b; diff --git a/common/rfb/TightEncoder.cxx b/common/rfb/TightEncoder.cxx index 1143ebcf..94acd3d1 100644 --- a/common/rfb/TightEncoder.cxx +++ b/common/rfb/TightEncoder.cxx @@ -102,7 +102,7 @@ void TightEncoder::writeRect(const PixelBuffer* pb, const Palette& palette) } } -void TightEncoder::writeSolidRect(int width, int height, +void TightEncoder::writeSolidRect(int /*width*/, int /*height*/, const PixelFormat& pf, const rdr::U8* colour) { diff --git a/common/rfb/TightJPEGEncoder.cxx b/common/rfb/TightJPEGEncoder.cxx index 11701e74..976601f7 100644 --- a/common/rfb/TightJPEGEncoder.cxx +++ b/common/rfb/TightJPEGEncoder.cxx @@ -112,7 +112,8 @@ int TightJPEGEncoder::getQualityLevel() return qualityLevel; } -void TightJPEGEncoder::writeRect(const PixelBuffer* pb, const Palette& palette) +void TightJPEGEncoder::writeRect(const PixelBuffer* pb, + const Palette& /*palette*/) { const rdr::U8* buffer; int stride; diff --git a/common/rfb/UnixPasswordValidator.cxx b/common/rfb/UnixPasswordValidator.cxx index ee7bc0da..fa1513a4 100644 --- a/common/rfb/UnixPasswordValidator.cxx +++ b/common/rfb/UnixPasswordValidator.cxx @@ -37,7 +37,7 @@ AliasParameter pam_service("pam_service", "Alias for PAMService", int do_pam_auth(const char *service, const char *username, const char *password); -bool UnixPasswordValidator::validateInternal(SConnection * sc, +bool UnixPasswordValidator::validateInternal(SConnection * /*sc*/, const char *username, const char *password) { diff --git a/common/rfb/WinPasswdValidator.cxx b/common/rfb/WinPasswdValidator.cxx index b2edde5f..f07c27e8 100644 --- a/common/rfb/WinPasswdValidator.cxx +++ b/common/rfb/WinPasswdValidator.cxx @@ -29,7 +29,7 @@ using namespace rfb; // This method will only work for Windows NT, 2000, and XP (and possibly Vista) -bool WinPasswdValidator::validateInternal(rfb::SConnection* sc, +bool WinPasswdValidator::validateInternal(rfb::SConnection* /*sc*/, const char* username, const char* password) { diff --git a/common/rfb/ZRLEDecoder.cxx b/common/rfb/ZRLEDecoder.cxx index 3c7ed2ce..f5120e9c 100644 --- a/common/rfb/ZRLEDecoder.cxx +++ b/common/rfb/ZRLEDecoder.cxx @@ -80,8 +80,9 @@ ZRLEDecoder::~ZRLEDecoder() { } -bool ZRLEDecoder::readRect(const Rect& r, rdr::InStream* is, - const ServerParams& server, rdr::OutStream* os) +bool ZRLEDecoder::readRect(const Rect& /*r*/, rdr::InStream* is, + const ServerParams& /*server*/, + rdr::OutStream* os) { rdr::U32 len; diff --git a/common/rfb/util.h b/common/rfb/util.h index f0ac9ef8..d0b32a61 100644 --- a/common/rfb/util.h +++ b/common/rfb/util.h @@ -35,10 +35,6 @@ struct timeval; # define __printf_attr(a, b) #endif // __GNUC__ -#ifndef __unused_attr -# define __unused_attr __attribute((__unused__)) -#endif - namespace rfb { // -=- Class to handle cleanup of arrays of characters |