lint

9 files changed, 30 insertions, 54 deletions

diff --git a/xc/programs/Xserver/mfb/mfbbitblt.c b/xc/programs/Xserver/mfb/mfbbitblt.c
index b65233c04..7836294e0 100644
--- a/xc/programs/Xserver/mfb/mfbbitblt.c
+++ b/xc/programs/Xserver/mfb/mfbbitblt.c
@@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: mfbbitblt.c,v 5.9 89/09/12 14:25:50 keith Exp $ */
+/* $XConsortium: mfbbitblt.c,v 5.10 89/09/13 18:57:45 rws Exp $ */
 #include "X.h"
 #include "Xprotostr.h"
 
@@ -515,19 +515,14 @@ DDXPointPtr pptSrc;
     /* special case copy */
     if (alu == GXcopy)
     {
-    register int nl;		/* temp copy of nlMiddle */
-    register unsigned int tmp, bits;
+	register int nl;		/* temp copy of nlMiddle */
+	register unsigned int tmp, bits;
 #ifdef FAST_CONSTANT_OFFSET_MODE
-    register unsigned int bits1;
+	register unsigned int bits1;
 #endif
+	int xoffSrc, xoffDst;
+	int	leftShift, rightShift;
 
-    int xoffSrc, xoffDst;
-    int	leftShift, rightShift;
-
-    int nstart;			/* number of ragged bits at start of dst */
-    int nend;			/* number of ragged bits at end of dst */
-    int srcStartOver;		/* pulling nstart bits from src
-				   overflows into the next word? */
 	while(nbox--)
 	{
 	    w = pbox->x2 - pbox->x1;
@@ -569,8 +564,6 @@ DDXPointPtr pptSrc;
 		    {
 	    	    	while (h--)
 	    	    	{
-			    int	dec;
-
 		    	    psrc = psrcLine;
 		    	    pdst = pdstLine;
 		    	    pdstLine += widthDst;
diff --git a/xc/programs/Xserver/mfb/mfbbres.c b/xc/programs/Xserver/mfb/mfbbres.c
index 3078d8570..f4b89a075 100644
--- a/xc/programs/Xserver/mfb/mfbbres.c
+++ b/xc/programs/Xserver/mfb/mfbbres.c
@@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: mfbbres.c,v 1.1 89/09/02 13:00:58 keith Exp $ */
+/* $XConsortium: mfbbres.c,v 1.14 89/09/05 20:13:00 keith Exp $ */
 #include "X.h"
 #include "misc.h"
 #include "mfb.h"
@@ -35,7 +35,7 @@ SOFTWARE.
 
 mfbBresS(rop, addrl, nlwidth, signdx, signdy, axis, x1, y1, e, e1, e2, len)
 int rop;		/* a reduced rasterop */
-unsigned int *addrl;		/* pointer to base of bitmap */
+int *addrl;		/* pointer to base of bitmap */
 int nlwidth;		/* width in longwords of bitmap */
 int signdx, signdy;	/* signs of directions */
 int axis;		/* major axis (Y_AXIS or X_AXIS) */
@@ -43,7 +43,7 @@ int x1, y1;		/* initial point */
 register int e;		/* error accumulator */
 register int e1;	/* bresenham increments */
 int e2;
-unsigned int len;	/* length of line */
+int len;		/* length of line */
 {
     register int yinc;	/* increment to next scanline, in bytes */
     register unsigned char *addrb;		/* bitmask long pointer 
diff --git a/xc/programs/Xserver/mfb/mfbbresd.c b/xc/programs/Xserver/mfb/mfbbresd.c
index cb2c4ad7f..fcbe9b29a 100644
--- a/xc/programs/Xserver/mfb/mfbbresd.c
+++ b/xc/programs/Xserver/mfb/mfbbresd.c
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: cfbbresd.c,v 1.1 89/08/21 16:41:59 keith Exp $ */
+/* $XConsortium: mfbbresd.c,v 1.1 89/09/05 20:13:02 keith Exp $ */
 #include "X.h"
 #include "misc.h"
 #include "mfb.h"
@@ -49,7 +49,7 @@ unsigned char *pDash;	/* dash list */
 int numInDashList;	/* total length of dash list */
 int dashOffset;		/* offset into current dash */
 int isDoubleDash;
-unsigned int *addrl;	/* pointer to base of bitmap */
+int *addrl;		/* pointer to base of bitmap */
 int nlwidth;		/* width in longwords of bitmap */
 int signdx, signdy;	/* signs of directions */
 int axis;		/* major axis (Y_AXIS or X_AXIS) */
@@ -57,7 +57,7 @@ int x1, y1;		/* initial point */
 register int e;		/* error accumulator */
 register int e1;	/* bresenham increments */
 int e2;
-unsigned int len;	/* length of line */
+int len;		/* length of line */
 {
     register int yinc;	/* increment to next scanline, in bytes */
     register unsigned char *addrb;
diff --git a/xc/programs/Xserver/mfb/mfbfillsp.c b/xc/programs/Xserver/mfb/mfbfillsp.c
index 8a2aa7f0a..80f52dc65 100644
--- a/xc/programs/Xserver/mfb/mfbfillsp.c
+++ b/xc/programs/Xserver/mfb/mfbfillsp.c
@@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: mfbfillsp.c,v 5.2 89/07/28 11:58:00 rws Exp $ */
+/* $XConsortium: mfbfillsp.c,v 5.3 89/09/13 18:57:57 rws Exp $ */
 #include "X.h"
 #include "Xmd.h"
 #include "gcstruct.h"
@@ -753,7 +753,7 @@ int fSorted;
     PixmapPtr	pTile;		/* pointer to tile we want to fill with */
     int		w, width, x, xSrc, ySrc, srcStartOver, nstart, nend;
     int 	tlwidth, rem, tileWidth, tileHeight, endinc, rop;
-    unsigned int      tmpSrc, endmask, *psrcT;
+    unsigned int      endmask, *psrcT;
     int *pwidthFree;		/* copies of the pointers to free */
     DDXPointPtr pptFree;
 
@@ -919,7 +919,7 @@ int fSorted;
     register int startmask;
     register int nlMiddle;
     PixmapPtr	pTile;		/* pointer to tile we want to fill with */
-    int		w, width,  x, xSrc, ySrc, tmpSrc, srcStartOver, nstart, nend;
+    int		w, width,  x, xSrc, ySrc, srcStartOver, nstart, nend;
     int 	endmask, tlwidth, rem, tileWidth, *psrcT, endinc, rop;
     int		tileHeight;
     int *pwidthFree;		/* copies of the pointers to free */
diff --git a/xc/programs/Xserver/mfb/mfbgetsp.c b/xc/programs/Xserver/mfb/mfbgetsp.c
index ed2327865..aec7e79f9 100644
--- a/xc/programs/Xserver/mfb/mfbgetsp.c
+++ b/xc/programs/Xserver/mfb/mfbgetsp.c
@@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: mfbgetsp.c,v 5.3 89/07/26 12:12:15 rws Exp $ */
+/* $XConsortium: mfbgetsp.c,v 5.4 89/09/13 18:58:05 rws Exp $ */
 #include "X.h"
 #include "Xmd.h"
 
@@ -43,6 +43,7 @@ SOFTWARE.
  * Each scanline returned will be server scanline padded, i.e., it will come
  * out to an integral number of words.
  */
+/*ARGSUSED*/
 void
 mfbGetSpans(pDrawable, wMax, ppt, pwidth, nspans, pdstStart)
     DrawablePtr		pDrawable;	/* drawable from which to get bits */
diff --git a/xc/programs/Xserver/mfb/mfbimage.c b/xc/programs/Xserver/mfb/mfbimage.c
index ca958909f..557958d4e 100644
--- a/xc/programs/Xserver/mfb/mfbimage.c
+++ b/xc/programs/Xserver/mfb/mfbimage.c
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: mfbimage.c,v 5.1 89/07/26 15:50:51 rws Exp $ */
+/* $XConsortium: mfbimage.c,v 5.2 89/08/20 16:30:15 rws Exp $ */
 
 #include "X.h"
 
@@ -69,7 +69,6 @@ mfbPutImage(dst, pGC, depth, x, y, w, h, leftPad, format, pImage)
     unsigned int format;
     int 	*pImage;
 {
-    pointer	pbits;
     PixmapRec	FakePixmap;
 
     if (!(pGC->planemask & 1))
diff --git a/xc/programs/Xserver/mfb/mfbline.c b/xc/programs/Xserver/mfb/mfbline.c
index 55046bc87..7b9776cfa 100644
--- a/xc/programs/Xserver/mfb/mfbline.c
+++ b/xc/programs/Xserver/mfb/mfbline.c
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: mfbline.c,v 5.4 89/09/05 20:12:53 keith Exp $ */
+/* $XConsortium: mfbline.c,v 5.5 89/09/13 18:58:16 rws Exp $ */
 #include "X.h"
 
 #include "gcstruct.h"
@@ -91,7 +91,7 @@ actual clipping.
 }
 
 #define SWAPPT(i, j) \
-{  register DDXPointRec _t; \
+{  DDXPointRec _t; \
    _t = i; \
    i = j; \
    j = _t; \
@@ -119,7 +119,6 @@ mfbLineSS (pDrawable, pGC, mode, npt, pptInit)
     BoxPtr pboxInit;
     register BoxPtr pbox;
 #ifndef POLYSEGMENT
-    int nptTmp;
     DDXPointPtr ppt;		/* pointer to list of translated points */
 #endif
 
@@ -139,7 +138,6 @@ mfbLineSS (pDrawable, pGC, mode, npt, pptInit)
     int axis;			/* major axis */
 
 				/* a bunch of temporaries */
-    int tmp;
     int x1, x2, y1, y2;
     RegionPtr cclip;
     int		    alu;
@@ -273,6 +271,8 @@ mfbLineSS (pDrawable, pGC, mode, npt, pptInit)
 	    /* try to draw the line, if we haven't gone beyond it */
 	    if ((nbox) && (pbox->y1 <= y1))
 	    {
+		int tmp;
+
 		/* when we leave this band, we're done */
 		tmp = pbox->y1;
 		while((nbox) && (pbox->y1 == tmp))
@@ -513,13 +513,9 @@ mfbLineSD( pDrawable, pGC, mode, npt, pptInit)
     BoxPtr pboxInit;
     register BoxPtr pbox;
 #ifndef POLYSEGMENT
-    int nptTmp;
     DDXPointPtr ppt;		/* pointer to list of translated points */
 #endif
 
-    DDXPointRec pt1;
-    DDXPointRec pt2;
-
     unsigned int oc1;		/* outcode of point 1 */
     unsigned int oc2;		/* outcode of point 2 */
 
@@ -534,22 +530,9 @@ mfbLineSD( pDrawable, pGC, mode, npt, pptInit)
     int e, e1, e2;		/* bresenham error and increments */
     int len;			/* length of segment */
     int axis;			/* major axis */
-
-    int clipDone;		/* flag for clipping loop */
-    DDXPointRec pt1Orig;	/* unclipped start point */
-    DDXPointRec pt2Orig;	/* unclipped end point */
-    int err;			/* modified bresenham error term */
-    int clip1, clip2;		/* clippedness of the endpoints */
-
-    int clipdx, clipdy;		/* difference between clipped and
-				   unclipped start point */
-
-				/* a bunch of temporaries */
-    int tmp;
     int x1, x2, y1, y2;
     RegionPtr cclip;
     int		    fgrop, bgrop;
-    int		    isDoubleDashed;
     unsigned char   *pDash;
     int		    dashOffset;
     int		    numInDashList;
@@ -557,7 +540,6 @@ mfbLineSD( pDrawable, pGC, mode, npt, pptInit)
     int		    isDoubleDash;
     int		    dashIndexTmp, dashOffsetTmp;
     int		    unclippedlen;
-    int		    flipped;
 
     cclip = ((mfbPrivGC *)(pGC->devPrivates[mfbGCPrivateIndex].ptr))->pCompositeClip;
     fgrop = ((mfbPrivGC *)(pGC->devPrivates[mfbGCPrivateIndex].ptr))->rop;
@@ -584,7 +566,7 @@ mfbLineSD( pDrawable, pGC, mode, npt, pptInit)
     isDoubleDash = (pGC->lineStyle == LineDoubleDash);
     dashIndex = 0;
     dashOffset = 0;
-    miStepDash (pGC->dashOffset, &dashIndex, pDash,
+    miStepDash ((int)pGC->dashOffset, &dashIndex, pDash,
 		numInDashList, &dashOffset);
 
     if (isDoubleDash)
@@ -826,10 +808,9 @@ register int signdx, signdy;
 int axis;
 int *pclip1, *pclip2;
 {
-    DDXPointRec pt1Orig, pt1, pt2, ptTmp;
+    DDXPointRec pt1Orig, pt1, pt2;
     int swapped = 0;
     int clipDone = 0;
-    int tmp;
     register unsigned long utmp;
     int oc1, oc2;
     int clip1, clip2;
diff --git a/xc/programs/Xserver/mfb/mfbpushpxl.c b/xc/programs/Xserver/mfb/mfbpushpxl.c
index 357882267..30cc93c76 100644
--- a/xc/programs/Xserver/mfb/mfbpushpxl.c
+++ b/xc/programs/Xserver/mfb/mfbpushpxl.c
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XConsortium: mfbpushpxl.c,v 5.0 89/06/09 15:07:01 keith Exp $ */
+/* $XConsortium: mfbpushpxl.c,v 5.1 89/07/28 08:27:49 rws Exp $ */
 
 #include "X.h"
 #include "gcstruct.h"
@@ -76,7 +76,7 @@ mfbSolidPP(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg)
     DrawablePtr pDrawable;
     int		dx, dy, xOrg, yOrg;
 {
-    int alu;
+    unsigned char alu;
     RegionRec rgnDst;
     DDXPointPtr pptSrc;
     BoxRec srcBox;
@@ -115,7 +115,7 @@ mfbSolidPP(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg)
 		ppt->x = pbox->x1 - xOrg;
 		ppt->y = pbox->y1 - yOrg;
 	    }
-	    mfbDoBitblt(pBitMap, pDrawable, alu, &rgnDst, pptSrc);
+	    mfbDoBitblt((DrawablePtr)pBitMap, pDrawable, alu, &rgnDst, pptSrc);
 	    DEALLOCATE_LOCAL(pptSrc);
 	}
     }
diff --git a/xc/programs/Xserver/mfb/mfbzerarc.c b/xc/programs/Xserver/mfb/mfbzerarc.c
index 39904150b..ab9ed9d2d 100644
--- a/xc/programs/Xserver/mfb/mfbzerarc.c
+++ b/xc/programs/Xserver/mfb/mfbzerarc.c
@@ -15,7 +15,7 @@ without any express or implied warranty.
 
 ********************************************************/
 
-/* $XConsortium: mfbzerarc.c,v 5.2 89/09/11 09:35:00 rws Exp $ */
+/* $XConsortium: mfbzerarc.c,v 5.3 89/09/11 09:38:34 rws Exp $ */
 
 /* Derived from:
  * "Algorithm for drawing ellipses or hyperbolae with a digital plotter"
@@ -33,6 +33,8 @@ without any express or implied warranty.
 #include "maskbits.h"
 #include "mizerarc.h"
 
+extern void miPolyArc(), miZeroPolyArc();
+
 #if (BITMAP_BIT_ORDER == MSBFirst)
 #define LEFTMOST	((unsigned int) 0x80000000)
 #else