Attachment 10020 Details for Bug 10996 – k&r cleanup patch

[patch] k&r cleanup patch

xorg_afb_kr1.diff (text/plain), 24.74 KB, created by Stefan Huehner on 2007-05-18 14:55:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Huehner

Created: 2007-05-18 14:55:37 UTC

Size: 24.74 KB

patch

obsolete

>diff --git a/afb/afbbres.c b/afb/afbbres.c
>index e8f1b3b..3128035 100644
>--- a/afb/afbbres.c
>+++ b/afb/afbbres.c
>@@ -64,20 +64,19 @@ SOFTWARE.
> */
> 
> void
>-afbBresS(addrlbase, nlwidth, sizeDst, depthDst, signdx, signdy, axis, x1, y1,
>-		 e, e1, e2, len, rrops)
>-PixelType *addrlbase;		/* pointer to base of bitmap */
>-int nlwidth;				/* width in longwords of bitmap */
>-int sizeDst;
>-int depthDst;
>-int signdx, signdy;		/* signs of directions */
>-int axis;				/* major axis (Y_AXIS or X_AXIS) */
>-int x1, y1;				/* initial point */
>-register int e;				/* error accumulator */
>-register int e1;		/* bresenham increments */
>-int e2;
>-int len;				/* length of line */
>-unsigned char *rrops;
>+afbBresS(
>+	PixelType *addrlbase,		/* pointer to base of bitmap */
>+	int nlwidth,				/* width in longwords of bitmap */
>+	int sizeDst,
>+	int depthDst,
>+	int signdx, int signdy,		/* signs of directions */
>+	int axis,				/* major axis (Y_AXIS or X_AXIS) */
>+	int x1, int y1,				/* initial point */
>+	register int e,				/* error accumulator */
>+	register int e1,		/* bresenham increments */
>+	int e2,
>+	int len,				/* length of line */
>+	unsigned char *rrops)
> {
> 	register int yinc;		/* increment to next scanline, in bytes */
> 	register PixelType *addrl;		/* bitmask long pointer */
>diff --git a/afb/afbbresd.c b/afb/afbbresd.c
>index 4495c8c..4cf2e1a 100644
>--- a/afb/afbbresd.c
>+++ b/afb/afbbresd.c
>@@ -70,27 +70,25 @@ SOFTWARE.
> 	}
> 
> void
>-afbBresD(pdashIndex, pDash, numInDashList, pdashOffset, isDoubleDash,
>-		 addrlbase, nlwidth, sizeDst, depthDst,
>-		 signdx, signdy, axis, x1, y1, e, e1, e2, len, rrops, bgrrops)
>-int *pdashIndex;		/* current dash */
>-unsigned char *pDash;		/* dash list */
>-int numInDashList;		/* total length of dash list */
>-int *pdashOffset;		/* offset into current dash */
>-int isDoubleDash;
>-PixelType *addrlbase;		/* pointer to base of bitmap */
>-int nlwidth;				/* width in longwords of bitmap */
>-int sizeDst;
>-int depthDst;
>-int signdx, signdy;		/* signs of directions */
>-int axis;				/* major axis (Y_AXIS or X_AXIS) */
>-int x1, y1;				/* initial point */
>-register int e;				/* error accumulator */
>-register int e1;		/* bresenham increments */
>-int e2;
>-int len;				/* length of line */
>-unsigned char *rrops;
>-unsigned char *bgrrops;
>+afbBresD(
>+	int *pdashIndex,		/* current dash */
>+	unsigned char *pDash,		/* dash list */
>+	int numInDashList,		/* total length of dash list */
>+	int *pdashOffset,		/* offset into current dash */
>+	int isDoubleDash,
>+	PixelType *addrlbase,		/* pointer to base of bitmap */
>+	int nlwidth,				/* width in longwords of bitmap */
>+	int sizeDst,
>+	int depthDst,
>+	int signdx, int signdy,		/* signs of directions */
>+	int axis,				/* major axis (Y_AXIS or X_AXIS) */
>+	int x1, int y1,				/* initial point */
>+	register int e,				/* error accumulator */
>+	register int e1,		/* bresenham increments */
>+	int e2,
>+	int len,				/* length of line */
>+	unsigned char *rrops,
>+	unsigned char *bgrrops)
> {
> 	register int yinc;		/* increment to next scanline, in bytes */
> 	register PixelType *addrl;
>diff --git a/afb/afbbstore.c b/afb/afbbstore.c
>index f7f1062..9be51ba 100644
>--- a/afb/afbbstore.c
>+++ b/afb/afbbstore.c
>@@ -63,12 +63,12 @@ from the X Consortium.
>  *-----------------------------------------------------------------------
>  */
> void
>-afbSaveAreas(pPixmap, prgnSave, xorg, yorg, pWin)
>-	PixmapPtr		  		pPixmap;  		/* Backing pixmap */
>-	RegionPtr		  		prgnSave; 		/* Region to save (pixmap-relative) */
>-	int					  		xorg;					/* X origin of region */
>-	int					  		yorg;					/* Y origin of region */
>-	WindowPtr				pWin;
>+afbSaveAreas(
>+	PixmapPtr		  		pPixmap,  		/* Backing pixmap */
>+	RegionPtr		  		prgnSave, 		/* Region to save (pixmap-relative) */
>+	int					  		xorg,					/* X origin of region */
>+	int					  		yorg,					/* Y origin of region */
>+	WindowPtr				pWin)
> {
> 	register DDXPointPtr pPt;
> 	DDXPointPtr				pPtsInit;
>@@ -119,12 +119,12 @@ afbSaveAreas(pPixmap, prgnSave, xorg, yorg, pWin)
>  *-----------------------------------------------------------------------
>  */
> void
>-afbRestoreAreas(pPixmap, prgnRestore, xorg, yorg, pWin)
>-	PixmapPtr		  		pPixmap;  		/* Backing pixmap */
>-	RegionPtr		  		prgnRestore; 		/* Region to restore (screen-relative)*/
>-	int					  		xorg;					/* X origin of window */
>-	int					  		yorg;					/* Y origin of window */
>-	WindowPtr				pWin;
>+afbRestoreAreas(
>+	PixmapPtr		  		pPixmap,  		/* Backing pixmap */
>+	RegionPtr		  		prgnRestore, 		/* Region to restore (screen-relative)*/
>+	int					  		xorg,					/* X origin of window */
>+	int					  		yorg,					/* Y origin of window */
>+	WindowPtr				pWin)
> {
> 	register DDXPointPtr pPt;
> 	DDXPointPtr				pPtsInit;
>diff --git a/afb/afbclip.c b/afb/afbclip.c
>index 15be405..ad235d5 100644
>--- a/afb/afbclip.c
>+++ b/afb/afbclip.c
>@@ -94,8 +94,7 @@ if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&						\
>  * at the same X coordinates.
>  */
> RegionPtr
>-afbPixmapToRegion(pPix)
>-	PixmapPtr		pPix;
>+afbPixmapToRegion(PixmapPtr pPix)
> {
> 	register RegionPtr	pReg;
> 	register PixelType	*pw, w;
>diff --git a/afb/afbfillsp.c b/afb/afbfillsp.c
>index 539c345..629f3b8 100644
>--- a/afb/afbfillsp.c
>+++ b/afb/afbfillsp.c
>@@ -82,13 +82,13 @@ MaxRectsPerBand * nSpans.
> 
> 
> void
>-afbSolidFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
>-	DrawablePtr pDrawable;
>-	GCPtr		pGC;
>-	int				nInit;				/* number of spans to fill */
>-	DDXPointPtr pptInit;		/* pointer to list of start points */
>-	int				*pwidthInit;		/* pointer to list of n widths */
>-	int 		fSorted;
>+afbSolidFS(
>+	DrawablePtr pDrawable,
>+	GCPtr		pGC,
>+	int		nInit,				/* number of spans to fill */
>+	DDXPointPtr	pptInit,		/* pointer to list of start points */
>+	int		*pwidthInit,		/* pointer to list of n widths */
>+	int 		fSorted)
> {
> 								/* next three parameters are post-clip */
> 	int n;						/* number of spans to fill */
>@@ -188,13 +188,13 @@ afbSolidFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
> }
> 
> void 
>-afbStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
>-	DrawablePtr pDrawable;
>-	GC *pGC;
>-	int nInit;						/* number of spans to fill */
>-	DDXPointPtr pptInit;		/* pointer to list of start points */
>-	int *pwidthInit;				/* pointer to list of n widths */
>-	int fSorted;
>+afbStippleFS(
>+	DrawablePtr pDrawable,
>+	GC *pGC,
>+	int nInit,						/* number of spans to fill */
>+	DDXPointPtr pptInit,		/* pointer to list of start points */
>+	int *pwidthInit,				/* pointer to list of n widths */
>+	int fSorted)
> {
> 								/* next three parameters are post-clip */
> 	int n;						/* number of spans to fill */
>@@ -302,13 +302,13 @@ afbStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
> }
> 
> void
>-afbTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
>-	DrawablePtr pDrawable;
>-	GC *pGC;
>-	int nInit;						/* number of spans to fill */
>-	DDXPointPtr pptInit;		/* pointer to list of start points */
>-	int *pwidthInit;				/* pointer to list of n widths */
>-	int fSorted;
>+afbTileFS(
>+	DrawablePtr pDrawable,
>+	GC *pGC,
>+	int nInit,						/* number of spans to fill */
>+	DDXPointPtr pptInit,		/* pointer to list of start points */
>+	int *pwidthInit,				/* pointer to list of n widths */
>+	int fSorted)
> {
> 								/* next three parameters are post-clip */
> 	int n;						/* number of spans to fill */
>@@ -433,13 +433,13 @@ afbTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
> }
> 
> void
>-afbOpaqueStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
>-	DrawablePtr pDrawable;
>-	GC *pGC;
>-	int nInit;						/* number of spans to fill */
>-	DDXPointPtr pptInit;		/* pointer to list of start points */
>-	int *pwidthInit;				/* pointer to list of n widths */
>-	int fSorted;
>+afbOpaqueStippleFS(
>+	DrawablePtr pDrawable,
>+	GC *pGC,
>+	int nInit,						/* number of spans to fill */
>+	DDXPointPtr pptInit,		/* pointer to list of start points */
>+	int *pwidthInit,				/* pointer to list of n widths */
>+	int fSorted)
> {
> 								/* next three parameters are post-clip */
> 	int n;						/* number of spans to fill */
>@@ -593,13 +593,13 @@ afbOpaqueStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
> 
> /* Fill spans with tiles that aren't PPW bits wide */
> void
>-afbUnnaturalTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
>-	DrawablePtr pDrawable;
>-	GC				*pGC;
>-	int				nInit;				/* number of spans to fill */
>-	DDXPointPtr pptInit;		/* pointer to list of start points */
>-	int *pwidthInit;				/* pointer to list of n widths */
>-	int fSorted;
>+afbUnnaturalTileFS(
>+	DrawablePtr pDrawable,
>+	GC				*pGC,
>+	int				nInit,				/* number of spans to fill */
>+	DDXPointPtr pptInit,		/* pointer to list of start points */
>+	int *pwidthInit,				/* pointer to list of n widths */
>+	int fSorted)
> {
> 	int				iline;				/* first line of tile to use */
> 								/* next three parameters are post-clip */
>@@ -738,13 +738,13 @@ afbUnnaturalTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
> 
> /* Fill spans with stipples that aren't PPW bits wide */
> void
>-afbUnnaturalStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
>-	DrawablePtr pDrawable;
>-	GC				*pGC;
>-	int				nInit;				/* number of spans to fill */
>-	DDXPointPtr pptInit;		/* pointer to list of start points */
>-	int *pwidthInit;				/* pointer to list of n widths */
>-	int fSorted;
>+afbUnnaturalStippleFS(
>+	DrawablePtr pDrawable,
>+	GC				*pGC,
>+	int				nInit,				/* number of spans to fill */
>+	DDXPointPtr pptInit,		/* pointer to list of start points */
>+	int *pwidthInit,				/* pointer to list of n widths */
>+	int fSorted)
> {
> 								/* next three parameters are post-clip */
> 	int n;						/* number of spans to fill */
>@@ -883,13 +883,13 @@ afbUnnaturalStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
> 
> /* Fill spans with OpaqueStipples that aren't PPW bits wide */
> void
>-afbUnnaturalOpaqueStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted)
>-	DrawablePtr pDrawable;
>-	GC				*pGC;
>-	int				nInit;				/* number of spans to fill */
>-	DDXPointPtr pptInit;		/* pointer to list of start points */
>-	int *pwidthInit;				/* pointer to list of n widths */
>-	int fSorted;
>+afbUnnaturalOpaqueStippleFS(
>+	DrawablePtr pDrawable,
>+	GC				*pGC,
>+	int				nInit,				/* number of spans to fill */
>+	DDXPointPtr pptInit,		/* pointer to list of start points */
>+	int *pwidthInit,				/* pointer to list of n widths */
>+	int fSorted)
> {
> 	int				iline;				/* first line of tile to use */
> 								/* next three parameters are post-clip */
>diff --git a/afb/afbfont.c b/afb/afbfont.c
>index 940bdb0..30720bd 100644
>--- a/afb/afbfont.c
>+++ b/afb/afbfont.c
>@@ -61,18 +61,14 @@ SOFTWARE.
> 
> /*ARGSUSED*/
> Bool
>-afbRealizeFont( pscr, pFont)
>-	ScreenPtr		pscr;
>-	FontPtr		pFont;
>+afbRealizeFont(ScreenPtr pscr, FontPtr pFont)
> {
> 	return (TRUE);
> }
> 
> /*ARGSUSED*/
> Bool
>-afbUnrealizeFont( pscr, pFont)
>-	ScreenPtr		pscr;
>-	FontPtr		pFont;
>+afbUnrealizeFont(ScreenPtr pscr, FontPtr pFont)
> {
> 	return (TRUE);
> }
>diff --git a/afb/afbgc.c b/afb/afbgc.c
>index 59c09e0..4ed3660 100644
>--- a/afb/afbgc.c
>+++ b/afb/afbgc.c
>@@ -134,8 +134,7 @@ afbReduceOpaqueStipple(PixelType fg, PixelType bg, unsigned long planemask,
> }
> 
> Bool
>-afbCreateGC(pGC)
>-	register GCPtr pGC;
>+afbCreateGC(register GCPtr pGC)
> {
> 	afbPrivGC 		*pPriv;
> 
>@@ -267,10 +266,7 @@ afbComputeCompositeClip(GCPtr pGC, DrawablePtr pDrawable)
> 
> /*ARGSUSED*/
> static void
>-afbValidateGC(pGC, changes, pDrawable)
>-	register GCPtr 		pGC;
>-	unsigned long		changes;
>-	DrawablePtr 		pDrawable;
>+afbValidateGC(register GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
> {
> 	register afbPrivGCPtr devPriv;
> 	int mask;		/* stateChanges */
>@@ -554,8 +550,7 @@ afbValidateGC(pGC, changes, pDrawable)
> }
> 
> static void
>-afbDestroyGC(pGC)
>-	GCPtr pGC;
>+afbDestroyGC(GCPtr pGC)
> {
> 	if (pGC->pRotatedPixmap)
> 		(*pGC->pScreen->DestroyPixmap)(pGC->pRotatedPixmap);
>@@ -565,12 +560,8 @@ afbDestroyGC(pGC)
> }
> 
> void
>-afbReduceRop(alu, src, planemask, depth, rop)
>-	register int alu;
>-	register Pixel src;
>-	register unsigned long planemask;
>-	int depth;
>-	register unsigned char *rop;
>+afbReduceRop(register int alu, register Pixel src,
>+	register unsigned long planemask, int depth, register unsigned char *rop)
> {
> 	register int d;
> 	register Pixel mask = 1;
>diff --git a/afb/afbgetsp.c b/afb/afbgetsp.c
>index 8d1db14..24fd0d9 100644
>--- a/afb/afbgetsp.c
>+++ b/afb/afbgetsp.c
>@@ -73,13 +73,13 @@ SOFTWARE.
>  */
> /*ARGSUSED*/
> void
>-afbGetSpans(pDrawable, wMax, ppt, pwidth, nspans, pchardstStart)
>-	DrawablePtr		pDrawable;	/* drawable from which to get bits */
>-	int			wMax;		/* largest value of all *pwidths */
>-	register DDXPointPtr	ppt;		/* points to start copying from */
>-	int			*pwidth;	/* list of number of bits to copy */
>-	int			nspans;		/* number of scanlines to copy */
>-	char			*pchardstStart;	/* where to put the bits */
>+afbGetSpans(
>+	DrawablePtr		pDrawable,	/* drawable from which to get bits */
>+	int			wMax,		/* largest value of all *pwidths */
>+	register DDXPointPtr	ppt,		/* points to start copying from */
>+	int			*pwidth,	/* list of number of bits to copy */
>+	int			nspans,		/* number of scanlines to copy */
>+	char			*pchardstStart)	/* where to put the bits */
> {
> 	PixelType		*pdstStart = (PixelType *)pchardstStart;
> 	register PixelType	*pdst;		/* where to put the bits */
>diff --git a/afb/afbhrzvert.c b/afb/afbhrzvert.c
>index 8f332e6..dafa02a 100644
>--- a/afb/afbhrzvert.c
>+++ b/afb/afbhrzvert.c
>@@ -65,15 +65,15 @@ SOFTWARE.
>    abs(len) > 1
> */
> void
>-afbHorzS(pbase, nlwidth, sizeDst, depthDst, x1, y1, len, rrops)
>-PixelType *pbase;		/* pointer to base of bitmap */
>-register int nlwidth;		/* width in longwords of bitmap */
>-int sizeDst;
>-int depthDst;
>-int x1;						/* initial point */
>-int y1;
>-int len;				/* length of line */
>-register unsigned char *rrops;
>+afbHorzS(
>+	PixelType *pbase,		/* pointer to base of bitmap */
>+	register int nlwidth,		/* width in longwords of bitmap */
>+	int sizeDst,
>+	int depthDst,
>+	int x1,						/* initial point */
>+	int y1,
>+	int len,				/* length of line */
>+	register unsigned char *rrops)
> {
> 	register PixelType *addrl;
> 	register PixelType startmask;
>@@ -160,14 +160,14 @@ register unsigned char *rrops;
>    it's OK to use it.
> */
> void
>-afbVertS(pbase, nlwidth, sizeDst, depthDst, x1, y1, len, rrops)
>-PixelType *pbase;		/* pointer to base of bitmap */
>-register int nlwidth;		/* width in longwords of bitmap */
>-int sizeDst;
>-int depthDst;
>-int x1, y1;				/* initial point */
>-register int len;		/* length of line */
>-unsigned char *rrops;
>+afbVertS(
>+	PixelType *pbase,		/* pointer to base of bitmap */
>+	register int nlwidth,		/* width in longwords of bitmap */
>+	int sizeDst,
>+	int depthDst,
>+	int x1, int y1,				/* initial point */
>+	register int len,		/* length of line */
>+	unsigned char *rrops)
> {
> 	register PixelType *addrl;
> 	register PixelType bitmask;
>diff --git a/afb/afbimage.c b/afb/afbimage.c
>index 81f4973..d73e7a1 100644
>--- a/afb/afbimage.c
>+++ b/afb/afbimage.c
>@@ -16,13 +16,8 @@
> #include "mfb.h"
> 
> void
>-afbPutImage(pDraw, pGC, depth, x, y, width, height, leftPad, format, pImage)
>-	DrawablePtr pDraw;
>-	GCPtr pGC;
>-	int depth, x, y, width, height;
>-	int leftPad;
>-	int format;
>-	char *pImage;
>+afbPutImage(DrawablePtr pDraw, GCPtr pGC, int depth, int x, int y, int width,
>+	int height, int leftPad, int format, char *pImage)
> {
> 	PixmapPtr pPixmap;
> 
>@@ -124,12 +119,8 @@ afbPutImage(pDraw, pGC, depth, x, y, width, height, leftPad, format, pImage)
> }
> 
> void
>-afbGetImage(pDrawable, sx, sy, width, height, format, planemask, pdstLine)
>-	DrawablePtr pDrawable;
>-	int sx, sy, width, height;
>-	unsigned int format;
>-	unsigned long planemask;
>-	char *pdstLine;
>+afbGetImage(DrawablePtr pDrawable, int sx, int sy, int width, int height,
>+	unsigned int format, unsigned long planemask, char *pdstLine)
> {
> 	BoxRec box;
> 	DDXPointRec ptSrc;
>diff --git a/afb/afbimggblt.c b/afb/afbimggblt.c
>index de02aa4..990e2e7 100644
>--- a/afb/afbimggblt.c
>+++ b/afb/afbimggblt.c
>@@ -95,13 +95,13 @@ xoff, pdst, pglyph, and tmpSrc seem like the right things, though.
> */
> 
> void
>-afbImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
>-	DrawablePtr pDrawable;
>-	GC				*pGC;
>-	int		x, y;
>-	unsigned int nglyph;
>-	CharInfoPtr *ppci;				/* array of character info */
>-	pointer		pglyphBase;		/* start of array of glyphs */
>+afbImageGlyphBlt(
>+	DrawablePtr pDrawable,
>+	GC				*pGC,
>+	int		x, int y,
>+	unsigned int nglyph,
>+	CharInfoPtr *ppci,				/* array of character info */
>+	pointer		pglyphBase)		/* start of array of glyphs */
> {
> 	ExtentInfoRec info;		/* used by QueryGlyphExtents() */
> 	BoxRec bbox;		/* string's bounding box */
>diff --git a/afb/afbmisc.c b/afb/afbmisc.c
>index 023c43f..6753e55 100644
>--- a/afb/afbmisc.c
>+++ b/afb/afbmisc.c
>@@ -60,11 +60,8 @@ SOFTWARE.
> 
> /*ARGSUSED*/
> void
>-afbQueryBestSize(class, pwidth, pheight, pScreen)
>-int class;
>-unsigned short *pwidth;
>-unsigned short *pheight;
>-ScreenPtr pScreen;
>+afbQueryBestSize(int class, unsigned short *pwidth, unsigned short *pheight,
>+	ScreenPtr pScreen)
> {
> 	unsigned width, test;
> 
>diff --git a/afb/afbpixmap.c b/afb/afbpixmap.c
>index 77ba535..27be303 100644
>--- a/afb/afbpixmap.c
>+++ b/afb/afbpixmap.c
>@@ -70,11 +70,7 @@ SOFTWARE.
> #include "mfb.h"
> 
> PixmapPtr
>-afbCreatePixmap(pScreen, width, height, depth)
>-	ScreenPtr		pScreen;
>-	int				width;
>-	int				height;
>-	int				depth;
>+afbCreatePixmap(ScreenPtr pScreen, int width, int height, int depth)
> {
> 	PixmapPtr pPixmap;
> 	size_t datasize;
>@@ -108,8 +104,7 @@ afbCreatePixmap(pScreen, width, height, depth)
> }
> 
> Bool
>-afbDestroyPixmap(pPixmap)
>-	PixmapPtr pPixmap;
>+afbDestroyPixmap(PixmapPtr pPixmap)
> {
> 	if(--pPixmap->refcnt)
> 		return(TRUE);
>@@ -189,9 +184,7 @@ afbPadPixmap(PixmapPtr pPixmap)
>  * left.
>  */
> void
>-afbXRotatePixmap(pPix, rw)
>-	PixmapPtr		pPix;
>-	register int rw;
>+afbXRotatePixmap(PixmapPtr pPix, register int rw)
> {
> 	register PixelType		*pw, *pwFinal;
> 	register PixelType		t;
>@@ -225,9 +218,7 @@ afbXRotatePixmap(pPix, rw)
>    works on any width.
>  */
> void
>-afbYRotatePixmap(pPix, rh)
>-	register PixmapPtr		pPix;
>-	int		rh;
>+afbYRotatePixmap(register PixmapPtr pPix, int rh)
> {
> 	int nbyDown;		/* bytes to move down to row 0; also offset of
> 								row rh */
>@@ -262,9 +253,8 @@ afbYRotatePixmap(pPix, rh)
> }
> 
> void
>-afbCopyRotatePixmap(psrcPix, ppdstPix, xrot, yrot)
>-	register PixmapPtr psrcPix, *ppdstPix;
>-	int		xrot, yrot;
>+afbCopyRotatePixmap(register PixmapPtr psrcPix, register PixmapPtr *ppdstPix,
>+	int xrot, int yrot)
> {
> 	register PixmapPtr pdstPix;
> 
>diff --git a/afb/afbply1rct.c b/afb/afbply1rct.c
>index 86ec174..b7a8da2 100644
>--- a/afb/afbply1rct.c
>+++ b/afb/afbply1rct.c
>@@ -63,13 +63,8 @@ in this Software without prior written authorization from the X Consortium.
> #endif
> 
> void
>-afbFillPolygonSolid (pDrawable, pGC, shape, mode, count, ptsIn)
>-	DrawablePtr pDrawable;
>-	GCPtr pGC;
>-	int shape;
>-	int mode;
>-	int count;
>-	DDXPointPtr ptsIn;
>+afbFillPolygonSolid (DrawablePtr pDrawable, GCPtr pGC, int shape, int mode,
>+	int count, DDXPointPtr ptsIn)
> {
> 	afbPrivGCPtr	devPriv;
> 	int nlwidth;
>diff --git a/afb/afbplygblt.c b/afb/afbplygblt.c
>index 289d50e..eec80ab 100644
>--- a/afb/afbplygblt.c
>+++ b/afb/afbplygblt.c
>@@ -86,13 +86,13 @@ one wouldn't.  the code below deals with this.)
> */
> 
> void
>-afbPolyGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
>-	DrawablePtr pDrawable;
>-	GC				*pGC;
>-	int		x, y;
>-	unsigned int nglyph;
>-	CharInfoPtr *ppci;			/* array of character info */
>-	pointer		pglyphBase;		/* start of array of glyphs */
>+afbPolyGlyphBlt (
>+	DrawablePtr pDrawable,
>+	GC				*pGC,
>+	int		x, int y,
>+	unsigned int nglyph,
>+	CharInfoPtr *ppci,			/* array of character info */
>+	pointer		pglyphBase)		/* start of array of glyphs */
> {
> 	ExtentInfoRec info;			/* used by QueryGlyphExtents() */
> 	BoxRec bbox;					/* string's bounding box */
>diff --git a/afb/afbpntarea.c b/afb/afbpntarea.c
>index cc43f52..3fab748 100644
>--- a/afb/afbpntarea.c
>+++ b/afb/afbpntarea.c
>@@ -73,11 +73,8 @@ is equivalent to iy%= tileheight, and saves a division.
> 
> /*ARGSUSED*/
> void
>-afbSolidFillArea (pDraw, nbox, pbox, rrops)
>-	DrawablePtr pDraw;
>-	int nbox;
>-	BoxPtr pbox;
>-	register unsigned char *rrops;
>+afbSolidFillArea (DrawablePtr pDraw, int nbox, BoxPtr pbox,
>+	register unsigned char *rrops)
> {
> 	int nlwidth;				/* width in longwords of the drawable */
> 	int w;						/* width of current box */
>@@ -277,12 +274,8 @@ XOR the destination with the stipple pattern.
> 
> /*ARGSUSED*/
> void
>-afbStippleAreaPPW (pDraw, nbox, pbox, pstipple, rrops)
>-	DrawablePtr pDraw;
>-	int nbox;
>-	BoxPtr pbox;
>-	PixmapPtr pstipple;
>-	unsigned char *rrops;
>+afbStippleAreaPPW (DrawablePtr pDraw, int nbox, BoxPtr pbox, PixmapPtr pstipple,
>+	unsigned char *rrops)
> {
> 	register PixelType *psrc;
> 						/* pointer to bits in tile, if needed */
>@@ -520,14 +513,7 @@ afbStippleAreaPPW (pDraw, nbox, pbox, pstipple, rrops)
> }
> 
> void
>-afbStippleArea (pDraw, nbox, pbox, pTile, xOff, yOff, rrops)
>-	DrawablePtr pDraw;
>-	int nbox;
>-	BoxPtr pbox;
>-	PixmapPtr pTile;
>-	int xOff;
>-	int yOff;
>-	unsigned char *rrops;
>+afbStippleArea (DrawablePtr pDraw, int nbox, BoxPtr pbox, PixmapPtr pTile, int xOff, int yOff, unsigned char *rrops)
> {
> 	register PixelType *psrc;	/* pointer to bits in tile, if needed */
> 	int nlwidth;					/* width in longwords of the drawable */
>diff --git a/afb/afbpntwin.c b/afb/afbpntwin.c
>index 94c96e4..19f567f 100644
>--- a/afb/afbpntwin.c
>+++ b/afb/afbpntwin.c
>@@ -64,10 +64,7 @@ SOFTWARE.
> #include "mi.h"
> 
> void
>-afbPaintWindow(pWin, pRegion, what)
>-	WindowPtr		pWin;
>-	RegionPtr		pRegion;
>-	int				what;
>+afbPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
> {
> 	register afbPrivWin		*pPrivWin;
> 	unsigned char rrops[AFB_MAX_DEPTH];
>diff --git a/afb/afbpolypnt.c b/afb/afbpolypnt.c
>index a9d96ed..cf257e0 100644
>--- a/afb/afbpolypnt.c
>+++ b/afb/afbpolypnt.c
>@@ -63,12 +63,12 @@ SOFTWARE.
> #include "maskbits.h"
> 
> void
>-afbPolyPoint(pDrawable, pGC, mode, npt, pptInit)
>-	register DrawablePtr pDrawable;
>-	GCPtr pGC;
>-	int mode;				/* Origin or Previous */
>-	int npt;
>-	xPoint *pptInit;
>+afbPolyPoint(
>+	register DrawablePtr pDrawable,
>+	GCPtr pGC,
>+	int mode,				/* Origin or Previous */
>+	int npt,
>+	xPoint *pptInit)
> {
> 
> 	register BoxPtr pbox;
>diff --git a/afb/afbsetsp.c b/afb/afbsetsp.c
>index cb36dba..cea313e 100644
>--- a/afb/afbsetsp.c
>+++ b/afb/afbsetsp.c
>@@ -142,14 +142,8 @@ afbSetScanline(int y, int xOrigin, int xStart, int xEnd, PixelType *psrc,
>  * on a word boundary.
>  */
> void
>-afbSetSpans(pDrawable, pGC, pcharsrc, ppt, pwidth, nspans, fSorted)
>-	DrawablePtr pDrawable;
>-	GCPtr pGC;
>-	char *pcharsrc;
>-	register DDXPointPtr ppt;
>-	int *pwidth;
>-	int nspans;
>-	int fSorted;
>+afbSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *pcharsrc, 
>+	register DDXPointPtr ppt, int *pwidth, int nspans, int fSorted)
> {
> 	PixelType *psrc = (PixelType *)pcharsrc;
> 	PixelType *pdstBase;				/* start of dst bitmap */
>diff --git a/afb/afbtegblt.c b/afb/afbtegblt.c
>index ba889cb..fee7b5b 100644
>--- a/afb/afbtegblt.c
>+++ b/afb/afbtegblt.c
>@@ -204,13 +204,13 @@ typedef unsigned int		*glyphPointer;
> #endif
> 
> void
>-afbTEGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
>-	DrawablePtr pDrawable;
>-	GC 				*pGC;
>-	int 		x, y;
>-	unsigned int nglyph;
>-	CharInfoPtr *ppci;				/* array of character info */
>-	pointer		pglyphBase;			/* start of array of glyphs */
>+afbTEGlyphBlt (
>+	DrawablePtr pDrawable,
>+	GC 				*pGC,
>+	int 		x, int y,
>+	unsigned int nglyph,
>+	CharInfoPtr *ppci,				/* array of character info */
>+	pointer		pglyphBase)			/* start of array of glyphs */
> {
> 	FontPtr		pfont = pGC->font;
> 	int widthDst;
>diff --git a/afb/afbwindow.c b/afb/afbwindow.c
>index a4a1602..ba0599c 100644
>--- a/afb/afbwindow.c
>+++ b/afb/afbwindow.c
>@@ -62,8 +62,7 @@ SOFTWARE.
> #include "maskbits.h"
> 
> Bool
>-afbCreateWindow(pWin)
>-	register WindowPtr pWin;
>+afbCreateWindow(register WindowPtr pWin)
> {
> 	register afbPrivWin *pPrivWin;
> 
>@@ -83,8 +82,7 @@ afbCreateWindow(pWin)
> /* This always returns true, because Xfree can't fail.  It might be possible
>  * on some devices for Destroy to fail */
> Bool
>-afbDestroyWindow(pWin)
>-	WindowPtr pWin;
>+afbDestroyWindow(WindowPtr pWin)
> {
> 	register afbPrivWin *pPrivWin;
> 
>@@ -100,8 +98,7 @@ afbDestroyWindow(pWin)
> 
> /*ARGSUSED*/
> Bool
>-afbMapWindow(pWindow)
>-	WindowPtr pWindow;
>+afbMapWindow(WindowPtr pWindow)
> {
> 	return (TRUE);
> }
>@@ -116,9 +113,7 @@ in pPrivWin->pRotated*
> 
> /*ARGSUSED*/
> Bool
>-afbPositionWindow(pWin, x, y)
>-	WindowPtr pWin;
>-	int x, y;
>+afbPositionWindow(WindowPtr pWin, int x, int y)
> {
> 	register afbPrivWin *pPrivWin;
> 	int		reset = 0;
>@@ -160,8 +155,7 @@ afbPositionWindow(pWin, x, y)
> 
> /*ARGSUSED*/
> Bool
>-afbUnmapWindow(pWindow)
>-	WindowPtr pWindow;
>+afbUnmapWindow(WindowPtr pWindow)
> {
> 	return (TRUE);
> }
>@@ -175,10 +169,7 @@ visible in the source.
> 
> 
> void
>-afbCopyWindow(pWin, ptOldOrg, prgnSrc)
>-	WindowPtr pWin;
>-	DDXPointRec ptOldOrg;
>-	RegionPtr prgnSrc;
>+afbCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
> {
> 	DDXPointPtr pptSrc;
> 	register DDXPointPtr ppt;
>@@ -222,9 +213,7 @@ routine (i.e. the pixmap is paddable to 32 bits), also pre-rotate a copy
> of it in devPrivate.
> */
> Bool
>-afbChangeWindowAttributes(pWin, mask)
>-	register WindowPtr pWin;
>-	register unsigned long mask;
>+afbChangeWindowAttributes(register WindowPtr pWin, register unsigned long mask)
> {
> 	register unsigned long index;
> 	register afbPrivWin *pPrivWin;

Actions: View | Splinter Review

Attachments on bug 10996: 10020

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.