 @@ -31,37 +31,26 @@ from Kaleb S. KEITHLEY.
 /* THIS IS NOT AN X CONSORTIUM STANDARD */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 #include <X11/Xlibint.h>
 #include <X11/extensions/xf86vmproto.h>
 #include <X11/extensions/xf86vmode.h>
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
 #include <limits.h>
 #ifndef HAVE__XEATDATAWORDS
 static inline void _XEatDataWords(Display *dpy, unsigned long n)
 # ifndef LONG64
     if (n >= (ULONG_MAX >> 2))
         _XIOError(dpy);
 # endif
     _XEatData (dpy, n << 2);
 #endif
 #ifdef DEBUG
 #include <stdio.h>
 #endif
 #ifndef MODE_BAD
 #define MODE_BAD 255
 #endif
 static XExtensionInfo _xf86vidmode_info_data;
 static XExtensionInfo *xf86vidmode_info = &_xf86vidmode_info_data;
 static const char *xf86vidmode_extension_name = XF86VIDMODENAME;
 #define XF86VidModeCheckExtension(dpy,i,val) \
 @@ -205,111 +194,117 @@ XF86VidModeGetGamma(Display *dpy, int sc
     Gamma->red = ((float)rep.red) / 10000.;
     Gamma->green = ((float)rep.green) / 10000.;
     Gamma->blue = ((float)rep.blue) / 10000.;
     UnlockDisplay(dpy);
     SyncHandle();
     return True;
+}
 Bool
 XF86VidModeGetModeLine(Display* dpy, int screen, int* dotclock,
 		       XF86VidModeModeLine* modeline)
+{
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeGetModeLineReply rep;
     xXF86OldVidModeGetModeLineReply oldrep;
     xXF86VidModeGetModeLineReq *req;
     int majorVersion, minorVersion;
     CARD32 remaining_len;
     Bool result = True;
     XF86VidModeCheckExtension (dpy, info, False);
     XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion);
     LockDisplay(dpy);
     GetReq(XF86VidModeGetModeLine, req);
     req->reqType = info->codes->major_opcode;
     req->xf86vidmodeReqType = X_XF86VidModeGetModeLine;
     req->screen = screen;
