[X2Go-Commits] [nx-libs] 299/429: Compext.c: fix misleading error message

[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 3228dcfc5643e18bc7f115b7ac835267d13f42ee
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Wed Mar 10 23:04:01 2021 +0100

    Compext.c: fix misleading error message
    
    An X reply contains a type which is X_Reply or X_Error. This is not an
    opcode which is used when installing the handler.
---
 nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
index 7fd54e86f..7e5a9799d 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
@@ -3461,7 +3461,7 @@ static Bool _NXCollectImageHandler(Display *dpy, xReply *rep, char *buf,
           ((CARD16)(state -> sequence) % 65536))
   {
     #ifdef TEST_IMAGE
-    fprintf(stderr, "******_NXCollectImageHandler: Unmatched sequence [%d] for opcode [%d] "
+    fprintf(stderr, "******_NXCollectImageHandler: Unmatched sequence [%d] of type [%d] "
                 "with length [%d].\n", rep -> generic.sequenceNumber, rep -> generic.type,
                     (int) rep -> generic.length << 2);
     #endif
@@ -3856,9 +3856,10 @@ static Bool _NXCollectPropertyHandler(Display *dpy, xReply *rep, char *buf,
           ((CARD16)(state -> sequence) % 65536))
   {
     #ifdef TEST_PROPERTY
-    fprintf(stderr, "******_NXCollectPropertyHandler: Unmatched sequence [%d] for opcode [%d] "
-                "with length [%d].\n", rep -> generic.sequenceNumber, rep -> generic.type,
+    fprintf(stderr, "******_NXCollectPropertyHandler: Unmatched sequence [%d] of type [%d] "
+            "with length [%d].\n", rep -> generic.sequenceNumber, rep -> generic.type,
                     (int) rep -> generic.length << 2);
+
     #endif
 
     return False;
@@ -4228,7 +4229,7 @@ static Bool _NXCollectGrabPointerHandler(Display *dpy, xReply *rep, char *buf,
           ((CARD16)(state -> sequence) % 65536))
   {
     #ifdef TEST_POINTER
-    fprintf(stderr, "******_NXCollectGrabPointerHandler: Unmatched sequence [%d] for opcode [%d] "
+    fprintf(stderr, "******_NXCollectGrabPointerHandler: Unmatched sequence [%d] of type [%d] "
                 "with length [%d].\n", rep -> generic.sequenceNumber, rep -> generic.type,
                     (int) rep -> generic.length << 2);
     #endif
@@ -4520,7 +4521,7 @@ static Bool _NXCollectInputFocusHandler(Display *dpy, xReply *rep, char *buf,
           ((CARD16)(state -> sequence) % 65536))
   {
     #ifdef TEST_INPUT
-    fprintf(stderr, "******_NXCollectInputFocusHandler: Unmatched sequence [%d] for opcode [%d] "
+    fprintf(stderr, "******_NXCollectInputFocusHandler: Unmatched sequence [%d] of type [%d] "
                 "with length [%d].\n", rep -> generic.sequenceNumber, rep -> generic.type,
                     (int) rep -> generic.length << 2);
     #endif

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