xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 test/meson.build                 |    1 +
 test/simple-xinit.c              |    4 +++-
 test/xi2/protocol-eventconvert.c |    4 +---
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 4e53612347613a930bcd43d67fd9fe49f07ee4c2
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Mar 20 20:00:37 2024 +0100

    test: xi2: drop unused variable
    
    fix warning:
    
    > ../test/xi2/protocol-eventconvert.c:276:9: warning: variable 'buttons' set but not used [-Wunused-but-set-variable]
    >     int buttons, valuators;
    >         ^
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1429>

diff --git a/test/xi2/protocol-eventconvert.c b/test/xi2/protocol-eventconvert.c
index eb34f5b42..fb0627bb5 100644
--- a/test/xi2/protocol-eventconvert.c
+++ b/test/xi2/protocol-eventconvert.c
@@ -273,7 +273,7 @@ test_convert_XIRawEvent(void)
 static void
 test_values_XIDeviceEvent(DeviceEvent *in, xXIDeviceEvent * out, BOOL swap)
 {
-    int buttons, valuators;
+    int valuators;
     int i;
     unsigned char *ptr;
     uint32_t flagmask = 0;
@@ -347,11 +347,9 @@ test_values_XIDeviceEvent(DeviceEvent *in, xXIDeviceEvent * out, BOOL swap)
     assert(out->root_x == double_to_fp1616(in->root_x + in->root_x_frac));
     assert(out->root_y == double_to_fp1616(in->root_y + in->root_y_frac));
 
-    buttons = 0;
     for (i = 0; i < bits_to_bytes(sizeof(in->buttons)); i++) {
         if (XIMaskIsSet(in->buttons, i)) {
             assert(out->buttons_len >= bytes_to_int32(bits_to_bytes(i)));
-            buttons++;
         }
     }
 
commit f7a97a7ab0d196c9a771107f57cb550d9eec7233
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Mar 20 19:55:57 2024 +0100

    test: simple-xinit: add _X_NORETURN
    
    fix warning:
    
    > ../test/simple-xinit.c:58:1: warning: function 'usage' could be declared with attribute 'noreturn' [-Wmissing-noreturn]
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1429>

diff --git a/test/meson.build b/test/meson.build
index afa08abb2..79e1a11aa 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -2,6 +2,7 @@ simple_xinit = executable(
     'simple-xinit',
     'simple-xinit.c',
     include_directories: inc,
+    dependencies: [ xproto_dep ],
 )
 
 piglit_env = environment()
diff --git a/test/simple-xinit.c b/test/simple-xinit.c
index e85b48092..57e7eed57 100644
--- a/test/simple-xinit.c
+++ b/test/simple-xinit.c
@@ -25,6 +25,8 @@
 #include <dix-config.h>
 #endif
 
+#include <X11/Xfuncproto.h>
+
 #include <errno.h>
 #include <signal.h>
 #include <stdbool.h>
@@ -53,7 +55,7 @@ kill_server(int server_pid)
     }
 }
 
-static void
+_X_NORETURN static void
 usage(int argc, char **argv)
 {
     fprintf(stderr, "%s <client command> -- <server command>\n", argv[0]);