Merge branch 'uli42-pr/fix_clang_warnings' into 3.6.x

nx-X11/lib/include/X11/Xlibint.h

@@ -709,12 +709,12 @@ extern void _XFlushGCCache(Display *dpy, GC gc);
 #define Data32(dpy, data, len) _XData32(dpy, (_Xconst long *)data, len)
 extern int _XData32(
 	     Display *dpy,
-             register _Xconst long *data,
+             _Xconst long *data,
 	     unsigned len
 );
 extern void _XRead32(
 	     Display *dpy,
-	     register long *data,
+	     long *data,
 	     long len
 );
 #else
@@ -1415,10 +1415,10 @@ extern int _XF86LoadQueryLocaleFont(
 );
 
 extern void _XProcessWindowAttributes (
-    register Display *dpy,
+    Display *dpy,
     xChangeWindowAttributesReq *req,
-    register unsigned long valuemask,
-    register XSetWindowAttributes *attributes);
+    unsigned long valuemask,
+    XSetWindowAttributes *attributes);
 
 extern int _XDefaultError(
         Display *dpy,
@@ -1428,7 +1428,7 @@ extern int _XDefaultIOError(
         Display *dpy);
 
 extern void _XSetClipRectangles (
-    register Display *dpy,
+    Display *dpy,
     GC gc,
     int clip_x_origin, int clip_y_origin,
     XRectangle *rectangles,
@@ -1436,13 +1436,13 @@ extern void _XSetClipRectangles (
     int ordering);
 
 Status _XGetWindowAttributes(
-    register Display *dpy,
+    Display *dpy,
     Window w,
     XWindowAttributes *attr);
 
 int _XPutBackEvent (
-    register Display *dpy,
-    register XEvent *event);
+    Display *dpy,
+    XEvent *event);
 
 extern Bool _XIsEventCookie(
         Display *dpy,

nx-X11/lib/src/xkb/XKBBind.c

@@ -165,7 +165,7 @@ XKeysymToKeycode(Display *dpy, KeySym ks)
         for (i = dpy->min_keycode; i <= dpy->max_keycode; i++) {
             if (j < (int) XkbKeyNumSyms(xkb, i)) {
                 gotOne = 1;
-                if ((XkbKeySym(xkb, i, j) == ks))
+                if (XkbKeySym(xkb, i, j) == ks)
                     return i;
             }
         }

nxcomp/src/GenericReply.h

@@ -83,7 +83,6 @@ class GenericReplyMessage : public Message
   private:
 
   unsigned char  byte_data;
-  unsigned int   int_data[6];
   unsigned short short_data[12];
 };
 

nxcomp/src/Timestamp.cpp

@@ -49,7 +49,6 @@ std::string strTimestamp(const T_timestamp &ts)
   std::string ret;
 
   char ctime_now[26] = { };
-  bool err = true;
 
 #if HAVE_CTIME_S
   errno_t retval = ::ctime_s(ctime_now, sizeof(ctime_now), static_cast<const time_t*>(&ts.tv_sec));

nxcomp/src/TranslateCoords.h

@@ -84,10 +84,10 @@ class TranslateCoordsMessage : public Message
   unsigned int  src_x;
   unsigned int  src_y;
 
-  unsigned char r_same_screen;
-  unsigned int  r_child_window;
-  unsigned int  r_dst_x;
-  unsigned int  r_dst_y;
+  // unsigned char r_same_screen;
+  // unsigned int  r_child_window;
+  // unsigned int  r_dst_x;
+  // unsigned int  r_dst_y;
 };
 
 class TranslateCoordsStore : public MessageStore

nxcompshad/src/Logger.h

@@ -29,9 +29,6 @@
 #include <cerrno>
 #include <cstdarg>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-
 //
 // Error handling macros.
 //
@@ -46,17 +43,17 @@ class Logger
 {
   public:
 
-  void user(const char *format, ...) __attribute__((format(gnu_printf, 2, 3)));
+  void user(const char *format, ...) __attribute__((format(printf, 2, 0)));
 
   void error(const char *name, int error);
 
-  void warning(const char *name, const char *format, ...) __attribute__((format(gnu_printf, 3, 4)));
+  void warning(const char *name, const char *format, ...) __attribute__((format(printf, 3, 0)));
 
-  void test(const char *name, const char *format, ...) __attribute__((format(gnu_printf, 3, 4)));
+  void test(const char *name, const char *format, ...) __attribute__((format(printf, 3, 0)));
 
   void trace(const char *name);
 
-  void debug(const char *name, const char *format, ...) __attribute__((format(gnu_printf, 3, 4)));
+  void debug(const char *name, const char *format, ...) __attribute__((format(printf, 3, 0)));
 
   void dump(const char *name, const char *data, int size);
 };
@@ -68,7 +65,7 @@ static inline void logError(const char *name, int error) \
     __attribute__((__unused__));
 
 static inline void logWarning(const char *name, const char *format, ...) \
-    __attribute__((__unused__));
+    __attribute__((format(printf, 2, 3))) __attribute__((__unused__));
 
 static inline void logTest(const char *name, const char *format, ...) \
     __attribute__((format(printf, 2, 3))) __attribute__((__unused__));
@@ -167,6 +164,4 @@ static inline void logDump(const char *name, const char *data, int size)
   #endif
 }
 
-#pragma GCC diagnostic pop
-
 #endif /* Logger_H */

nxcompshad/src/X11.h

@@ -77,10 +77,6 @@ class Poller : public CorePoller
 
   Damage damage_;
 
-  Region repair_;
-
-  char damageChanges_;
-
   XShmSegmentInfo *shminfo_;
 
   XImage *image_;