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 b8b1edb2b3507386de9c9fbe6f7b0f0347a22001 Author: Ulrich Sibiller <uli42@gmx.de> Date: Sat Jan 30 16:10:21 2021 +0100 NXproperty.c: GetWindowProperty(): add more comments, restruct prototype --- nx-X11/programs/Xserver/hw/nxagent/NXproperty.c | 35 +++++++++++-------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c index 9e14a3cca..f4979ceb3 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXproperty.c @@ -446,25 +446,20 @@ ProcGetProperty(ClientPtr client) return(client->noClientException); } -#ifdef NXAGENT_CLIPBOARD -/* GetWindowProperty clipboard use only */ -/* FIXME: that's wrong, it is also called in Window.c and Events.c */ -/* FIXME: should be moved to a different file, is not derived from - dix */ +/* + * GetWindowProperty is the internal implementation of the + * XGetWindowProperty() Xlib call. It is called from + * Clipboard.c, Window.c and Events.c + * + * FIXME: should be moved to a different file, is not derived from + * dix + */ int -GetWindowProperty(pWin, property, longOffset, longLength, delete, - type, actualType, format, nItems, bytesAfter, propData ) - WindowPtr pWin; - Atom property; - long longOffset; - long longLength; - Bool delete; - Atom type; - Atom *actualType; - int *format; - unsigned long *nItems; - unsigned long *bytesAfter; - unsigned char **propData; +GetWindowProperty(WindowPtr pWin, Atom property, long longOffset, + long longLength, Bool delete, Atom type, + Atom *actualType, int *format, unsigned + long *nItems, unsigned long *bytesAfter, + unsigned char **propData) { if (!pWin) { @@ -527,7 +522,7 @@ GetWindowProperty(pWin, property, longOffset, longLength, delete, * Return type, format, value to client */ unsigned long n = (pProp->format/8) * pProp->size; /* size (bytes) of prop */ - unsigned long ind = longOffset << 2; + unsigned long ind = longOffset << 2; /* byte offset */ /* If longOffset is invalid such that it causes "len" to be negative, it's a value error. */ @@ -540,6 +535,7 @@ GetWindowProperty(pWin, property, longOffset, longLength, delete, return BadValue; } + /* minimum of prop size and requested size */ unsigned long len = min(n - ind, 4 * longLength); *bytesAfter = n - (ind + len); @@ -577,7 +573,6 @@ GetWindowProperty(pWin, property, longOffset, longLength, delete, } return Success; } -#endif int ProcDeleteProperty(register ClientPtr client) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git