diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-10-07 23:46:05 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-19 21:40:27 +0200 |
| commit | e2e45b2b3abf46e4e5c27d7c655769f2b693446e (patch) | |
| tree | 265fd610e8f45563804c32228df9ebafe3076c96 /nx-X11/lib/X11/cmsProp.c | |
| parent | 878040bf0bdb5d791cbe2ac6e07899c149517a79 (diff) | |
| download | nx-libs-e2e45b2b3abf46e4e5c27d7c655769f2b693446e.tar.gz nx-libs-e2e45b2b3abf46e4e5c27d7c655769f2b693446e.tar.bz2 nx-libs-e2e45b2b3abf46e4e5c27d7c655769f2b693446e.zip | |
Align files with upstream libX11-1.6.0
This commit looks a bit crazy at first glance. It (re-)introduces lots
of whitespaces and bad formatting.
Explanation: Backporting upstream changes lead to commits being
applied out of order. This meant a lot of manual intervention which in
turn lead to slight differences between upstream and NX.
With this commit these slight differences are minimized which will be
of great help when adding further upstream patches.
Diffstat (limited to 'nx-X11/lib/X11/cmsProp.c')
| -rw-r--r-- | nx-X11/lib/X11/cmsProp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/lib/X11/cmsProp.c b/nx-X11/lib/X11/cmsProp.c index 7e1a70310..a7aa5b5c5 100644 --- a/nx-X11/lib/X11/cmsProp.c +++ b/nx-X11/lib/X11/cmsProp.c @@ -128,11 +128,11 @@ _XcmsGetProperty( int xgwp_ret; while (True) { - xgwp_ret = XGetWindowProperty (pDpy, w, property, 0, len, False, - XA_INTEGER, &atom_ret, &format_ret, - &nitems_ret, &after_ret, - (unsigned char **)&prop_ret); - if (xgwp_ret == Success && after_ret > 0) { + xgwp_ret = XGetWindowProperty (pDpy, w, property, 0, len, False, + XA_INTEGER, &atom_ret, &format_ret, + &nitems_ret, &after_ret, + (unsigned char **)&prop_ret); + if (xgwp_ret == Success && after_ret > 0) { len += nitems_ret * (format_ret >> 3); XFree (prop_ret); } else { @@ -140,7 +140,7 @@ _XcmsGetProperty( } } if (xgwp_ret != Success || format_ret == 0 || nitems_ret == 0) { - /* the property does not exist or is of an unexpected type or + /* the property does not exist or is of an unexpected type or getting window property failed */ return(XcmsFailure); } |