use casts to reduce compiler warnings (no object change)

Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>

11 files changed, 42 insertions, 42 deletions

diff --git a/src/ChProp.c b/src/ChProp.c
index 190a224f..1089a4c9 100644
--- a/src/ChProp.c
+++ b/src/ChProp.c
@@ -45,16 +45,16 @@ XChangeProperty (
 
     LockDisplay(dpy);
     GetReq (ChangeProperty, req);
-    req->window = w;
-    req->property = property;
-    req->type = type;
-    req->mode = mode;
+    req->window = (CARD32) w;
+    req->property = (CARD32) property;
+    req->type = (CARD32) type;
+    req->mode = (CARD8) mode;
     if (nelements < 0) {
 	req->nUnits = 0;
 	req->format = 0; /* ask for garbage, get garbage */
     } else {
-	req->nUnits = nelements;
-	req->format = format;
+	req->nUnits = (CARD32) nelements;
+	req->format = (CARD8) format;
     }
 
     switch (req->format) {
diff --git a/src/DrArcs.c b/src/DrArcs.c
index 14405aa3..bd010050 100644
--- a/src/DrArcs.c
+++ b/src/DrArcs.c
@@ -45,8 +45,8 @@ XDrawArcs(
     LockDisplay(dpy);
     FlushGC(dpy, gc);
     GetReq(PolyArc,req);
-    req->drawable = d;
-    req->gc = gc->gid;
+    req->drawable = (CARD32) d;
+    req->gc = (CARD32) gc->gid;
     len = ((long)n_arcs) * arc_scale;
     SetReqLen(req, len, 1);
     len <<= 2; /* watch out for macros... */
diff --git a/src/DrLines.c b/src/DrLines.c
index 68071b6b..460aabaa 100644
--- a/src/DrLines.c
+++ b/src/DrLines.c
@@ -43,9 +43,9 @@ XDrawLines (
     LockDisplay(dpy);
     FlushGC(dpy, gc);
     GetReq (PolyLine, req);
-    req->drawable = d;
-    req->gc = gc->gid;
-    req->coordMode = mode;
+    req->drawable = (CARD32) d;
+    req->gc = (CARD32) gc->gid;
+    req->coordMode = (BYTE) mode;
     SetReqLen(req, npoints, 65535 - req->length);
     /* each point is 2 16-bit integers */
     length = npoints << 2;		/* watch out for macros... */
diff --git a/src/DrPoints.c b/src/DrPoints.c
index 287fa057..e7f946b0 100644
--- a/src/DrPoints.c
+++ b/src/DrPoints.c
@@ -49,12 +49,12 @@ XDrawPoints(
     FlushGC(dpy, gc);
     while (n_points) {
 	GetReq(PolyPoint, req);
-	req->drawable = d;
-	req->gc = gc->gid;
-	req->coordMode = mode;
+	req->drawable = (CARD32) d;
+	req->gc = (CARD32) gc->gid;
+	req->coordMode = (BYTE) mode;
 	n = n_points;
 	if (!dpy->bigreq_size && n > (dpy->max_request_size - req->length))
-	    n = dpy->max_request_size - req->length;
+	    n = (int) (dpy->max_request_size - req->length);
 	SetReqLen(req, n, n);
 	nbytes = ((long)n) << 2; /* watch out for macros... */
 	if (xoff || yoff) {
diff --git a/src/DrRects.c b/src/DrRects.c
index 7827bf18..13757562 100644
--- a/src/DrRects.c
+++ b/src/DrRects.c
@@ -45,12 +45,12 @@ XDrawRectangles(
     FlushGC(dpy, gc);
     while (n_rects) {
 	GetReq(PolyRectangle, req);
-	req->drawable = d;
-	req->gc = gc->gid;
+	req->drawable = (CARD32) d;
+	req->gc = (CARD32) gc->gid;
 	n = n_rects;
 	len = ((long)n) << 1;
 	if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) {
-	    n = (dpy->max_request_size - req->length) >> 1;
+	    n = (int) ((dpy->max_request_size - req->length) >> 1);
 	    len = ((long)n) << 1;
 	}
 	SetReqLen(req, len, len);
diff --git a/src/DrSegs.c b/src/DrSegs.c
index 93eab4d0..59bf463d 100644
--- a/src/DrSegs.c
+++ b/src/DrSegs.c
@@ -45,12 +45,12 @@ XDrawSegments (
     FlushGC(dpy, gc);
     while (nsegments) {
 	GetReq (PolySegment, req);
-	req->drawable = d;
-	req->gc = gc->gid;
+	req->drawable = (CARD32) d;
+	req->gc = (CARD32) gc->gid;
 	n = nsegments;
 	len = ((long)n) << 1;
 	if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) {
-	    n = (dpy->max_request_size - req->length) >> 1;
+	    n = (int) ((dpy->max_request_size - req->length) >> 1);
 	    len = ((long)n) << 1;
 	}
 	SetReqLen(req, len, len);
diff --git a/src/FillArcs.c b/src/FillArcs.c
index 62cfabf8..3d0b62f0 100644
--- a/src/FillArcs.c
+++ b/src/FillArcs.c
@@ -47,12 +47,12 @@ XFillArcs(
     FlushGC(dpy, gc);
     while (n_arcs) {
 	GetReq(PolyFillArc, req);
-	req->drawable = d;
-	req->gc = gc->gid;
+	req->drawable = (CARD32) d;
+	req->gc = (CARD32) gc->gid;
 	n = n_arcs;
 	len = ((long)n) * arc_scale;
 	if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) {
-	    n = (dpy->max_request_size - req->length) / arc_scale;
+	    n = (int) ((dpy->max_request_size - req->length) / arc_scale);
 	    len = ((long)n) * arc_scale;
 	}
 	SetReqLen(req, len, len);
diff --git a/src/FillPoly.c b/src/FillPoly.c
index ea162a41..8c3bfabf 100644
--- a/src/FillPoly.c
+++ b/src/FillPoly.c
@@ -46,10 +46,10 @@ XFillPolygon(
     FlushGC(dpy, gc);
     GetReq(FillPoly, req);
 
-    req->drawable = d;
-    req->gc = gc->gid;
-    req->shape = shape;
-    req->coordMode = mode;
+    req->drawable = (CARD32) d;
+    req->gc = (CARD32) gc->gid;
+    req->shape = (BYTE) shape;
+    req->coordMode = (BYTE) mode;
 
     SetReqLen(req, n_points, 65535 - req->length);
 
diff --git a/src/FillRcts.c b/src/FillRcts.c
index ad334244..a14afcf1 100644
--- a/src/FillRcts.c
+++ b/src/FillRcts.c
@@ -45,12 +45,12 @@ XFillRectangles(
     FlushGC(dpy, gc);
     while (n_rects) {
 	GetReq(PolyFillRectangle, req);
-	req->drawable = d;
-	req->gc = gc->gid;
+	req->drawable = (CARD32) d;
+	req->gc = (CARD32) gc->gid;
 	n = n_rects;
 	len = ((long)n) << 1;
 	if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) {
-	    n = (dpy->max_request_size - req->length) >> 1;
+	    n = (int) ((dpy->max_request_size - req->length) >> 1);
 	    len = ((long)n) << 1;
 	}
 	SetReqLen(req, len, len);
diff --git a/src/QuColors.c b/src/QuColors.c
index 10cf1825..099f1a4e 100644
--- a/src/QuColors.c
+++ b/src/QuColors.c
@@ -43,7 +43,7 @@ _XQueryColors(
 
     GetReq(QueryColors, req);
 
-    req->cmap = cmap;
+    req->cmap = (CARD32) cmap;
     SetReqLen(req, ncolors, ncolors); /* each pixel is a CARD32 */
 
     for (i = 0; i < ncolors; i++)
@@ -51,11 +51,11 @@ _XQueryColors(
        /* XXX this isn't very efficient */
 
     if (_XReply(dpy, (xReply *) &rep, 0, xFalse) != 0) {
-	xrgb *color = Xmallocarray(ncolors, sizeof(xrgb));
+	xrgb *color = Xmallocarray((size_t) ncolors, sizeof(xrgb));
 	if (color != NULL) {
-            unsigned long nbytes = (long) ncolors * SIZEOF(xrgb);
+            unsigned long nbytes = (size_t) ncolors * SIZEOF(xrgb);
 
-	    _XRead(dpy, (char *) color, nbytes);
+	    _XRead(dpy, (char *) color, (long) nbytes);
 
 	    for (i = 0; i < ncolors; i++) {
 		register XColor *def = &defs[i];
@@ -82,9 +82,9 @@ XQueryColors(
     int n;
 
     if (dpy->bigreq_size > 0)
-	n = dpy->bigreq_size - (sizeof (xQueryColorsReq) >> 2) - 1;
+	n = (int) (dpy->bigreq_size - (sizeof (xQueryColorsReq) >> 2) - 1);
     else
-	n = dpy->max_request_size - (sizeof (xQueryColorsReq) >> 2);
+	n = (int) (dpy->max_request_size - (sizeof (xQueryColorsReq) >> 2));
 
     LockDisplay(dpy);
     while (ncolors >= n) {
diff --git a/src/SetCRects.c b/src/SetCRects.c
index b18c449a..1de2e3f1 100644
--- a/src/SetCRects.c
+++ b/src/SetCRects.c
@@ -44,16 +44,16 @@ void _XSetClipRectangles (
     register _XExtension *ext;
 
     GetReq (SetClipRectangles, req);
-    req->gc = gc->gid;
-    req->xOrigin = gc->values.clip_x_origin = clip_x_origin;
-    req->yOrigin = gc->values.clip_y_origin = clip_y_origin;
-    req->ordering = ordering;
+    req->gc = (CARD32) gc->gid;
+    req->xOrigin = (INT16) (gc->values.clip_x_origin = clip_x_origin);
+    req->yOrigin = (INT16) (gc->values.clip_y_origin = clip_y_origin);
+    req->ordering = (BYTE) ordering;
     len = ((long)n) << 1;
     SetReqLen(req, len, 1);
     len <<= 2;
     Data16 (dpy, (short *) rectangles, len);
     gc->rects = 1;
-    dirty = gc->dirty & ~(GCClipMask | GCClipXOrigin | GCClipYOrigin);
+    dirty = (gc->dirty & (unsigned long) ~(GCClipMask | GCClipXOrigin | GCClipYOrigin));
     gc->dirty = GCClipMask | GCClipXOrigin | GCClipYOrigin;
     /* call out to any extensions interested */
     for (ext = dpy->ext_procs; ext; ext = ext->next)