-    if (majorVersion < 2) {
+    if (_X_UNLIKELY(majorVersion < 2)) {
 	xXF86OldVidModeGetModeLineReply oldrep;
 	if (!_XReply(dpy, (xReply *)&oldrep,
             (SIZEOF(xXF86OldVidModeGetModeLineReply) - SIZEOF(xReply)) >> 2, xFalse)) {
 	    UnlockDisplay(dpy);
 	    SyncHandle();
 	    return False;
+	}
 	remaining_len = oldrep.length -
 	    ((SIZEOF(xXF86OldVidModeGetModeLineReply) - SIZEOF(xReply)) >> 2);
 	*dotclock = oldrep.dotclock;
 	modeline->hdisplay   = oldrep.hdisplay;
 	modeline->hsyncstart = oldrep.hsyncstart;
 	modeline->hsyncend   = oldrep.hsyncend;
 	modeline->htotal     = oldrep.htotal;
 	modeline->hskew      = 0;
 	modeline->vdisplay   = oldrep.vdisplay;
 	modeline->vsyncstart = oldrep.vsyncstart;
 	modeline->vsyncend   = oldrep.vsyncend;
 	modeline->vtotal     = oldrep.vtotal;
 	modeline->flags      = oldrep.flags;
 	modeline->privsize   = oldrep.privsize;
     } else {
 	xXF86VidModeGetModeLineReply rep;
 	if (!_XReply(dpy, (xReply *)&rep,
             (SIZEOF(xXF86VidModeGetModeLineReply) - SIZEOF(xReply)) >> 2, xFalse)) {
 	    UnlockDisplay(dpy);
 	    SyncHandle();
 	    return False;
+	}
 	remaining_len = rep.length -
 	    ((SIZEOF(xXF86VidModeGetModeLineReply) - SIZEOF(xReply)) >> 2);
 	*dotclock = rep.dotclock;
 	modeline->hdisplay   = rep.hdisplay;
 	modeline->hsyncstart = rep.hsyncstart;
 	modeline->hsyncend   = rep.hsyncend;
 	modeline->htotal     = rep.htotal;
 	modeline->hskew      = rep.hskew;
 	modeline->vdisplay   = rep.vdisplay;
 	modeline->vsyncstart = rep.vsyncstart;
 	modeline->vsyncend   = rep.vsyncend;
 	modeline->vtotal     = rep.vtotal;
 	modeline->flags      = rep.flags;
 	modeline->privsize   = rep.privsize;
+    }
     if (modeline->privsize > 0) {
 	if (modeline->privsize < (INT_MAX / sizeof(INT32)))
 	    modeline->private = Xcalloc(modeline->privsize, sizeof(INT32));
 	else
 	    modeline->private = NULL;
 	if (modeline->private == NULL) {
-	    _XEatDataWords(dpy, rep.length -
+	    _XEatDataWords(dpy, remaining_len);
 		((SIZEOF(xXF86VidModeGetModeLineReply) - SIZEOF(xReply)) >> 2));
 	    result = False;
 	} else
 	    _XRead(dpy, (char*)modeline->private, modeline->privsize * sizeof(INT32));
     } else {
 	modeline->private = NULL;
+    }
     UnlockDisplay(dpy);
     SyncHandle();
     return result;
+}
 Bool
 XF86VidModeGetAllModeLines(Display* dpy, int screen, int* modecount,
 			   XF86VidModeModeInfo ***modelinesPtr)
