All: Remove register keyword v2

dbe/dbe.c

@@ -569,8 +569,8 @@ ProcDbeGetVisualInfo(ClientPtr client)
     DbeScreenPrivPtr pDbeScreenPriv;
     Drawable *drawables;
     DrawablePtr *pDrawables = NULL;
-    register int rc;
-    register int count;         /* number of visual infos in reply */
+    int rc;
+    int count;         /* number of visual infos in reply */
 
     if (stuff->n > UINT32_MAX / sizeof(CARD32))
         return BadLength;

dbe/midbe.c

@@ -71,8 +71,8 @@
 static Bool
 miDbeGetVisualInfo(ScreenPtr pScreen, XdbeScreenVisualInfo * pScrVisInfo)
 {
-    register int i, j, k;
-    register int count;
+    int i, j, k;
+    int count;
     DepthPtr pDepth;
     XdbeVisualInfo *visInfo;
 

doc/Xinput.xml

@@ -475,7 +475,7 @@ allocated.  Its parameters are:
 <literallayout class="monospaced">
 Bool
 InitButtonClassDeviceStruct(dev, numButtons, map)
-    register DeviceIntPtr dev;
+    DeviceIntPtr dev;
     int numButtons;
     CARD8 *map;
 </literallayout>

exa/exa_accel.c

@@ -781,7 +781,7 @@ exaPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrect, xRectangle *prect)
     PixmapPtr pPixmap = exaGetDrawablePixmap(pDrawable);
 
     ExaPixmapPriv(pPixmap);
-    register BoxPtr pbox;
+    BoxPtr pbox;
     BoxPtr pextent;
     int extentX1, extentX2, extentY1, extentY2;
     int fullX1, fullX2, fullY1, fullY2;

fb/fbfillrect.c

