[X2Go-Commits] [nx-libs] 01/02: nxcompshad: silence GCC warnings

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 2cade632b475ecc1a115692ec44bbb36a447ce8b
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Wed Dec 27 23:54:34 2017 +0100

    nxcompshad: silence GCC warnings
    
    Fixes ArcticaProject/nx-libs#572
---
 nxcompshad/src/Core.cpp | 18 ++++++++++++++----
 nxcompshad/src/Logger.h |  5 +++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/nxcompshad/src/Core.cpp b/nxcompshad/src/Core.cpp
index f92f85c..39ac4a3 100644
--- a/nxcompshad/src/Core.cpp
+++ b/nxcompshad/src/Core.cpp
@@ -337,7 +337,10 @@ int CorePoller::isChanged(int (*checkIfInputCallback)(void *), void *arg, int *s
       }
     }
 
-    XRectangle rect = {0, curLine, width_, 1};
+    XRectangle rect = {0,
+                       static_cast<short>(curLine),
+                       static_cast<unsigned short>(width_),
+                       1};
 
     char *buffer;
 
@@ -443,9 +446,13 @@ int CorePoller::isChanged(int (*checkIfInputCallback)(void *), void *arg, int *s
         break;
       }
 
-      if ((curWorkLine - last > minSliceHeight_) || (last - start > maxSliceHeight_))
+      if ((curWorkLine - last > minSliceHeight_) ||
+          (last - start > maxSliceHeight_))
       {
-        XRectangle rect = {left, start, right - left + 1, last - start + 1};
+        XRectangle rect = {static_cast<short>(left),
+                           static_cast<short>(start),
+                           static_cast<unsigned short>(right - left + 1),
+                           static_cast<unsigned short>(last - start + 1)};
 
         XUnionRectWithRegion(&rect, lastUpdatedRegion_, lastUpdatedRegion_);
 
@@ -477,7 +484,10 @@ int CorePoller::isChanged(int (*checkIfInputCallback)(void *), void *arg, int *s
 
     if (last >= start)
     {
-      XRectangle rect = {left, start, right - left + 1, last - start + 1};
+      XRectangle rect = {static_cast<short>(left),
+                         static_cast<short>(start),
+                         static_cast<unsigned short>(right - left + 1),
+                         static_cast<unsigned short>(last - start + 1)};
 
       XUnionRectWithRegion(&rect, lastUpdatedRegion_, lastUpdatedRegion_);
     }
diff --git a/nxcompshad/src/Logger.h b/nxcompshad/src/Logger.h
index 37b378c..876cb04 100644
--- a/nxcompshad/src/Logger.h
+++ b/nxcompshad/src/Logger.h
@@ -29,6 +29,9 @@
 #include <cerrno>
 #include <cstdarg>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+
 //
 // Error handling macros.
 //
@@ -164,4 +167,6 @@ static inline void logDump(const char *name, const char *data, int size)
   #endif
 }
 
+#pragma GCC diagnostic pop
+
 #endif /* Logger_H */

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git