+{
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeGetAllModeLinesReply rep;
     xXF86VidModeGetAllModeLinesReq *req;
     XF86VidModeModeInfo *mdinfptr, **modelines;
     xXF86VidModeModeInfo xmdline;
     xXF86OldVidModeModeInfo oldxmdline;
-    int i;
+    unsigned int i;
     int majorVersion, minorVersion;
     Bool protocolBug = False;
     XF86VidModeCheckExtension (dpy, info, False);
     /*
      * Note: There was a bug in the protocol implementation in versions
      * 0.x with x < 8 (the .private field wasn't being passed over the wire).
      * Check the server's version, and accept the old format if appropriate.
      */
     XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion);
     if (majorVersion == 0 && minorVersion < 8) {
 @@ -341,27 +336,27 @@ XF86VidModeGetAllModeLines(Display* dpy,
 	_XEatDataWords(dpy, rep.length -
 	    ((SIZEOF(xXF86VidModeGetAllModeLinesReply) - SIZEOF(xReply)) >> 2));
 	UnlockDisplay(dpy);
 	SyncHandle();
         return False;
+    }
     mdinfptr = (XF86VidModeModeInfo *) (
 			    (char *) modelines
 			    + rep.modecount*sizeof(XF86VidModeModeInfo *)
 		    );
     for (i = 0; i < rep.modecount; i++) {
         modelines[i] = mdinfptr++;
-	if (majorVersion < 2) {
+	if (_X_UNLIKELY(majorVersion < 2)) {
             _XRead(dpy, (char*)&oldxmdline, sizeof(xXF86OldVidModeModeInfo));
 	    modelines[i]->dotclock   = oldxmdline.dotclock;
 	    modelines[i]->hdisplay   = oldxmdline.hdisplay;
 	    modelines[i]->hsyncstart = oldxmdline.hsyncstart;
 	    modelines[i]->hsyncend   = oldxmdline.hsyncend;
 	    modelines[i]->htotal     = oldxmdline.htotal;
 	    modelines[i]->hskew      = 0;
 	    modelines[i]->vdisplay   = oldxmdline.vdisplay;
 	    modelines[i]->vsyncstart = oldxmdline.vsyncstart;
 	    modelines[i]->vsyncend   = oldxmdline.vsyncend;
 	    modelines[i]->vtotal     = oldxmdline.vtotal;
 	    modelines[i]->flags      = oldxmdline.flags;
 	    if (protocolBug) {
 @@ -412,64 +407,51 @@ XF86VidModeGetAllModeLines(Display* dpy,
+		}
+	    }
+	}
+    }
     *modelinesPtr = modelines;
     UnlockDisplay(dpy);
     SyncHandle();
     return True;
+}
 /*
  * GetReq replacement for use with VidMode protocols earlier than 2.0
  */
 #if !defined(UNIXCPP) || defined(ANSICPP)
 #define GetOldReq(name, oldname, req) \
         WORD64ALIGN\
 	if ((dpy->bufptr + SIZEOF(x##oldname##Req)) > dpy->bufmax)\
 		_XFlush(dpy);\
 	req = (x##oldname##Req *)(dpy->last_req = dpy->bufptr);\
 	req->reqType = X_##name;\
 	req->length = (SIZEOF(x##oldname##Req))>>2;\
 	dpy->bufptr += SIZEOF(x##oldname##Req);\
 	dpy->request++
 #else  /* non-ANSI C uses empty comment instead of "##" for token concatenation */
 #define GetOldReq(name, oldname, req) \
         WORD64ALIGN\
 	if ((dpy->bufptr + SIZEOF(x/**/oldname/**/Req)) > dpy->bufmax)\
 		_XFlush(dpy);\
 	req = (x/**/oldname/**/Req *)(dpy->last_req = dpy->bufptr);\
 	req->reqType = X_/**/name;\
 	req->length = (SIZEOF(x/**/oldname/**/Req))>>2;\
 	dpy->bufptr += SIZEOF(x/**/oldname/**/Req);\
 	dpy->request++
 #endif
 Bool
 XF86VidModeAddModeLine(Display *dpy, int screen,
 		       XF86VidModeModeInfo* newmodeline,
 		       XF86VidModeModeInfo* aftermodeline)
+{
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeAddModeLineReq *req;
     xXF86OldVidModeAddModeLineReq *oldreq;
     int majorVersion, minorVersion;
     XF86VidModeCheckExtension (dpy, info, False);
     XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion);
     LockDisplay(dpy);
-    if (majorVersion < 2) {
+    if (_X_UNLIKELY(majorVersion < 2)) {
 	GetOldReq(XF86VidModeAddModeLine, XF86OldVidModeAddModeLine, oldreq);
 	oldreq->reqType = info->codes->major_opcode;
 	oldreq->xf86vidmodeReqType = X_XF86VidModeAddModeLine;
 	oldreq->screen = screen;
 	oldreq->dotclock =	newmodeline->dotclock;
 	oldreq->hdisplay =	newmodeline->hdisplay;
 	oldreq->hsyncstart =	newmodeline->hsyncstart;
 	oldreq->hsyncend =	newmodeline->hsyncend;
 	oldreq->htotal =	newmodeline->htotal;
 	oldreq->vdisplay =	newmodeline->vdisplay;
 	oldreq->vsyncstart =	newmodeline->vsyncstart;
 	oldreq->vsyncend =	newmodeline->vsyncend;
 	oldreq->vtotal =	newmodeline->vtotal;
 @@ -559,27 +541,27 @@ XF86VidModeAddModeLine(Display *dpy, int
 Bool
 XF86VidModeDeleteModeLine(Display *dpy, int screen,
 			  XF86VidModeModeInfo* modeline)
+{
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeDeleteModeLineReq *req;
     xXF86OldVidModeDeleteModeLineReq *oldreq;
     int majorVersion, minorVersion;
     XF86VidModeCheckExtension (dpy, info, 0);
     XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion);
     LockDisplay(dpy);
-    if (majorVersion < 2) {
+    if (_X_UNLIKELY(majorVersion < 2)) {
 	GetOldReq(XF86VidModeDeleteModeLine, XF86OldVidModeDeleteModeLine, oldreq);
 	oldreq->reqType = info->codes->major_opcode;
 	oldreq->xf86vidmodeReqType = X_XF86VidModeDeleteModeLine;
 	oldreq->screen = screen;
 	oldreq->dotclock =	modeline->dotclock;
 	oldreq->hdisplay =	modeline->hdisplay;
 	oldreq->hsyncstart =	modeline->hsyncstart;
 	oldreq->hsyncend =	modeline->hsyncend;
 	oldreq->htotal =	modeline->htotal;
 	oldreq->vdisplay =	modeline->vdisplay;
 	oldreq->vsyncstart =	modeline->vsyncstart;
 	oldreq->vsyncend =	modeline->vsyncend;
 	oldreq->vtotal =	modeline->vtotal;
 @@ -620,27 +602,27 @@ XF86VidModeDeleteModeLine(Display *dpy,
 Bool
 XF86VidModeModModeLine(Display *dpy, int screen, XF86VidModeModeLine* modeline)
+{
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeModModeLineReq *req;
     xXF86OldVidModeModModeLineReq *oldreq;
     int majorVersion, minorVersion;
     XF86VidModeCheckExtension (dpy, info, 0);
     XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion);
     LockDisplay(dpy);
-    if (majorVersion < 2) {
+    if (_X_UNLIKELY(majorVersion < 2)) {
 	GetOldReq(XF86VidModeModModeLine, XF86OldVidModeModModeLine, oldreq);
 	oldreq->reqType = info->codes->major_opcode;
 	oldreq->xf86vidmodeReqType = X_XF86VidModeModModeLine;
 	oldreq->screen = screen;
 	oldreq->hdisplay =	modeline->hdisplay;
 	oldreq->hsyncstart =	modeline->hsyncstart;
 	oldreq->hsyncend =	modeline->hsyncend;
 	oldreq->htotal =	modeline->htotal;
 	oldreq->vdisplay =	modeline->vdisplay;
 	oldreq->vsyncstart =	modeline->vsyncstart;
 	oldreq->vsyncend =	modeline->vsyncend;
 	oldreq->vtotal =	modeline->vtotal;
 	oldreq->flags =		modeline->flags;
 @@ -682,27 +664,27 @@ XF86VidModeValidateModeLine(Display *dpy
 			    XF86VidModeModeInfo* modeline)
+{
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeValidateModeLineReq *req;
     xXF86OldVidModeValidateModeLineReq *oldreq;
     xXF86VidModeValidateModeLineReply rep;
     int majorVersion, minorVersion;
     XF86VidModeCheckExtension (dpy, info, 0);
     XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion);
     LockDisplay(dpy);
-    if (majorVersion < 2) {
+    if (_X_UNLIKELY(majorVersion < 2)) {
 	GetOldReq(XF86VidModeValidateModeLine, XF86OldVidModeValidateModeLine, oldreq);
 	oldreq->reqType = info->codes->major_opcode;
 	oldreq->xf86vidmodeReqType = X_XF86VidModeValidateModeLine;
 	oldreq->screen = screen;
 	oldreq->dotclock =	modeline->dotclock;
 	oldreq->hdisplay =	modeline->hdisplay;
 	oldreq->hsyncstart =	modeline->hsyncstart;
 	oldreq->hsyncend =	modeline->hsyncend;
 	oldreq->htotal =	modeline->htotal;
 	oldreq->vdisplay =	modeline->vdisplay;
 	oldreq->vsyncstart =	modeline->vsyncstart;
 	oldreq->vsyncend =	modeline->vsyncend;
 	oldreq->vtotal =	modeline->vtotal;
 @@ -774,37 +756,37 @@ XF86VidModeSwitchToMode(Display* dpy, in
     int majorVersion, minorVersion;
     Bool protocolBug = False;
     XF86VidModeCheckExtension (dpy, info, False);
     /*
      * Note: There was a bug in the protocol implementation in versions
      * 0.x with x < 8 (the .private field wasn't expected to be sent over
      * the wire).  Check the server's version, and accept the old format
      * if appropriate.
      */
     XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion);
-    if (majorVersion == 0 && minorVersion < 8) {
+    if (_X_UNLIKELY(majorVersion == 0 && minorVersion < 8)) {
 	protocolBug = True;
 #ifdef DEBUG
 	fprintf(stderr, "XF86VidModeSwitchToMode: Warning: Xserver is"
 		"running an old version (%d.%d)\n", majorVersion,
 		minorVersion);
 #endif
+    }
     LockDisplay(dpy);
-    if (majorVersion < 2) {
+    if (_X_UNLIKELY(majorVersion < 2)) {
 	GetOldReq(XF86VidModeSwitchToMode, XF86OldVidModeSwitchToMode, oldreq);
 	oldreq->reqType = info->codes->major_opcode;
 	oldreq->xf86vidmodeReqType = X_XF86VidModeSwitchToMode;
 	oldreq->screen = screen;
 	oldreq->dotclock =	modeline->dotclock;
 	oldreq->hdisplay =	modeline->hdisplay;
 	oldreq->hsyncstart =	modeline->hsyncstart;
 	oldreq->hsyncend =	modeline->hsyncend;
 	oldreq->htotal =	modeline->htotal;
 	oldreq->vdisplay =	modeline->vdisplay;
 	oldreq->vsyncstart =	modeline->vsyncstart;
 	oldreq->vsyncend =	modeline->vsyncend;
 	oldreq->vtotal =	modeline->vtotal;
 @@ -1019,27 +1001,27 @@ XF86VidModeSetViewPort(Display* dpy, int
     UnlockDisplay(dpy);
     SyncHandle();
     return True;
+}
 Bool
 XF86VidModeGetDotClocks(Display* dpy, int screen, int *flagsPtr,
 			int *numclocksPtr, int *maxclocksPtr, int *clocksPtr[])
+{
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeGetDotClocksReply rep;
     xXF86VidModeGetDotClocksReq *req;
-    int i, *dotclocks;
+    int *dotclocks;
     CARD32 dotclk;
     Bool result = True;
     XF86VidModeCheckExtension (dpy, info, False);
     LockDisplay(dpy);
     GetReq(XF86VidModeGetDotClocks, req);
     req->reqType = info->codes->major_opcode;
     req->xf86vidmodeReqType = X_XF86VidModeGetDotClocks;
     req->screen = screen;
     if (!_XReply(dpy, (xReply *)&rep,
         (SIZEOF(xXF86VidModeGetDotClocksReply) - SIZEOF(xReply)) >> 2, xFalse))
+    {
 @@ -1048,26 +1030,28 @@ XF86VidModeGetDotClocks(Display* dpy, in
         return False;
+    }
     *numclocksPtr = rep.clocks;
     *maxclocksPtr = rep.maxclocks;
     *flagsPtr     = rep.flags;
     dotclocks = Xcalloc(rep.clocks, sizeof(int));
     if (dotclocks == NULL) {
         _XEatDataWords(dpy, rep.length -
 	    ((SIZEOF(xXF86VidModeGetDotClocksReply) - SIZEOF(xReply)) >> 2));
         result = False;
+    }
     else {
 	unsigned int i;
 	for (i = 0; i < rep.clocks; i++) {
 	    _XRead(dpy, (char*)&dotclk, 4);
 	    dotclocks[i] = dotclk;
+	}
+    }
     *clocksPtr = dotclocks;
     UnlockDisplay(dpy);
     SyncHandle();
     return result;
+}
 Bool
 XF86VidModeSetGammaRamp (