@@ -28,7 +28,7 @@ void
 fbPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrect, xRectangle *prect)
 {
     RegionPtr pClip = fbGetCompositeClip(pGC);
-    register BoxPtr pbox;
+    BoxPtr pbox;
     BoxPtr pextent;
     int extentX1, extentX2, extentY1, extentY2;
     int fullX1, fullX2, fullY1, fullY2;

fb/fbpixmap.c

@@ -123,16 +123,16 @@ if (((rx1) < (rx2)) && ((ry1) < (ry2)) &&			\
 RegionPtr
 fbPixmapToRegion(PixmapPtr pPix)
 {
-    register RegionPtr pReg;
+    RegionPtr pReg;
     FbBits *pw, w;
-    register int ib;
+    int ib;
     int width, h, base, rx1 = 0, crects;
     FbBits *pwLineEnd;
     int irectPrevStart, irectLineStart;
-    register BoxPtr prectO, prectN;
+    BoxPtr prectO, prectN;
     BoxPtr FirstRect, rects, prectLineStart;
     Bool fInBox, fSame;
-    register FbBits mask0 = FB_ALLONES & ~FbScrRight(FB_ALLONES, 1);
+    FbBits mask0 = FB_ALLONES & ~FbScrRight(FB_ALLONES, 1);
     FbBits *pwLine;
     int nWidth;
 

glx/xfont.c

@@ -52,8 +52,8 @@ __glXMakeBitmapFromGlyph(FontPtr font, CharInfoPtr pci)
     int allocBytes;             /* bytes to allocate to store bitmap */
     int w;                      /* width of glyph in bits */
     int h;                      /* height of glyph */
-    register unsigned char *pglyph;
-    register unsigned char *p;
+    unsigned char *pglyph;
+    unsigned char *p;
     unsigned char *allocbuf;
 
 #define __GL_CHAR_BUF_SIZE 2048

hw/kdrive/src/kinput.c

@@ -2230,20 +2230,20 @@ ProcessInputEvents(void)
 
 /* At the moment, absolute/relative is up to the client. */
 int
-SetDeviceMode(register ClientPtr client, DeviceIntPtr pDev, int mode)
+SetDeviceMode(ClientPtr client, DeviceIntPtr pDev, int mode)
 {
     return BadMatch;
 }
 
 int
-SetDeviceValuators(register ClientPtr client, DeviceIntPtr pDev,
+SetDeviceValuators(ClientPtr client, DeviceIntPtr pDev,
                    int *valuators, int first_valuator, int num_valuators)
 {
     return BadMatch;
 }
 
 int
-ChangeDeviceControl(register ClientPtr client, DeviceIntPtr pDev,
+ChangeDeviceControl(ClientPtr client, DeviceIntPtr pDev,
                     xDeviceCtl * control)
 {
     switch (control->control) {

hw/xfree86/common/compiler.h

@@ -546,7 +546,7 @@ extern _X_EXPORT volatile unsigned char *ioBase;
 static __inline__ unsigned char
 xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)
 {
-    register unsigned char val;
+    unsigned char val;
     __asm__ __volatile__("lbzx %0,%1,%2\n\t" "eieio":"=r"(val)
                          :"b"(base), "r"(offset),
                          "m"(*((volatile unsigned char *) base + offset)));
@@ -556,7 +556,7 @@ xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)
 static __inline__ unsigned short
 xf86ReadMmio16Be(__volatile__ void *base, const unsigned long offset)
 {
-    register unsigned short val;
+    unsigned short val;
     __asm__ __volatile__("lhzx %0,%1,%2\n\t" "eieio":"=r"(val)
                          :"b"(base), "r"(offset),
                          "m"(*((volatile unsigned char *) base + offset)));
@@ -566,7 +566,7 @@ xf86ReadMmio16Be(__volatile__ void *base, const unsigned long offset)
 static __inline__ unsigned short
 xf86ReadMmio16Le(__volatile__ void *base, const unsigned long offset)
 {
-    register unsigned short val;
+    unsigned short val;
     __asm__ __volatile__("lhbrx %0,%1,%2\n\t" "eieio":"=r"(val)
                          :"b"(base), "r"(offset),
                          "m"(*((volatile unsigned char *) base + offset)));
@@ -576,7 +576,7 @@ xf86ReadMmio16Le(__volatile__ void *base, const unsigned long offset)
 static __inline__ unsigned int
 xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)
 {
-    register unsigned int val;
+    unsigned int val;
     __asm__ __volatile__("lwzx %0,%1,%2\n\t" "eieio":"=r"(val)
                          :"b"(base), "r"(offset),
                          "m"(*((volatile unsigned char *) base + offset)));
@@ -586,7 +586,7 @@ xf86ReadMmio32Be(__volatile__ void *base, const unsigned long offset)
 static __inline__ unsigned int
 xf86ReadMmio32Le(__volatile__ void *base, const unsigned long offset)
 {
-    register unsigned int val;
+    unsigned int val;
     __asm__ __volatile__("lwbrx %0,%1,%2\n\t" "eieio":"=r"(val)
                          :"b"(base), "r"(offset),
                          "m"(*((volatile unsigned char *) base + offset)));

hw/xfree86/common/xf86VGAarbiter.c

@@ -620,7 +620,7 @@ static void
 VGAarbiterSetSpans(DrawablePtr pDraw,
                    GCPtr pGC,
                    char *pcharsrc,
-                   register DDXPointPtr ppt,
+                   DDXPointPtr ppt,
                    int *pwidth, int nspans, int fSorted)
 {
     ScreenPtr pScreen = pGC->pScreen;

hw/xfree86/common/xf86VGAarbiterPriv.h

@@ -208,7 +208,7 @@ static void VGAarbiterFillSpans(DrawablePtr pDraw, GCPtr pGC, int nInit,
                                 DDXPointPtr pptInit, int *pwidthInit,
                                 int fSorted);
 static void VGAarbiterSetSpans(DrawablePtr pDraw, GCPtr pGC, char *pcharsrc,
-                               register DDXPointPtr ppt, int *pwidth,
+                               DDXPointPtr ppt, int *pwidth,
                                int nspans, int fSorted);
 static void VGAarbiterPutImage(DrawablePtr pDraw, GCPtr pGC, int depth, int x,
                                int y, int w, int h, int leftPad, int format,

hw/xfree86/ddc/ddc.c

@@ -183,8 +183,8 @@ GetEDID_DDC1(unsigned int *s_ptr)
 
 /* fetch entire EDID record; DDC bit needs to be masked */
 static unsigned int *
-FetchEDID_DDC1(register ScrnInfoPtr pScrn,
-               register unsigned int (*read_DDC) (ScrnInfoPtr))
+FetchEDID_DDC1(ScrnInfoPtr pScrn,
+               unsigned int (*read_DDC) (ScrnInfoPtr))
 {
     int count = NUM;
     unsigned int *ptr, *xp;

hw/xfree86/dri/xf86dri.c

@@ -76,7 +76,7 @@ XF86DRIResetProc(ExtensionEntry *extEntry)
 }
 
 static int
-ProcXF86DRIQueryVersion(register ClientPtr client)
+ProcXF86DRIQueryVersion(ClientPtr client)
 {
     xXF86DRIQueryVersionReply rep = {
         .majorVersion = SERVER_XF86DRI_MAJOR_VERSION,
@@ -94,7 +94,7 @@ ProcXF86DRIQueryVersion(register ClientPtr client)
 }
 
 static int
-ProcXF86DRIQueryDirectRenderingCapable(register ClientPtr client)
+ProcXF86DRIQueryDirectRenderingCapable(ClientPtr client)
 {
     Bool isCapable;
 
@@ -127,7 +127,7 @@ ProcXF86DRIQueryDirectRenderingCapable(register ClientPtr client)
 }
 
 static int
-ProcXF86DRIOpenConnection(register ClientPtr client)
+ProcXF86DRIOpenConnection(ClientPtr client)
 {
     drm_handle_t hSAREA;
     char *busIdString;
@@ -167,7 +167,7 @@ ProcXF86DRIOpenConnection(register ClientPtr client)
 }
 
 static int
-ProcXF86DRIAuthConnection(register ClientPtr client)
+ProcXF86DRIAuthConnection(ClientPtr client)
 {
     REQUEST(xXF86DRIAuthConnectionReq);
     REQUEST_SIZE_MATCH(xXF86DRIAuthConnectionReq);
@@ -192,7 +192,7 @@ ProcXF86DRIAuthConnection(register ClientPtr client)
 }
 
 static int
-ProcXF86DRICloseConnection(register ClientPtr client)
+ProcXF86DRICloseConnection(ClientPtr client)
 {
     REQUEST(xXF86DRICloseConnectionReq);
     REQUEST_SIZE_MATCH(xXF86DRICloseConnectionReq);
@@ -208,7 +208,7 @@ ProcXF86DRICloseConnection(register ClientPtr client)
 }
 
 static int
-ProcXF86DRIGetClientDriverName(register ClientPtr client)
+ProcXF86DRIGetClientDriverName(ClientPtr client)
 {
     char *clientDriverName = NULL;
 
@@ -239,7 +239,7 @@ ProcXF86DRIGetClientDriverName(register ClientPtr client)
 }
 
 static int
-ProcXF86DRICreateContext(register ClientPtr client)
+ProcXF86DRICreateContext(ClientPtr client)
 {
     REQUEST(xXF86DRICreateContextReq);
     REQUEST_SIZE_MATCH(xXF86DRICreateContextReq);
@@ -262,7 +262,7 @@ ProcXF86DRICreateContext(register ClientPtr client)
 }
 
 static int
-ProcXF86DRIDestroyContext(register ClientPtr client)
+ProcXF86DRIDestroyContext(ClientPtr client)
 {
     REQUEST(xXF86DRIDestroyContextReq);
     REQUEST_SIZE_MATCH(xXF86DRIDestroyContextReq);
@@ -310,7 +310,7 @@ ProcXF86DRICreateDrawable(ClientPtr client)
 }
 
 static int
-ProcXF86DRIDestroyDrawable(register ClientPtr client)
+ProcXF86DRIDestroyDrawable(ClientPtr client)
 {
     REQUEST(xXF86DRIDestroyDrawableReq);
     DrawablePtr pDrawable;
@@ -338,7 +338,7 @@ ProcXF86DRIDestroyDrawable(register ClientPtr client)
 }
 
 static int
-ProcXF86DRIGetDrawableInfo(register ClientPtr client)
+ProcXF86DRIGetDrawableInfo(ClientPtr client)
 {
     DrawablePtr pDrawable;
     int X, Y, W, H;
@@ -421,7 +421,7 @@ ProcXF86DRIGetDrawableInfo(register ClientPtr client)
 }
 
 static int
-ProcXF86DRIGetDeviceInfo(register ClientPtr client)
+ProcXF86DRIGetDeviceInfo(ClientPtr client)
 {
     drm_handle_t hFrameBuffer;
     void *pDevPrivate;
@@ -460,7 +460,7 @@ ProcXF86DRIGetDeviceInfo(register ClientPtr client)
 }
 
 static int
-ProcXF86DRIDispatch(register ClientPtr client)
+ProcXF86DRIDispatch(ClientPtr client)
 {
     REQUEST(xReq);
 

hw/xfree86/int10/helper_exec.c

@@ -227,7 +227,7 @@ int
 port_rep_inb(xf86Int10InfoPtr pInt,
              uint16_t port, uint32_t base, int d_f, uint32_t count)
 {
-    register int inc = d_f ? -1 : 1;
+    int inc = d_f ? -1 : 1;
     uint32_t dst = base;
 
     if (PRINT_PORT && DEBUG_IO_TRACE())
@@ -244,7 +244,7 @@ int
 port_rep_inw(xf86Int10InfoPtr pInt,
              uint16_t port, uint32_t base, int d_f, uint32_t count)
 {
-    register int inc = d_f ? -2 : 2;
+    int inc = d_f ? -2 : 2;
     uint32_t dst = base;
 
     if (PRINT_PORT && DEBUG_IO_TRACE())
@@ -261,7 +261,7 @@ int
 port_rep_inl(xf86Int10InfoPtr pInt,
              uint16_t port, uint32_t base, int d_f, uint32_t count)
 {
-    register int inc = d_f ? -4 : 4;
+    int inc = d_f ? -4 : 4;
     uint32_t dst = base;
 
     if (PRINT_PORT && DEBUG_IO_TRACE())
@@ -278,7 +278,7 @@ int
 port_rep_outb(xf86Int10InfoPtr pInt,
               uint16_t port, uint32_t base, int d_f, uint32_t count)
 {
-    register int inc = d_f ? -1 : 1;
+    int inc = d_f ? -1 : 1;
     uint32_t dst = base;
 
     if (PRINT_PORT && DEBUG_IO_TRACE())
@@ -295,7 +295,7 @@ int
 port_rep_outw(xf86Int10InfoPtr pInt,
               uint16_t port, uint32_t base, int d_f, uint32_t count)
 {
-    register int inc = d_f ? -2 : 2;
+    int inc = d_f ? -2 : 2;
     uint32_t dst = base;
 
     if (PRINT_PORT && DEBUG_IO_TRACE())
@@ -312,7 +312,7 @@ int
 port_rep_outl(xf86Int10InfoPtr pInt,
               uint16_t port, uint32_t base, int d_f, uint32_t count)
 {
-    register int inc = d_f ? -4 : 4;
+    int inc = d_f ? -4 : 4;
     uint32_t dst = base;
 
     if (PRINT_PORT && DEBUG_IO_TRACE())

hw/xfree86/os-support/bsd/alpha_video.c

@@ -205,15 +205,15 @@ xf86DisableIO()
 
 #endif                          /* USE_ALPHA_PIO */
 
-extern int readDense8(void *Base, register unsigned long Offset);
-extern int readDense16(void *Base, register unsigned long Offset);
-extern int readDense32(void *Base, register unsigned long Offset);
+extern int readDense8(void *Base, unsigned long Offset);
+extern int readDense16(void *Base, unsigned long Offset);
+extern int readDense32(void *Base, unsigned long Offset);
 extern void
- writeDense8(int Value, void *Base, register unsigned long Offset);
+ writeDense8(int Value, void *Base, unsigned long Offset);
 extern void
- writeDense16(int Value, void *Base, register unsigned long Offset);
+ writeDense16(int Value, void *Base, unsigned long Offset);
 extern void
- writeDense32(int Value, void *Base, register unsigned long Offset);
+ writeDense32(int Value, void *Base, unsigned long Offset);
 
 void (*xf86WriteMmio8) (int Value, void *Base, unsigned long Offset)
     = writeDense8;