[Intel-gfx] [PATCH xf86-video-intel 20/21] tools: Get rid of -Wno-sign-compare

[Ville Syrjala]

From: Ville Syrjälä <ville.syrj...@linux.intel.com>

Fix the sign comparison warnings by changing some types, and
using a few casts.

Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
 tools/backlight_helper.c |  2 +-
 tools/meson.build        |  2 --
 tools/virtual.c          | 18 +++++++++---------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/tools/backlight_helper.c b/tools/backlight_helper.c
index aadb8fac92ba..65151a534009 100644
--- a/tools/backlight_helper.c
+++ b/tools/backlight_helper.c
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
 
        if (snprintf(buf, sizeof(buf),
                     "/sys/class/backlight/%s/brightness",
-                    argv[1]) >= sizeof(buf))
+                    argv[1]) >= (int)sizeof(buf))
                die("Invalid interface '%s': name too long\n", argv[1]);
 
        fd = open(buf, O_RDWR);
diff --git a/tools/meson.build b/tools/meson.build
index b4621abb3c7c..3df33385be3b 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -17,7 +17,6 @@ if with_tools
             ],
             c_args : [
               '-Wno-unused-parameter',
-              '-Wno-sign-compare',
             ],
             install : true)
 
@@ -81,7 +80,6 @@ if with_backlight_helper
             install_mode : [ 'rws--x--x', 'root', 'root' ],
             c_args : [
               '-DMAJOR_IN_SYSMACROS',
-              '-Wno-sign-compare',
             ],
             install : true)
 
diff --git a/tools/virtual.c b/tools/virtual.c
index fc8db2b9f2e2..010a3aab7cf3 100644
--- a/tools/virtual.c
+++ b/tools/virtual.c
@@ -121,7 +121,7 @@ struct display {
        int cursor_y;
        int cursor_moved;
        int cursor_visible;
-       int cursor;
+       Cursor cursor;
 
        int flush;
        int send;
@@ -148,7 +148,7 @@ struct output {
        Pixmap pixmap;
        GC gc;
 
-       long serial;
+       unsigned long serial;
        int use_shm;
        int use_shm_pixmap;
        XShmSegmentInfo shm;
@@ -166,7 +166,7 @@ struct clone {
        struct clone *active;
 
        struct output src, dst;
-       long timestamp;
+       Time timestamp;
 
        XShmSegmentInfo shm;
        XImage image;
@@ -194,8 +194,8 @@ struct context {
 
        int timer_active;
 
-       long timestamp;
-       long configTimestamp;
+       Time timestamp;
+       Time configTimestamp;
 
        Atom singleton;
        char command[1024];
@@ -597,7 +597,7 @@ static int mode_equal(const XRRModeInfo *a, const 
XRRModeInfo *b)
                a->modeFlags == b->modeFlags);
 }
 
-static XRRModeInfo *lookup_mode(XRRScreenResources *res, int id)
+static XRRModeInfo *lookup_mode(XRRScreenResources *res, RRMode id)
 {
        int i;
 
@@ -3055,7 +3055,7 @@ static int first_display_send_command(struct context 
*ctx, int timeout,
        va_start(va, format);
        len = vsnprintf(buf+4, sizeof(buf)-4, format, va)+5;
        va_end(va);
-       assert(len < sizeof(buf));
+       assert(len < (int)sizeof(buf));
 
        DBG(X11, ("%s: send command '%s'\n", DisplayString(display->dpy), buf));
 
@@ -3063,7 +3063,7 @@ static int first_display_send_command(struct context 
*ctx, int timeout,
        while (len) {
                XClientMessageEvent msg;
                int n = len;
-               if (n > sizeof(msg.data.b))
+               if (n > (int)sizeof(msg.data.b))
                        n = sizeof(msg.data.b);
                len -= n;
 
@@ -3113,7 +3113,7 @@ static void first_display_handle_command(struct context 
*ctx,
        for (len = 0; len < 20 && msg[len]; len++)
                ;
 
-       if (ctx->command_continuation + len > sizeof(ctx->command)) {
+       if (ctx->command_continuation + len > (int)sizeof(ctx->command)) {
                ctx->command_continuation = 0;
                return;
        }
-- 
2.21.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx