Attachment 41238 Details for Bug 9160 – patch v2

[patch] patch v2

patch.diff (text/plain), 1.39 KB, created by Kusanagi Kouichi on 2010-12-18 09:02:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kusanagi Kouichi

Created: 2010-12-18 09:02:52 UTC

Size: 1.39 KB

patch

obsolete

>diff --git a/src/QuColors.c b/src/QuColors.c
>index e51375f..237b8bf 100644
>--- a/src/QuColors.c
>+++ b/src/QuColors.c
>@@ -29,8 +29,8 @@ in this Software without prior written authorization from The Open Group.
> #endif
> #include "Xlibint.h"
> 
>-int
>-XQueryColors(
>+static void
>+_XQueryColors(
>     register Display *dpy,
>     Colormap cmap,
>     XColor *defs, 		/* RETURN */
>@@ -42,11 +42,10 @@ XQueryColors(
>     long nbytes;
>     register xQueryColorsReq *req;
> 
>-    LockDisplay(dpy);
>     GetReq(QueryColors, req);
> 
>     req->cmap = cmap;
>-    req->length += ncolors; /* each pixel is a CARD32 */
>+    SetReqLen(req, ncolors, ncolors); /* each pixel is a CARD32 */
> 
>     for (i = 0; i < ncolors; i++)
>       Data32 (dpy, (long *)&defs[i].pixel, 4L);
>@@ -70,8 +69,31 @@ XQueryColors(
> 	}
> 	else _XEatData(dpy, (unsigned long) nbytes);
>     }
>+}
>+
>+int
>+XQueryColors(
>+    register Display * const dpy,
>+    const Colormap cmap,
>+    XColor *defs, 		/* RETURN */
>+    int ncolors)
>+{
>+    int n;
>+
>+    if (dpy->bigreq_size > 0)
>+	n = dpy->bigreq_size - (sizeof (xQueryColorsReq) >> 2) - 1;
>+    else
>+	n = dpy->max_request_size - (sizeof (xQueryColorsReq) >> 2);
>+
>+    LockDisplay(dpy);
>+    while (ncolors >= n) {
>+	_XQueryColors(dpy, cmap, defs, n);
>+	defs += n;
>+	ncolors -= n;
>+    }
>+    if (ncolors > 0)
>+	_XQueryColors(dpy, cmap, defs, ncolors);
>     UnlockDisplay(dpy);
>     SyncHandle();
>     return 1;
> }
>-

Actions: View | Splinter Review

Attachments on bug 9160: 7902 | 41238

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.