[Cleanup] Fixed some compiler warnings

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@2976 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/common/rfb/SFTMsgReader.cxx b/common/rfb/SFTMsgReader.cxx
index 22787bf09698b41b587417f2a8e2a0cf8887cc22..e0c9aff68edcd774046f23269d5acbc7a2520b65 100644 (file)
--- a/common/rfb/SFTMsgReader.cxx
+++ b/common/rfb/SFTMsgReader.cxx
@@ -73,7 +73,12 @@ SFTMsgReader::readFileUploadRqst(unsigned int *pFilenameSize, char *pFilename,
 char *
 SFTMsgReader::readFileUploadData(unsigned int *pDataSize, unsigned int *pModTime)
 {
-  unsigned char compressedLevel = m_pIS->readU8();
+  /*
+   * Compressed level is not used now so we have to skip one byte
+   *
+   * unsigned char compressedLevel = m_pIS->readU8();
+   */
+  (void) m_pIS->readU8();
   unsigned int realSize = m_pIS->readU16();
   unsigned int compressedSize = m_pIS->readU16();
 

diff --git a/common/rfb/ScaleFilters.h b/common/rfb/ScaleFilters.h
index 570dc51690d998e7e34817c22336b2f3edadb283..a506d35166a219289a2c3c06440d8135551e1af5 100644 (file)
--- a/common/rfb/ScaleFilters.h
+++ b/common/rfb/ScaleFilters.h
@@ -24,11 +24,11 @@
 
 namespace rfb {
 
-  #define SCALE_ERROR 1e-7
+  #define SCALE_ERROR (1e-7)
   #define BITS_OF_CHANEL 8
   #define BITS_OF_WEIGHT 14
-  #define FINALSHIFT 2 * BITS_OF_WEIGHT - BITS_OF_CHANEL
-  #define WEIGHT_OF_ONE 1 << BITS_OF_WEIGHT
+  #define FINALSHIFT (2 * BITS_OF_WEIGHT - BITS_OF_CHANEL)
+  #define WEIGHT_OF_ONE (1 << BITS_OF_WEIGHT)
 
   typedef double (*filter_func)(double x);
 

diff --git a/common/rfb/ScaledPixelBuffer.cxx b/common/rfb/ScaledPixelBuffer.cxx
index cd373387842d47430a144611c99e4899f159ce5c..251233f54090e3a0ee1408cadf3cf86d19ef59b7 100644 (file)
--- a/common/rfb/ScaledPixelBuffer.cxx
+++ b/common/rfb/ScaledPixelBuffer.cxx
@@ -31,7 +31,7 @@ using namespace rfb;
 ScaledPixelBuffer::ScaledPixelBuffer(U8 **src_data_, int src_width_,
                                      int src_height_, int scale_, PixelFormat pf_)
   : scale(scale_), scale_ratio_x(1), scale_ratio_y(1), scaleFilterID(scaleFilterBilinear),
-    xWeightTabs(0), yWeightTabs(0), scaled_data(0), raccum(0), gaccum(0), baccum(0) {
+    xWeightTabs(0), yWeightTabs(0), raccum(0), gaccum(0), baccum(0), scaled_data(0) {
 
   setSourceBuffer(src_data_, src_width_, src_height_);
   setPF(pf_);
@@ -40,8 +40,8 @@ ScaledPixelBuffer::ScaledPixelBuffer(U8 **src_data_, int src_width_,
 ScaledPixelBuffer::ScaledPixelBuffer() 
   : src_width(0), src_height(0), scaled_width(0), scaled_height(0), scale(100), 
     scale_ratio_x(1), scale_ratio_y(1), scaleFilterID(scaleFilterBilinear),
-    xWeightTabs(0), yWeightTabs(0), src_data(0), scaled_data(0), raccum(0),
-    gaccum(0), baccum(0) {
+    xWeightTabs(0), yWeightTabs(0), raccum(0), gaccum(0), baccum(0),
+    src_data(0), scaled_data(0) {
   memset(&pf, 0, sizeof(pf));
 }
 

diff --git a/common/rfb/tightEncode.h b/common/rfb/tightEncode.h
index 71f076e606d07acb0812a4358f49765ecbad1195..d8939642d6177a969bd92fa6e01b46ae0fac0746 100644 (file)
--- a/common/rfb/tightEncode.h
+++ b/common/rfb/tightEncode.h
@@ -325,7 +325,9 @@ void TIGHT_ENCODE (const Rect& r, rdr::OutStream *os,
 #endif
                   )
 {
+#if (BPP != 8) || (BPP == 32)
   const PixelFormat& pf = cp->pf();
+#endif
   GET_IMAGE_INTO_BUF(r, buf);
   PIXEL_T* pixels = (PIXEL_T*)buf;
 

diff --git a/unix/vncviewer/CConn.cxx b/unix/vncviewer/CConn.cxx
index eabe33a0104bf15b5b0312f48d2c48eefe19cc94..cb330661a49c290eb76bb0987df578c9fe9db3a1 100644 (file)
--- a/unix/vncviewer/CConn.cxx
+++ b/unix/vncviewer/CConn.cxx
@@ -404,7 +404,7 @@ void CConn::menuSelect(long id, TXMenu* m) {
         tv.tv_sec = 0;
         tv.tv_usec = 200*1000;
         select(0, 0, 0, 0, &tv);
-        execlp(programName, programName, 0);
+        execlp(programName, programName, NULL);
         perror("execlp"); exit(1);
       }
       break;

diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
index dfa74cbdaf4a13701cf37e34c095575aa96845b8..4ab9adc5112244c8d8c464fb8070cc50f6531761 100644 (file)
--- a/unix/xserver/hw/vnc/XserverDesktop.cc
+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
@@ -248,7 +248,6 @@ void XserverDesktop::serverReset(ScreenPtr pScreen_)
 {
   pScreen = pScreen_;
   XID* ids = new XID[pScreen->maxInstalledCmaps];
-  int nmaps = (*pScreen->ListInstalledColormaps)(pScreen, ids);
   cmap = (ColormapPtr)LookupIDByType(ids[0], RT_COLORMAP);
   delete [] ids;
 }