hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-21 01:13:38 +00:00
Code Issues Projects Releases Wiki Activity

xkb: improve error messages
Some checks are pending
Build X servers / xserver-build-ubuntu (push) Waiting to run
Details
Build X servers / drivers-build-ubuntu (push) Waiting to run
Details
Build X servers / xserver-build-mingw32-ubuntu (push) Waiting to run
Details
Build X servers / xserver-build-macos (push) Waiting to run
Details
Build X servers / xserver-build-freebsd (push) Waiting to run
Details
Build X servers / xserver-build-dragonflybsd (push) Waiting to run
Details
Build X servers / xserver-build-netbsd (push) Waiting to run
Details
Build X servers / xserver-build-cygwin (push) Waiting to run
Details
Build X servers / xserver-build-arch (push) Waiting to run
Details
Build X servers / Check Signed-Off-By (push) Waiting to run
Details
Build X servers / Release pushed tag (push) Blocked by required conditions
Details
check PRs for merge conflicts / notify (push) Waiting to run
Details

Browse source 
Make error messages on failed childbuf size check more clear on where
the problem is coming from.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2026-05-18 12:23:00 +02:00 • committed by Enrico Weigelt
commit 58cedffac1
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
xkb/xkb.c
View file

@ -5964,7 +5964,7 @@ ProcXkbGetKbdByName(ClientPtr client)
return BadAlloc;
if (childbuf.wpos != (mrep.length * 4))
LogMessage(X_WARNING, "ProcXkbGetKbdByName() childbuf size (%ld) mismatch mrep size (%ld // %ld units)\n",
LogMessage(X_WARNING, "ProcXkbGetKbdByName() childbuf size (%ld) mismatch after XkbAssembleMap(): mrep size (%ld // %ld units)\n",
(unsigned long)childbuf.wpos, (unsigned long)mrep.length * 4, (unsigned long)mrep.length);
if (client->swapped) {
@ -5985,7 +5985,7 @@ ProcXkbGetKbdByName(ClientPtr client)
XkbAssembleCompatMap(client, new->compat, crep, &childbuf);
if (childbuf.wpos != (crep.length * 4))
LogMessage(X_WARNING, "ProcXkbGetKbdByName() childbuf size (%ld) mismatch crep size (%ld // %ld units)\n",
LogMessage(X_WARNING, "ProcXkbGetKbdByName() childbuf size (%ld) mismatch after XkbAssembleCompatMap(): crep size (%ld // %ld units)\n",
(unsigned long)childbuf.wpos, (unsigned long)crep.length * 4, (unsigned long)crep.length);
if (client->swapped) {
@ -6009,7 +6009,7 @@ ProcXkbGetKbdByName(ClientPtr client)
return BadAlloc;
if (childbuf.wpos != (irep.length * 4))
LogMessage(X_WARNING, "ProcXkbGetKbdByName() childbuf size (%ld) mismatch irep size (%ld // %ld units)\n",
LogMessage(X_WARNING, "ProcXkbGetKbdByName() childbuf size (%ld) mismatch after XkbAssembleIndicatorMap(): irep size (%ld // %ld units)\n",
(unsigned long)childbuf.wpos, (unsigned long)irep.length * 4, (unsigned long)irep.length);
if (client->swapped) {
@ -6029,7 +6029,7 @@ ProcXkbGetKbdByName(ClientPtr client)
XkbAssembleNames(client, new, nrep, &childbuf);
if (childbuf.wpos != (nrep.length * 4))
LogMessage(X_WARNING, "ProcXkbGetKbdByName() childbuf size (%ld) mismatch nrep size (%ld // %ld units)\n",
LogMessage(X_WARNING, "ProcXkbGetKbdByName() childbuf size (%ld) mismatch after XkbAssembleNames(): nrep size (%ld // %ld units)\n",
(unsigned long)childbuf.wpos, (unsigned long)nrep.length * 4, (unsigned long)nrep.length);
if (client->swapped) {