From 4c625fc5e57ca9de79e49b3f33cfdecee6062b06 Mon Sep 17 00:00:00 2001 From: Chase Date: Sat, 15 Nov 2025 17:04:20 -0500 Subject: [PATCH 1/2] All: Remove register keyword v2 --- dbe/dbe.c | 4 +- dbe/midbe.c | 4 +- doc/Xinput.xml | 2 +- exa/exa_accel.c | 2 +- fb/fbfillrect.c | 2 +- fb/fbpixmap.c | 8 +- glx/xfont.c | 4 +- hw/kdrive/src/kinput.c | 6 +- hw/xfree86/common/xf86VGAarbiter.c | 2 +- hw/xfree86/common/xf86VGAarbiterPriv.h | 2 +- hw/xfree86/ddc/ddc.c | 4 +- hw/xfree86/dri/xf86dri.c | 24 +-- hw/xfree86/int10/helper_exec.c | 12 +- hw/xfree86/os-support/bsd/alpha_video.c | 12 +- hw/xfree86/os-support/bsd/bsd_ev56.c | 24 +-- hw/xfree86/os-support/linux/lnx_ev56.c | 24 +-- hw/xfree86/vgahw/vgaHW.c | 2 +- hw/xfree86/x86emu/prim_ops.c | 150 +++++++++---------- hw/xnest/Pixmap.c | 4 +- hw/xquartz/applewm.c | 30 ++-- hw/xquartz/xpr/appledri.c | 10 +- miext/rootless/rootlessScreen.c | 2 +- miext/rootless/rootlessValTree.c | 10 +- os/access.c | 36 ++--- os/io.c | 8 +- os/strlcat.c | 6 +- os/strlcpy.c | 6 +- os/xserver_poll.c | 10 +- pseudoramiX/pseudoramiX.c | 6 +- randr/rrxinerama.c | 6 +- xkb/XKBAlloc.c | 8 +- xkb/XKBGAlloc.c | 32 ++-- xkb/XKBMAlloc.c | 16 +- xkb/XKBMisc.c | 4 +- xkb/maprules.c | 4 +- xkb/xkb.c | 190 ++++++++++++------------ xkb/xkbActions.c | 10 +- xkb/xkbEvents.c | 2 +- xkb/xkbInit.c | 2 +- xkb/xkbLEDs.c | 22 +-- xkb/xkbUtils.c | 16 +- xkb/xkbfmisc.c | 2 +- xkb/xkbout.c | 26 ++-- xkb/xkbtext.c | 14 +- xkb/xkmread.c | 32 ++-- 45 files changed, 401 insertions(+), 401 deletions(-) diff --git a/dbe/dbe.c b/dbe/dbe.c index ccdd555aff..b7eb4e183d 100644 --- a/dbe/dbe.c +++ b/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; diff --git a/dbe/midbe.c b/dbe/midbe.c index 05d7c22279..6dfa369adf 100644 --- a/dbe/midbe.c +++ b/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; diff --git a/doc/Xinput.xml b/doc/Xinput.xml index 1f7f3034b7..0518c189bc 100644 --- a/doc/Xinput.xml +++ b/doc/Xinput.xml @@ -475,7 +475,7 @@ allocated. Its parameters are: Bool InitButtonClassDeviceStruct(dev, numButtons, map) - register DeviceIntPtr dev; + DeviceIntPtr dev; int numButtons; CARD8 *map; diff --git a/exa/exa_accel.c b/exa/exa_accel.c index 1d204aeaef..43a17c526c 100644 --- a/exa/exa_accel.c +++ b/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; diff --git a/fb/fbfillrect.c b/fb/fbfillrect.c index 78feba691f..41af662efb 100644 --- a/fb/fbfillrect.c +++ b/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; diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c index a1b93884b7..986b818f74 100644 --- a/fb/fbpixmap.c +++ b/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; diff --git a/glx/xfont.c b/glx/xfont.c index 05927f76cd..e12264f5a2 100644 --- a/glx/xfont.c +++ b/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 diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 302b928fd8..ca3282c7da 100644 --- a/hw/kdrive/src/kinput.c +++ b/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) { diff --git a/hw/xfree86/common/xf86VGAarbiter.c b/hw/xfree86/common/xf86VGAarbiter.c index 3cb8f75658..b9e33e9dac 100644 --- a/hw/xfree86/common/xf86VGAarbiter.c +++ b/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; diff --git a/hw/xfree86/common/xf86VGAarbiterPriv.h b/hw/xfree86/common/xf86VGAarbiterPriv.h index 03c907bba3..50d0739375 100644 --- a/hw/xfree86/common/xf86VGAarbiterPriv.h +++ b/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, diff --git a/hw/xfree86/ddc/ddc.c b/hw/xfree86/ddc/ddc.c index 27e86d905e..c8d05f4ba5 100644 --- a/hw/xfree86/ddc/ddc.c +++ b/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; diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index 0fcc4137b4..c43fea3655 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/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); diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index 34dfb675df..7e71493bf6 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/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()) diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c index 8c69aa23e9..06e389495a 100644 --- a/hw/xfree86/os-support/bsd/alpha_video.c +++ b/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; diff --git a/hw/xfree86/os-support/bsd/bsd_ev56.c b/hw/xfree86/os-support/bsd/bsd_ev56.c index 6a190ab4e8..5d11055922 100644 --- a/hw/xfree86/os-support/bsd/bsd_ev56.c +++ b/hw/xfree86/os-support/bsd/bsd_ev56.c @@ -23,53 +23,53 @@ */ __asm(".arch ev56"); -int readDense8(void *Base, register unsigned long Offset); -int readDense16(void *Base, register unsigned long Offset); -int readDense32(void *Base, register unsigned long Offset); +int readDense8(void *Base, unsigned long Offset); +int readDense16(void *Base, unsigned long Offset); +int readDense32(void *Base, unsigned long Offset); void - writeDense8(int Value, void *Base, register unsigned long Offset); + writeDense8(int Value, void *Base, unsigned long Offset); void - writeDense16(int Value, void *Base, register unsigned long Offset); + writeDense16(int Value, void *Base, unsigned long Offset); void - writeDense32(int Value, void *Base, register unsigned long Offset); + writeDense32(int Value, void *Base, unsigned long Offset); int -readDense8(void *Base, register unsigned long Offset) +readDense8(void *Base, unsigned long Offset) { mem_barrier(); return (alpha_ldbu((void *) ((unsigned long) Base + (Offset)))); } int -readDense16(void *Base, register unsigned long Offset) +readDense16(void *Base, unsigned long Offset) { mem_barrier(); return (alpha_ldwu((void *) ((unsigned long) Base + (Offset)))); } int -readDense32(void *Base, register unsigned long Offset) +readDense32(void *Base, unsigned long Offset) { mem_barrier(); return *(volatile CARD32 *) ((unsigned long) Base + (Offset)); } void -writeDense8(int Value, void *Base, register unsigned long Offset) +writeDense8(int Value, void *Base, unsigned long Offset) { write_mem_barrier(); alpha_stb((void *) ((unsigned long) Base + (Offset)), Value); } void -writeDense16(int Value, void *Base, register unsigned long Offset) +writeDense16(int Value, void *Base, unsigned long Offset) { write_mem_barrier(); alpha_stw((void *) ((unsigned long) Base + (Offset)), Value); } void -writeDense32(int Value, void *Base, register unsigned long Offset) +writeDense32(int Value, void *Base, unsigned long Offset) { write_mem_barrier(); *(volatile CARD32 *) ((unsigned long) Base + (Offset)) = Value; diff --git a/hw/xfree86/os-support/linux/lnx_ev56.c b/hw/xfree86/os-support/linux/lnx_ev56.c index 4e886b6ced..dfa769ad22 100644 --- a/hw/xfree86/os-support/linux/lnx_ev56.c +++ b/hw/xfree86/os-support/linux/lnx_ev56.c @@ -6,53 +6,53 @@ #include "xf86.h" #include "compiler.h" -int readDense8(void *Base, register unsigned long Offset); -int readDense16(void *Base, register unsigned long Offset); -int readDense32(void *Base, register unsigned long Offset); +int readDense8(void *Base, unsigned long Offset); +int readDense16(void *Base, unsigned long Offset); +int readDense32(void *Base, unsigned long Offset); void - writeDense8(int Value, void *Base, register unsigned long Offset); + writeDense8(int Value, void *Base, unsigned long Offset); void - writeDense16(int Value, void *Base, register unsigned long Offset); + writeDense16(int Value, void *Base, unsigned long Offset); void - writeDense32(int Value, void *Base, register unsigned long Offset); + writeDense32(int Value, void *Base, unsigned long Offset); int -readDense8(void *Base, register unsigned long Offset) +readDense8(void *Base, unsigned long Offset) { mem_barrier(); return *(volatile CARD8 *) ((unsigned long) Base + (Offset)); } int -readDense16(void *Base, register unsigned long Offset) +readDense16(void *Base, unsigned long Offset) { mem_barrier(); return *(volatile CARD16 *) ((unsigned long) Base + (Offset)); } int -readDense32(void *Base, register unsigned long Offset) +readDense32(void *Base, unsigned long Offset) { mem_barrier(); return *(volatile CARD32 *) ((unsigned long) Base + (Offset)); } void -writeDense8(int Value, void *Base, register unsigned long Offset) +writeDense8(int Value, void *Base, unsigned long Offset) { write_mem_barrier(); *(volatile CARD8 *) ((unsigned long) Base + (Offset)) = Value; } void -writeDense16(int Value, void *Base, register unsigned long Offset) +writeDense16(int Value, void *Base, unsigned long Offset) { write_mem_barrier(); *(volatile CARD16 *) ((unsigned long) Base + (Offset)) = Value; } void -writeDense32(int Value, void *Base, register unsigned long Offset) +writeDense32(int Value, void *Base, unsigned long Offset) { write_mem_barrier(); *(volatile CARD32 *) ((unsigned long) Base + (Offset)) = Value; diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index e1c2163f3f..1b1fa5c24d 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -1903,7 +1903,7 @@ xf86GetClocks(ScrnInfoPtr pScrn, int num, Bool (*ClockFunc) (ScrnInfoPtr, int), unsigned long vertsyncreg, int maskval, int knownclkindex, int knownclkvalue) { - register int status = vertsyncreg; + int status = vertsyncreg; unsigned long i, cnt, rcnt, sync; vgaHWPtr hwp = VGAHWPTR(pScrn); diff --git a/hw/xfree86/x86emu/prim_ops.c b/hw/xfree86/x86emu/prim_ops.c index ff25215e27..1b62a1503b 100644 --- a/hw/xfree86/x86emu/prim_ops.c +++ b/hw/xfree86/x86emu/prim_ops.c @@ -230,8 +230,8 @@ Implements the ADC instruction and side effects. u8 adc_byte(u8 d, u8 s) { - register u32 res; /* all operands in native machine order */ - register u32 cc; + u32 res; /* all operands in native machine order */ + u32 cc; if (ACCESS_FLAG(F_CF)) res = 1 + d + s; @@ -257,8 +257,8 @@ Implements the ADC instruction and side effects. u16 adc_word(u16 d, u16 s) { - register u32 res; /* all operands in native machine order */ - register u32 cc; + u32 res; /* all operands in native machine order */ + u32 cc; if (ACCESS_FLAG(F_CF)) res = 1 + d + s; @@ -284,10 +284,10 @@ Implements the ADC instruction and side effects. u32 adc_long(u32 d, u32 s) { - register u32 lo; /* all operands in native machine order */ - register u32 hi; - register u32 res; - register u32 cc; + u32 lo; /* all operands in native machine order */ + u32 hi; + u32 res; + u32 cc; if (ACCESS_FLAG(F_CF)) { lo = 1 + (d & 0xFFFF) + (s & 0xFFFF); @@ -318,8 +318,8 @@ Implements the ADD instruction and side effects. u8 add_byte(u8 d, u8 s) { - register u32 res; /* all operands in native machine order */ - register u32 cc; + u32 res; /* all operands in native machine order */ + u32 cc; res = d + s; CONDITIONAL_SET_FLAG(res & 0x100, F_CF); @@ -341,8 +341,8 @@ Implements the ADD instruction and side effects. u16 add_word(u16 d, u16 s) { - register u32 res; /* all operands in native machine order */ - register u32 cc; + u32 res; /* all operands in native machine order */ + u32 cc; res = d + s; CONDITIONAL_SET_FLAG(res & 0x10000, F_CF); @@ -364,10 +364,10 @@ Implements the ADD instruction and side effects. u32 add_long(u32 d, u32 s) { - register u32 lo; /* all operands in native machine order */ - register u32 hi; - register u32 res; - register u32 cc; + u32 lo; /* all operands in native machine order */ + u32 hi; + u32 res; + u32 cc; lo = (d & 0xFFFF) + (s & 0xFFFF); res = d + s; @@ -393,7 +393,7 @@ Implements the AND instruction and side effects. u8 and_byte(u8 d, u8 s) { - register u8 res; /* all operands in native machine order */ + u8 res; /* all operands in native machine order */ res = d & s; @@ -414,7 +414,7 @@ Implements the AND instruction and side effects. u16 and_word(u16 d, u16 s) { - register u16 res; /* all operands in native machine order */ + u16 res; /* all operands in native machine order */ res = d & s; @@ -435,7 +435,7 @@ Implements the AND instruction and side effects. u32 and_long(u32 d, u32 s) { - register u32 res; /* all operands in native machine order */ + u32 res; /* all operands in native machine order */ res = d & s; @@ -456,8 +456,8 @@ Implements the CMP instruction and side effects. u8 cmp_byte(u8 d, u8 s) { - register u32 res; /* all operands in native machine order */ - register u32 bc; + u32 res; /* all operands in native machine order */ + u32 bc; res = d - s; CLEAR_FLAG(F_CF); @@ -480,8 +480,8 @@ Implements the CMP instruction and side effects. u16 cmp_word(u16 d, u16 s) { - register u32 res; /* all operands in native machine order */ - register u32 bc; + u32 res; /* all operands in native machine order */ + u32 bc; res = d - s; CONDITIONAL_SET_FLAG(res & 0x8000, F_SF); @@ -503,8 +503,8 @@ Implements the CMP instruction and side effects. u32 cmp_long(u32 d, u32 s) { - register u32 res; /* all operands in native machine order */ - register u32 bc; + u32 res; /* all operands in native machine order */ + u32 bc; res = d - s; CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF); @@ -570,8 +570,8 @@ Implements the DEC instruction and side effects. u8 dec_byte(u8 d) { - register u32 res; /* all operands in native machine order */ - register u32 bc; + u32 res; /* all operands in native machine order */ + u32 bc; res = d - 1; CONDITIONAL_SET_FLAG(res & 0x80, F_SF); @@ -594,8 +594,8 @@ Implements the DEC instruction and side effects. u16 dec_word(u16 d) { - register u32 res; /* all operands in native machine order */ - register u32 bc; + u32 res; /* all operands in native machine order */ + u32 bc; res = d - 1; CONDITIONAL_SET_FLAG(res & 0x8000, F_SF); @@ -618,8 +618,8 @@ Implements the DEC instruction and side effects. u32 dec_long(u32 d) { - register u32 res; /* all operands in native machine order */ - register u32 bc; + u32 res; /* all operands in native machine order */ + u32 bc; res = d - 1; @@ -642,8 +642,8 @@ Implements the INC instruction and side effects. u8 inc_byte(u8 d) { - register u32 res; /* all operands in native machine order */ - register u32 cc; + u32 res; /* all operands in native machine order */ + u32 cc; res = d + 1; CONDITIONAL_SET_FLAG((res & 0xff) == 0, F_ZF); @@ -664,8 +664,8 @@ Implements the INC instruction and side effects. u16 inc_word(u16 d) { - register u32 res; /* all operands in native machine order */ - register u32 cc; + u32 res; /* all operands in native machine order */ + u32 cc; res = d + 1; CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF); @@ -686,8 +686,8 @@ Implements the INC instruction and side effects. u32 inc_long(u32 d) { - register u32 res; /* all operands in native machine order */ - register u32 cc; + u32 res; /* all operands in native machine order */ + u32 cc; res = d + 1; CONDITIONAL_SET_FLAG((res & 0xffffffff) == 0, F_ZF); @@ -708,7 +708,7 @@ Implements the OR instruction and side effects. u8 or_byte(u8 d, u8 s) { - register u8 res; /* all operands in native machine order */ + u8 res; /* all operands in native machine order */ res = d | s; CLEAR_FLAG(F_OF); @@ -727,7 +727,7 @@ Implements the OR instruction and side effects. u16 or_word(u16 d, u16 s) { - register u16 res; /* all operands in native machine order */ + u16 res; /* all operands in native machine order */ res = d | s; /* set the carry flag to be bit 8 */ @@ -747,7 +747,7 @@ Implements the OR instruction and side effects. u32 or_long(u32 d, u32 s) { - register u32 res; /* all operands in native machine order */ + u32 res; /* all operands in native machine order */ res = d | s; @@ -768,8 +768,8 @@ Implements the OR instruction and side effects. u8 neg_byte(u8 s) { - register u8 res; - register u8 bc; + u8 res; + u8 bc; CONDITIONAL_SET_FLAG(s != 0, F_CF); res = (u8) - s; @@ -794,8 +794,8 @@ Implements the OR instruction and side effects. u16 neg_word(u16 s) { - register u16 res; - register u16 bc; + u16 res; + u16 bc; CONDITIONAL_SET_FLAG(s != 0, F_CF); res = (u16) - s; @@ -821,8 +821,8 @@ Implements the OR instruction and side effects. u32 neg_long(u32 s) { - register u32 res; - register u32 bc; + u32 res; + u32 bc; CONDITIONAL_SET_FLAG(s != 0, F_CF); res = (u32) - s; @@ -878,7 +878,7 @@ Implements the RCL instruction and side effects. u8 rcl_byte(u8 d, u8 s) { - register unsigned int res, cnt, mask, cf; + unsigned int res, cnt, mask, cf; /* s is the rotate distance. It varies from 0 - 8. */ /* have @@ -951,7 +951,7 @@ Implements the RCL instruction and side effects. u16 rcl_word(u16 d, u8 s) { - register unsigned int res, cnt, mask, cf; + unsigned int res, cnt, mask, cf; res = d; if ((cnt = s % 17) != 0) { @@ -975,7 +975,7 @@ Implements the RCL instruction and side effects. u32 rcl_long(u32 d, u8 s) { - register u32 res, cnt, mask, cf; + u32 res, cnt, mask, cf; res = d; if ((cnt = s % 33) != 0) { @@ -1151,7 +1151,7 @@ Implements the ROL instruction and side effects. u8 rol_byte(u8 d, u8 s) { - register unsigned int res, cnt, mask; + unsigned int res, cnt, mask; /* rotate left */ /* @@ -1201,7 +1201,7 @@ Implements the ROL instruction and side effects. u16 rol_word(u16 d, u8 s) { - register unsigned int res, cnt, mask; + unsigned int res, cnt, mask; res = d; if ((cnt = s % 16) != 0) { @@ -1227,7 +1227,7 @@ Implements the ROL instruction and side effects. u32 rol_long(u32 d, u8 s) { - register u32 res, cnt, mask; + u32 res, cnt, mask; res = d; if ((cnt = s % 32) != 0) { @@ -1253,7 +1253,7 @@ Implements the ROR instruction and side effects. u8 ror_byte(u8 d, u8 s) { - register unsigned int res, cnt, mask; + unsigned int res, cnt, mask; /* rotate right */ /* @@ -1301,7 +1301,7 @@ Implements the ROR instruction and side effects. u16 ror_word(u16 d, u8 s) { - register unsigned int res, cnt, mask; + unsigned int res, cnt, mask; res = d; if ((cnt = s % 16) != 0) { @@ -1326,7 +1326,7 @@ Implements the ROR instruction and side effects. u32 ror_long(u32 d, u8 s) { - register u32 res, cnt, mask; + u32 res, cnt, mask; res = d; if ((cnt = s % 32) != 0) { @@ -1895,8 +1895,8 @@ Implements the SBB instruction and side effects. u8 sbb_byte(u8 d, u8 s) { - register u32 res; /* all operands in native machine order */ - register u32 bc; + u32 res; /* all operands in native machine order */ + u32 bc; if (ACCESS_FLAG(F_CF)) res = d - s - 1; @@ -1921,8 +1921,8 @@ Implements the SBB instruction and side effects. u16 sbb_word(u16 d, u16 s) { - register u32 res; /* all operands in native machine order */ - register u32 bc; + u32 res; /* all operands in native machine order */ + u32 bc; if (ACCESS_FLAG(F_CF)) res = d - s - 1; @@ -1947,8 +1947,8 @@ Implements the SBB instruction and side effects. u32 sbb_long(u32 d, u32 s) { - register u32 res; /* all operands in native machine order */ - register u32 bc; + u32 res; /* all operands in native machine order */ + u32 bc; if (ACCESS_FLAG(F_CF)) res = d - s - 1; @@ -1973,8 +1973,8 @@ Implements the SUB instruction and side effects. u8 sub_byte(u8 d, u8 s) { - register u32 res; /* all operands in native machine order */ - register u32 bc; + u32 res; /* all operands in native machine order */ + u32 bc; res = d - s; CONDITIONAL_SET_FLAG(res & 0x80, F_SF); @@ -1996,8 +1996,8 @@ Implements the SUB instruction and side effects. u16 sub_word(u16 d, u16 s) { - register u32 res; /* all operands in native machine order */ - register u32 bc; + u32 res; /* all operands in native machine order */ + u32 bc; res = d - s; CONDITIONAL_SET_FLAG(res & 0x8000, F_SF); @@ -2019,8 +2019,8 @@ Implements the SUB instruction and side effects. u32 sub_long(u32 d, u32 s) { - register u32 res; /* all operands in native machine order */ - register u32 bc; + u32 res; /* all operands in native machine order */ + u32 bc; res = d - s; CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF); @@ -2042,7 +2042,7 @@ Implements the TEST instruction and side effects. void test_byte(u8 d, u8 s) { - register u32 res; /* all operands in native machine order */ + u32 res; /* all operands in native machine order */ res = d & s; @@ -2061,7 +2061,7 @@ Implements the TEST instruction and side effects. void test_word(u16 d, u16 s) { - register u32 res; /* all operands in native machine order */ + u32 res; /* all operands in native machine order */ res = d & s; @@ -2080,7 +2080,7 @@ Implements the TEST instruction and side effects. void test_long(u32 d, u32 s) { - register u32 res; /* all operands in native machine order */ + u32 res; /* all operands in native machine order */ res = d & s; @@ -2099,7 +2099,7 @@ Implements the XOR instruction and side effects. u8 xor_byte(u8 d, u8 s) { - register u8 res; /* all operands in native machine order */ + u8 res; /* all operands in native machine order */ res = d ^ s; CLEAR_FLAG(F_OF); @@ -2118,7 +2118,7 @@ Implements the XOR instruction and side effects. u16 xor_word(u16 d, u16 s) { - register u16 res; /* all operands in native machine order */ + u16 res; /* all operands in native machine order */ res = d ^ s; CLEAR_FLAG(F_OF); @@ -2137,7 +2137,7 @@ Implements the XOR instruction and side effects. u32 xor_long(u32 d, u32 s) { - register u32 res; /* all operands in native machine order */ + u32 res; /* all operands in native machine order */ res = d ^ s; CLEAR_FLAG(F_OF); @@ -2770,7 +2770,7 @@ NOTE: Do not inline this, as (*sys_rdX) is already inline! u16 pop_word(void) { - register u16 res; + u16 res; DB(if (CHECK_SP_ACCESS()) x86emu_check_sp_access();) @@ -2788,7 +2788,7 @@ NOTE: Do not inline this, as (*sys_rdX) is already inline! u32 pop_long(void) { - register u32 res; + u32 res; DB(if (CHECK_SP_ACCESS()) x86emu_check_sp_access();) diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c index a231effc0e..012d49bf11 100644 --- a/hw/xnest/Pixmap.c +++ b/hw/xnest/Pixmap.c @@ -93,8 +93,8 @@ xnestModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int depth, RegionPtr xnestPixmapToRegion(PixmapPtr pPixmap) { - register RegionPtr pReg, pTmpReg; - register int x, y; + RegionPtr pReg, pTmpReg; + int x, y; unsigned long previousPixel, currentPixel; BoxRec Box = { 0, 0, 0, 0 }; Bool overlap; diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c index b87bb15a77..963143cb07 100644 --- a/hw/xquartz/applewm.c +++ b/hw/xquartz/applewm.c @@ -145,7 +145,7 @@ AppleWMDoReorderWindow(WindowPtr pWin) } static int -ProcAppleWMQueryVersion(register ClientPtr client) +ProcAppleWMQueryVersion(ClientPtr client) { REQUEST_SIZE_MATCH(xAppleWMQueryVersionReq); @@ -217,7 +217,7 @@ WMFreeEvents(void *data, XID id) } static int -ProcAppleWMSelectInput(register ClientPtr client) +ProcAppleWMSelectInput(ClientPtr client) { REQUEST(xAppleWMSelectInputReq); WMEventPtr pEvent, pNewEvent, *pHead; @@ -340,7 +340,7 @@ AppleWMSelectedEvents(void) /* general utility functions */ static int -ProcAppleWMDisableUpdate(register ClientPtr client) +ProcAppleWMDisableUpdate(ClientPtr client) { REQUEST_SIZE_MATCH(xAppleWMDisableUpdateReq); @@ -350,7 +350,7 @@ ProcAppleWMDisableUpdate(register ClientPtr client) } static int -ProcAppleWMReenableUpdate(register ClientPtr client) +ProcAppleWMReenableUpdate(ClientPtr client) { REQUEST_SIZE_MATCH(xAppleWMReenableUpdateReq); @@ -362,7 +362,7 @@ ProcAppleWMReenableUpdate(register ClientPtr client) /* window functions */ static int -ProcAppleWMSetWindowMenu(register ClientPtr client) +ProcAppleWMSetWindowMenu(ClientPtr client) { const char *bytes; int max_len, nitems, i, j; @@ -411,7 +411,7 @@ ProcAppleWMSetWindowMenu(register ClientPtr client) } static int -ProcAppleWMSetWindowMenuCheck(register ClientPtr client) +ProcAppleWMSetWindowMenuCheck(ClientPtr client) { REQUEST(xAppleWMSetWindowMenuCheckReq); @@ -421,7 +421,7 @@ ProcAppleWMSetWindowMenuCheck(register ClientPtr client) } static int -ProcAppleWMSetFrontProcess(register ClientPtr client) +ProcAppleWMSetFrontProcess(ClientPtr client) { REQUEST_SIZE_MATCH(xAppleWMSetFrontProcessReq); @@ -430,7 +430,7 @@ ProcAppleWMSetFrontProcess(register ClientPtr client) } static int -ProcAppleWMSetWindowLevel(register ClientPtr client) +ProcAppleWMSetWindowLevel(ClientPtr client) { REQUEST(xAppleWMSetWindowLevelReq); WindowPtr pWin; @@ -455,7 +455,7 @@ ProcAppleWMSetWindowLevel(register ClientPtr client) } static int -ProcAppleWMSendPSN(register ClientPtr client) +ProcAppleWMSendPSN(ClientPtr client) { REQUEST(xAppleWMSendPSNReq); int err; @@ -474,7 +474,7 @@ ProcAppleWMSendPSN(register ClientPtr client) } static int -ProcAppleWMAttachTransient(register ClientPtr client) +ProcAppleWMAttachTransient(ClientPtr client) { WindowPtr pWinChild, pWinParent; REQUEST(xAppleWMAttachTransientReq); @@ -507,7 +507,7 @@ ProcAppleWMAttachTransient(register ClientPtr client) } static int -ProcAppleWMSetCanQuit(register ClientPtr client) +ProcAppleWMSetCanQuit(ClientPtr client) { REQUEST(xAppleWMSetCanQuitReq); @@ -520,7 +520,7 @@ ProcAppleWMSetCanQuit(register ClientPtr client) /* frame functions */ static int -ProcAppleWMFrameGetRect(register ClientPtr client) +ProcAppleWMFrameGetRect(ClientPtr client) { BoxRec ir, or, rr; REQUEST(xAppleWMFrameGetRectReq); @@ -547,7 +547,7 @@ ProcAppleWMFrameGetRect(register ClientPtr client) } static int -ProcAppleWMFrameHitTest(register ClientPtr client) +ProcAppleWMFrameHitTest(ClientPtr client) { BoxRec ir, or; int ret; @@ -571,7 +571,7 @@ ProcAppleWMFrameHitTest(register ClientPtr client) } static int -ProcAppleWMFrameDraw(register ClientPtr client) +ProcAppleWMFrameDraw(ClientPtr client) { BoxRec ir, or; unsigned int title_length, title_max; @@ -609,7 +609,7 @@ ProcAppleWMFrameDraw(register ClientPtr client) /* dispatch */ static int -ProcAppleWMDispatch(register ClientPtr client) +ProcAppleWMDispatch(ClientPtr client) { REQUEST(xReq); diff --git a/hw/xquartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c index 3611c96a37..b2246508ae 100644 --- a/hw/xquartz/xpr/appledri.c +++ b/hw/xquartz/xpr/appledri.c @@ -88,7 +88,7 @@ AppleDRIResetProc(ExtensionEntry* extEntry) } static int -ProcAppleDRIQueryVersion(register ClientPtr client) +ProcAppleDRIQueryVersion(ClientPtr client) { REQUEST_SIZE_MATCH(xAppleDRIQueryVersionReq); @@ -109,7 +109,7 @@ ProcAppleDRIQueryVersion(register ClientPtr client) /* surfaces */ static int -ProcAppleDRIQueryDirectRenderingCapable(register ClientPtr client) +ProcAppleDRIQueryDirectRenderingCapable(ClientPtr client) { REQUEST(xAppleDRIQueryDirectRenderingCapableReq); REQUEST_SIZE_MATCH(xAppleDRIQueryDirectRenderingCapableReq); @@ -140,7 +140,7 @@ ProcAppleDRIQueryDirectRenderingCapable(register ClientPtr client) } static int -ProcAppleDRIAuthConnection(register ClientPtr client) +ProcAppleDRIAuthConnection(ClientPtr client) { REQUEST(xAppleDRIAuthConnectionReq); REQUEST_SIZE_MATCH(xAppleDRIAuthConnectionReq); @@ -232,7 +232,7 @@ ProcAppleDRICreateSurface(ClientPtr client) } static int -ProcAppleDRIDestroySurface(register ClientPtr client) +ProcAppleDRIDestroySurface(ClientPtr client) { REQUEST(xAppleDRIDestroySurfaceReq); REQUEST_SIZE_MATCH(xAppleDRIDestroySurfaceReq); @@ -348,7 +348,7 @@ ProcAppleDRIDestroyPixmap(ClientPtr client) /* dispatch */ static int -ProcAppleDRIDispatch(register ClientPtr client) +ProcAppleDRIDispatch(ClientPtr client) { REQUEST(xReq); diff --git a/miext/rootless/rootlessScreen.c b/miext/rootless/rootlessScreen.c index 3d1bef43a4..012b04419a 100644 --- a/miext/rootless/rootlessScreen.c +++ b/miext/rootless/rootlessScreen.c @@ -395,7 +395,7 @@ RootlessMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst, //top-level window - mark children ONLY - NO overlaps with sibs (?) // This code copied from miMarkOverlappedWindows() - register WindowPtr pChild; + WindowPtr pChild; Bool anyMarked = FALSE; MarkWindowProcPtr MarkWindow = pScreen->MarkWindow; diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c index beacff99fc..6c908accd0 100644 --- a/miext/rootless/rootlessValTree.c +++ b/miext/rootless/rootlessValTree.c @@ -132,7 +132,7 @@ RootlessComputeClips(WindowPtr pParent, ScreenPtr pScreen, { int dx, dy; RegionRec childUniverse; - register WindowPtr pChild; + WindowPtr pChild; int oldVis, newVis; BoxRec borderSize; RegionRec childUnion; @@ -403,8 +403,8 @@ RootlessComputeClips(WindowPtr pParent, ScreenPtr pScreen, static void RootlessTreeObscured(WindowPtr pParent) { - register WindowPtr pChild; - register int oldVis; + WindowPtr pChild; + int oldVis; pChild = pParent; while (1) { @@ -474,8 +474,8 @@ RootlessMiValidateTree(WindowPtr pRoot, /* Parent to validate */ RegionRec childClip; /* The new borderClip for the current * child */ RegionRec exposed; /* For intermediate calculations */ - register ScreenPtr pScreen; - register WindowPtr pWin; + ScreenPtr pScreen; + WindowPtr pWin; pScreen = pRoot->drawable.pScreen; if (pChild == NullWindow) diff --git a/os/access.c b/os/access.c index 1a90600107..cb0f18b9eb 100644 --- a/os/access.c +++ b/os/access.c @@ -409,8 +409,8 @@ DefineSelf(int fd) int len; caddr_t addr; int family; - register HOST *host; - register struct hostent *hp; + HOST *host; + struct hostent *hp; union { struct sockaddr sa; @@ -562,7 +562,7 @@ DefineSelf(int fd) #ifdef USE_SIOCGLIFCONF struct sockaddr_storage buf[16]; struct lifconf ifc; - register struct lifreq *ifr; + struct lifreq *ifr; #ifdef SIOCGLIFNUM struct lifnum ifn; @@ -570,7 +570,7 @@ DefineSelf(int fd) #else /* !USE_SIOCGLIFCONF */ char buf[2048]; struct ifconf ifc; - register struct ifreq *ifr; + struct ifreq *ifr; #endif void *bufptr = buf; #else /* HAVE_GETIFADDRS */ @@ -579,7 +579,7 @@ DefineSelf(int fd) int len; unsigned char *addr; int family; - register HOST *host; + HOST *host; #ifndef HAVE_GETIFADDRS @@ -854,7 +854,7 @@ AugmentSelf(void *from, int len) { int family; void *addr; - register HOST *host; + HOST *host; family = ConvertAddr(from, &len, (void **) &addr); if (family == -1 || family == FamilyLocal) @@ -891,7 +891,7 @@ AddLocalHosts(void) void ResetHosts(const char *display) { - register HOST *host; + HOST *host; char lhostname[120], ohostname[120]; char *hostname = ohostname; char fname[PATH_MAX + 1]; @@ -1001,7 +1001,7 @@ ResetHosts(const char *display) #ifdef XTHREADS_NEEDS_BYNAMEPARAMS _Xgethostbynameparams hparams; #endif - register struct hostent *hp; + struct hostent *hp; /* host name */ if ((family == FamilyInternet && @@ -1039,7 +1039,7 @@ xtransLocalClient(ClientPtr client) int alen, family, notused; Xtransaddr *from = NULL; void *addr; - register HOST *host; + HOST *host; OsCommPtr oc = (OsCommPtr) client->osPrivate; if (!oc->trans_conn) @@ -1328,7 +1328,7 @@ ForEachHostInFamily(int family, Bool (*func) (unsigned char *addr, static Bool NewHost(int family, const void *addr, int len, int addingLocalHosts) { - register HOST *host; + HOST *host; for (host = validhosts; host; host = host->next) { if (addrEqual(family, addr, len, host)) @@ -1360,7 +1360,7 @@ RemoveHost(ClientPtr client, int family, unsigned length, /* of bytes in p void *pAddr) { int rc, len; - register HOST *host, **prev; + HOST *host, **prev; rc = AuthorizedClient(client); if (rc != Success) @@ -1404,9 +1404,9 @@ int GetHosts(void **data, int *pnHosts, int *pLen, BOOL * pEnabled) { int len; - register int n = 0; - register unsigned char *ptr; - register HOST *host; + int n = 0; + unsigned char *ptr; + HOST *host; int nHosts = 0; *pEnabled = AccessEnabled ? EnableAccess : DisableAccess; @@ -1479,11 +1479,11 @@ CheckAddr(int family, const void *pAddr, unsigned length) * Returns 1 if host is invalid, 0 if we've found it. */ int -InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client) +InvalidHost(struct sockaddr *saddr, int len, ClientPtr client) { int family; void *addr = NULL; - register HOST *selfhost, *host; + HOST *selfhost, *host; if (!AccessEnabled) /* just let them in */ return 0; @@ -1523,7 +1523,7 @@ InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client) } static int -ConvertAddr(register struct sockaddr *saddr, int *len, void **addr) +ConvertAddr(struct sockaddr *saddr, int *len, void **addr) { if (*len == 0) return FamilyLocal; @@ -1804,7 +1804,7 @@ siHostnameAddrMatch(int family, void *addr, int len, } #else /* getaddrinfo not supported, use gethostbyname instead for IPv4 */ if (family == FamilyInternet) { - register struct hostent *hp; + struct hostent *hp; #ifdef XTHREADS_NEEDS_BYNAMEPARAMS _Xgethostbynameparams hparams; diff --git a/os/io.c b/os/io.c index d6be03f1e3..5b5703afe2 100644 --- a/os/io.c +++ b/os/io.c @@ -235,7 +235,7 @@ ReadRequestFromClient(ClientPtr client) ConnectionInputPtr oci = oc->input; unsigned int gotnow, needed; int result; - register xReq *request; + xReq *request; Bool need_header; Bool move_header; @@ -568,8 +568,8 @@ ResetCurrentRequest(ClientPtr client) if (!oc) return; - register ConnectionInputPtr oci = oc->input; - register xReq *request; + ConnectionInputPtr oci = oc->input; + xReq *request; int gotnow, needed; if (AvailableInput == oc) @@ -614,7 +614,7 @@ void FlushAllOutput(void) { OsCommPtr oc; - register ClientPtr client, tmp; + ClientPtr client, tmp; Bool newoutput = NewOutputPending; if (!newoutput) diff --git a/os/strlcat.c b/os/strlcat.c index 538e7ab3f0..9a5c1377ab 100644 --- a/os/strlcat.c +++ b/os/strlcat.c @@ -30,9 +30,9 @@ size_t strlcat(char *dst, const char *src, size_t siz) { - register char *d = dst; - register const char *s = src; - register size_t n = siz; + char *d = dst; + const char *s = src; + size_t n = siz; size_t dlen; /* Find the end of dst and adjust bytes left but don't go past end */ diff --git a/os/strlcpy.c b/os/strlcpy.c index 82c158a9fa..c90241155e 100644 --- a/os/strlcpy.c +++ b/os/strlcpy.c @@ -29,9 +29,9 @@ size_t strlcpy(char *dst, const char *src, size_t siz) { - register char *d = dst; - register const char *s = src; - register size_t n = siz; + char *d = dst; + const char *s = src; + size_t n = siz; /* Copy as many bytes as will fit */ if (n != 0 && --n != 0) { diff --git a/os/xserver_poll.c b/os/xserver_poll.c index c13fddd690..7a9dea745c 100644 --- a/os/xserver_poll.c +++ b/os/xserver_poll.c @@ -106,9 +106,9 @@ static int map_poll_spec fd_set *pWriteSet, fd_set *pExceptSet) { - register size_t i; /* loop control */ - register struct pollfd *pCur; /* current array element */ - register int max_fd = -1; /* return value */ + size_t i; /* loop control */ + struct pollfd *pCur; /* current array element */ + int max_fd = -1; /* return value */ /* Map the poll() structures into the file descriptor sets required @@ -209,8 +209,8 @@ static void map_select_results fd_set *pWriteSet, fd_set *pExceptSet) { - register unsigned long i; /* loop control */ - register struct pollfd *pCur; /* current array element */ + unsigned long i; /* loop control */ + struct pollfd *pCur; /* current array element */ for (i = 0, pCur = pArray; i < n_fds; i++, pCur++) { diff --git a/pseudoramiX/pseudoramiX.c b/pseudoramiX/pseudoramiX.c index 8f9539bbef..a4a6f84d6d 100644 --- a/pseudoramiX/pseudoramiX.c +++ b/pseudoramiX/pseudoramiX.c @@ -187,7 +187,7 @@ ProcPseudoramiXGetState(ClientPtr client) swapl(&stuff->window); WindowPtr pWin; - register int rc; + int rc; TRACE; @@ -218,7 +218,7 @@ ProcPseudoramiXGetScreenCount(ClientPtr client) swapl(&stuff->window); WindowPtr pWin; - register int rc; + int rc; TRACE; @@ -251,7 +251,7 @@ ProcPseudoramiXGetScreenSize(ClientPtr client) } WindowPtr pWin; - register int rc; + int rc; TRACE; diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c index a2c9c7c317..c280ab2790 100644 --- a/randr/rrxinerama.c +++ b/randr/rrxinerama.c @@ -121,7 +121,7 @@ ProcRRXineramaGetState(ClientPtr client) swapl(&stuff->window); WindowPtr pWin; - register int rc; + int rc; ScreenPtr pScreen; rrScrPrivPtr pScrPriv; Bool active = FALSE; @@ -169,7 +169,7 @@ ProcRRXineramaGetScreenCount(ClientPtr client) swapl(&stuff->window); WindowPtr pWin; - register int rc; + int rc; rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); if (rc != Success) @@ -198,7 +198,7 @@ ProcRRXineramaGetScreenSize(ClientPtr client) WindowPtr pWin, pRoot; ScreenPtr pScreen; - register int rc; + int rc; rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); if (rc != Success) diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c index b83a5fc922..10c8c37b36 100644 --- a/xkb/XKBAlloc.c +++ b/xkb/XKBAlloc.c @@ -93,7 +93,7 @@ XkbAllocCompatMap(XkbDescPtr xkb, unsigned which, unsigned nSI) void XkbFreeCompatMap(XkbDescPtr xkb, unsigned which, Bool freeMap) { - register XkbCompatMapPtr compat; + XkbCompatMapPtr compat; if ((xkb == NULL) || (xkb->compat == NULL)) return; @@ -133,7 +133,7 @@ XkbAllocNames(XkbDescPtr xkb, unsigned which, int nTotalRG, int nTotalAliases) names = xkb->names; if ((which & XkbKTLevelNamesMask) && (xkb->map != NULL) && (xkb->map->types != NULL)) { - register int i; + int i; XkbKeyTypePtr type; type = xkb->map->types; @@ -219,8 +219,8 @@ XkbFreeNames(XkbDescPtr xkb, unsigned which, Bool freeMap) XkbClientMapPtr map = xkb->map; if ((map != NULL) && (map->types != NULL)) { - register int i; - register XkbKeyTypePtr type; + int i; + XkbKeyTypePtr type; type = map->types; for (i = 0; i < map->num_types; i++, type++) { diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c index 28296f4f2f..022a560bcf 100644 --- a/xkb/XKBGAlloc.c +++ b/xkb/XKBGAlloc.c @@ -84,8 +84,8 @@ _XkbFreeGeomNonLeafElems(Bool freeAll, char **elems, unsigned int elem_sz, ContentsClearFunc freeFunc) { - register int i; - register char *ptr; + int i; + char *ptr; if (freeAll) { first = 0; @@ -321,8 +321,8 @@ _XkbClearDoodad(char *doodad_in) void XkbFreeGeomDoodads(XkbDoodadPtr doodads, int nDoodads, Bool freeAll) { - register int i; - register XkbDoodadPtr doodad; + int i; + XkbDoodadPtr doodad; if (doodads) { for (i = 0, doodad = doodads; i < nDoodads; i++, doodad++) { @@ -533,8 +533,8 @@ XkbAllocGeometry(XkbDescPtr xkb, XkbGeometrySizesPtr sizes) XkbPropertyPtr XkbAddGeomProperty(XkbGeometryPtr geom, char *name, char *value) { - register int i; - register XkbPropertyPtr prop; + int i; + XkbPropertyPtr prop; if ((!geom) || (!name) || (!value)) return NULL; @@ -566,8 +566,8 @@ XkbAddGeomProperty(XkbGeometryPtr geom, char *name, char *value) XkbKeyAliasPtr XkbAddGeomKeyAlias(XkbGeometryPtr geom, char *aliasStr, char *realStr) { - register int i; - register XkbKeyAliasPtr alias; + int i; + XkbKeyAliasPtr alias; if ((!geom) || (!aliasStr) || (!realStr) || (!aliasStr[0]) || (!realStr[0])) return NULL; @@ -594,8 +594,8 @@ XkbAddGeomKeyAlias(XkbGeometryPtr geom, char *aliasStr, char *realStr) XkbColorPtr XkbAddGeomColor(XkbGeometryPtr geom, char *spec, unsigned int pixel) { - register int i; - register XkbColorPtr color; + int i; + XkbColorPtr color; if ((!geom) || (!spec)) return NULL; @@ -641,7 +641,7 @@ XkbShapePtr XkbAddGeomShape(XkbGeometryPtr geom, Atom name, int sz_outlines) { XkbShapePtr shape; - register int i; + int i; if ((!geom) || (!name) || (sz_outlines < 0)) return NULL; @@ -700,7 +700,7 @@ XkbSectionPtr XkbAddGeomSection(XkbGeometryPtr geom, Atom name, int sz_rows, int sz_doodads, int sz_over) { - register int i; + int i; XkbSectionPtr section; if ((!geom) || (name == None) || (sz_rows < 0)) @@ -739,7 +739,7 @@ XkbDoodadPtr XkbAddGeomDoodad(XkbGeometryPtr geom, XkbSectionPtr section, Atom name) { XkbDoodadPtr old, doodad; - register int i, nDoodads; + int i, nDoodads; if ((!geom) || (name == None)) return NULL; @@ -777,7 +777,7 @@ XkbOverlayKeyPtr XkbAddGeomOverlayKey(XkbOverlayPtr overlay, XkbOverlayRowPtr row, char *over, char *under) { - register int i; + int i; XkbOverlayKeyPtr key; XkbSectionPtr section; XkbRowPtr row_under; @@ -810,7 +810,7 @@ XkbAddGeomOverlayKey(XkbOverlayPtr overlay, XkbOverlayRowPtr XkbAddGeomOverlayRow(XkbOverlayPtr overlay, int row_under, int sz_keys) { - register int i; + int i; XkbOverlayRowPtr row; if ((!overlay) || (sz_keys < 0)) @@ -842,7 +842,7 @@ XkbAddGeomOverlayRow(XkbOverlayPtr overlay, int row_under, int sz_keys) XkbOverlayPtr XkbAddGeomOverlay(XkbSectionPtr section, Atom name, int sz_rows) { - register int i; + int i; XkbOverlayPtr overlay; if ((!section) || (name == None) || (sz_rows == 0)) diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c index 0f447cd91e..c27478c9ae 100644 --- a/xkb/XKBMAlloc.c +++ b/xkb/XKBMAlloc.c @@ -125,7 +125,7 @@ XkbAllocClientMap(XkbDescPtr xkb, unsigned which, unsigned nTotalTypes) int XkbAllocServerMap(XkbDescPtr xkb, unsigned which, unsigned nNewActions) { - register int i; + int i; XkbServerMapPtr map; if (xkb == NULL) @@ -253,7 +253,7 @@ XkbCopyKeyType(XkbKeyTypePtr from, XkbKeyTypePtr into) int XkbCopyKeyTypes(XkbKeyTypePtr from, XkbKeyTypePtr into, int num_types) { - register int i, rtrn; + int i, rtrn; if ((!from) || (!into) || (num_types < 0)) return BadMatch; @@ -361,7 +361,7 @@ XkbResizeKeyType(XkbDescPtr xkb, int nTotal; KeySym *newSyms; int width, match, nResize; - register int i, g, nSyms; + int i, g, nSyms; nResize = 0; for (nTotal = 1, i = xkb->min_key_code; i <= xkb->max_key_code; i++) { @@ -423,7 +423,7 @@ XkbResizeKeyType(XkbDescPtr xkb, } else if (new_num_lvls < type->num_levels) { int width, match; - register int g, i; + int g, i; for (i = xkb->min_key_code; i <= xkb->max_key_code; i++) { width = XkbKeyGroupsWidth(xkb, i); @@ -440,7 +440,7 @@ XkbResizeKeyType(XkbDescPtr xkb, } if (nMatchingKeys > 0) { int key, firstClear; - register int i, g; + int i, g; if (new_num_lvls > type->num_levels) firstClear = type->num_levels; @@ -470,7 +470,7 @@ XkbResizeKeyType(XkbDescPtr xkb, KeySym * XkbResizeKeySyms(XkbDescPtr xkb, int key, int needed) { - register int i, nSyms, nKeySyms; + int i, nSyms, nKeySyms; unsigned nOldSyms; KeySym *newSyms; @@ -731,7 +731,7 @@ XkbChangeKeycodeRange(XkbDescPtr xkb, XkbAction * XkbResizeKeyActions(XkbDescPtr xkb, int key, int needed) { - register int i, nActs; + int i, nActs; XkbAction *newActs; if (needed <= 0) { @@ -793,7 +793,7 @@ XkbFreeClientMap(XkbDescPtr xkb, unsigned what, Bool freeMap) if (what & XkbKeyTypesMask) { if (map->types != NULL) { if (map->num_types > 0) { - register int i; + int i; XkbKeyTypePtr type; for (i = 0, type = map->types; i < map->num_types; i++, type++) { diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c index 65f30c8b93..0f7bbd0b9f 100644 --- a/xkb/XKBMisc.c +++ b/xkb/XKBMisc.c @@ -270,7 +270,7 @@ static XkbSymInterpretPtr _XkbFindMatchingInterp(XkbDescPtr xkb, KeySym sym, unsigned int real_mods, unsigned int level) { - register unsigned i; + unsigned i; XkbSymInterpretPtr interp, rtrn; CARD8 mods; @@ -522,7 +522,7 @@ XkbChangeTypesOfKey(XkbDescPtr xkb, unsigned groups, int *newTypesIn, XkbMapChangesPtr changes) { XkbKeyTypePtr pOldType, pNewType; - register int i; + int i; int width, nOldGroups, oldWidth, newTypes[XkbNumKbdGroups]; if ((!xkb) || (!XkbKeycodeInRange(xkb, key)) || (!xkb->map) || diff --git a/xkb/maprules.c b/xkb/maprules.c index 74e748ecba..4e49b62435 100644 --- a/xkb/maprules.c +++ b/xkb/maprules.c @@ -379,7 +379,7 @@ CheckLine(InputLine * line, RemapSpec * remap, XkbRF_RulePtr rule, XkbRF_GroupPtr group) { char *str, *tok; - register int nread; + int nread; _Xstrtokparams strtok_buf; Bool append = FALSE; @@ -710,7 +710,7 @@ XkbRF_CheckApplyRule(XkbRF_RulePtr rule, static void XkbRF_ClearPartialMatches(XkbRF_RulesPtr rules) { - register int i; + int i; XkbRF_RulePtr rule; for (i = 0, rule = rules->rules; i < rules->num_rules; i++, rule++) { diff --git a/xkb/xkb.c b/xkb/xkb.c index 6878959742..56c60ec754 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -241,7 +241,7 @@ ProcXkbSelectEvents(ClientPtr client) CARD16 *c16; CARD32 *c32; } from; - register unsigned bit, ndx, maskLeft, dataLeft; + unsigned bit, ndx, maskLeft, dataLeft; from.c8 = (CARD8 *) &stuff[1]; dataLeft = (client->req_len * 4) - sizeof(xkbSelectEventsReq); @@ -328,7 +328,7 @@ ProcXkbSelectEvents(ClientPtr client) CARD16 *c16; CARD32 *c32; } from, to; - register unsigned bit, ndx, maskLeft, dataLeft, size; + unsigned bit, ndx, maskLeft, dataLeft, size; from.c8 = (CARD8 *) &stuff[1]; dataLeft = (client->req_len * 4) - sizeof(xkbSelectEventsReq); @@ -1208,7 +1208,7 @@ XkbSizeKeySyms(XkbDescPtr xkb, xkbGetMapReply * rep) static int XkbSizeVirtualMods(XkbDescPtr xkb, xkbGetMapReply * rep) { - register unsigned i, nMods, bit; + unsigned i, nMods, bit; if (((rep->present & XkbVirtualModsMask) == 0) || (rep->virtualMods == 0) || (!xkb) || (!xkb->server)) { @@ -1252,7 +1252,7 @@ static int XkbSizeKeyActions(XkbDescPtr xkb, xkbGetMapReply * rep) { unsigned i, len, nActs; - register KeyCode firstKey; + KeyCode firstKey; if (((rep->present & XkbKeyActionsMask) == 0) || (rep->nKeyActs < 1) || (!xkb) || (!xkb->server) || (!xkb->server->key_acts)) { @@ -1634,9 +1634,9 @@ CheckKeyTypes(ClientPtr client, int *nMapsRtrn, CARD8 *mapWidthRtrn, Bool doswap) { unsigned nMaps; - register unsigned i, n; - register CARD8 *map; - register xkbKeyTypeWireDesc *wire = *wireRtrn; + unsigned i, n; + CARD8 *map; + xkbKeyTypeWireDesc *wire = *wireRtrn; if (req->firstType > ((unsigned) xkb->map->num_types)) { *nMapsRtrn = _XkbErrCode3(0x01, req->firstType, xkb->map->num_types); @@ -1756,7 +1756,7 @@ CheckKeySyms(ClientPtr client, CARD8 *mapWidths, CARD16 *symsPerKey, xkbSymMapWireDesc ** wireRtrn, int *errorRtrn, Bool doswap) { - register unsigned i; + unsigned i; XkbSymMapPtr map; xkbSymMapWireDesc *wire = *wireRtrn; @@ -1766,7 +1766,7 @@ CheckKeySyms(ClientPtr client, 0); for (i = 0; i < req->nKeySyms; i++) { KeySym *pSyms; - register unsigned nG; + unsigned nG; if (client->swapped && doswap) { swaps(&wire->nSyms); @@ -1777,7 +1777,7 @@ CheckKeySyms(ClientPtr client, return 0; } if (nG > 0) { - register int g, w; + int g, w; for (g = w = 0; g < nG; g++) { if (wire->ktIndex[g] >= (unsigned) nTypes) { @@ -1811,7 +1811,7 @@ CheckKeySyms(ClientPtr client, map = &xkb->map->key_sym_map[i]; for (; i <= (unsigned) xkb->max_key_code; i++, map++) { - register int g, nG, w; + int g, nG, w; nG = XkbKeyNumGroups(xkb, i); for (w = g = 0; g < nG; g++) { @@ -1837,7 +1837,7 @@ CheckKeyActions(XkbDescPtr xkb, { int nActs; CARD8 *wire = *wireRtrn; - register unsigned i; + unsigned i; if (!(XkbKeyActionsMask & req->present)) return 1; @@ -1866,9 +1866,9 @@ CheckKeyBehaviors(XkbDescPtr xkb, xkbSetMapReq * req, xkbBehaviorWireDesc ** wireRtrn, int *errorRtrn) { - register xkbBehaviorWireDesc *wire = *wireRtrn; - register XkbServerMapPtr server = xkb->server; - register unsigned i; + xkbBehaviorWireDesc *wire = *wireRtrn; + XkbServerMapPtr server = xkb->server; + unsigned i; unsigned first, last; if (((req->present & XkbKeyBehaviorsMask) == 0) || (req->nKeyBehaviors < 1)) { @@ -1916,8 +1916,8 @@ static int CheckVirtualMods(XkbDescRec * xkb, xkbSetMapReq * req, CARD8 **wireRtrn, int *errorRtrn) { - register CARD8 *wire = *wireRtrn; - register unsigned i, nMods, bit; + CARD8 *wire = *wireRtrn; + unsigned i, nMods, bit; if (((req->present & XkbVirtualModsMask) == 0) || (req->virtualMods == 0)) return 1; @@ -1933,9 +1933,9 @@ static int CheckKeyExplicit(XkbDescPtr xkb, xkbSetMapReq * req, CARD8 **wireRtrn, int *errorRtrn) { - register CARD8 *wire = *wireRtrn; + CARD8 *wire = *wireRtrn; CARD8 *start; - register unsigned i; + unsigned i; int first, last; if (((req->present & XkbExplicitComponentsMask) == 0) || @@ -1974,9 +1974,9 @@ static int CheckModifierMap(XkbDescPtr xkb, xkbSetMapReq * req, CARD8 **wireRtrn, int *errRtrn) { - register CARD8 *wire = *wireRtrn; + CARD8 *wire = *wireRtrn; CARD8 *start; - register unsigned i; + unsigned i; int first, last; if (((req->present & XkbModifierMapMask) == 0) || (req->nModMapKeys < 1)) { @@ -2011,8 +2011,8 @@ CheckVirtualModMap(XkbDescPtr xkb, xkbSetMapReq * req, xkbVModMapWireDesc ** wireRtrn, int *errRtrn) { - register xkbVModMapWireDesc *wire = *wireRtrn; - register unsigned i; + xkbVModMapWireDesc *wire = *wireRtrn; + unsigned i; int first, last; if (((req->present & XkbVirtualModMapMask) == 0) || (req->nVModMapKeys < 1)) { @@ -2045,7 +2045,7 @@ SetKeyTypes(XkbDescPtr xkb, xkbSetMapReq * req, xkbKeyTypeWireDesc * wire, XkbChangesPtr changes) { - register unsigned i; + unsigned i; unsigned first, last; CARD8 *map; @@ -2060,7 +2060,7 @@ SetKeyTypes(XkbDescPtr xkb, for (i = 0; i < req->nTypes; i++) { XkbKeyTypePtr pOld; - register unsigned n; + unsigned n; if (XkbResizeKeyType(xkb, i + req->firstType, wire->nMapEntries, wire->preserve, wire->numLevels) != Success) { @@ -2134,7 +2134,7 @@ SetKeySyms(ClientPtr client, xkbSetMapReq * req, xkbSymMapWireDesc * wire, XkbChangesPtr changes, DeviceIntPtr dev) { - register unsigned i, s; + unsigned i, s; XkbSymMapPtr oldMap; KeySym *newSyms; KeySym *pSyms; @@ -2201,7 +2201,7 @@ static char * SetKeyActions(XkbDescPtr xkb, xkbSetMapReq * req, CARD8 *wire, XkbChangesPtr changes) { - register unsigned i, first, last; + unsigned i, first, last; CARD8 *nActs = wire; XkbAction *newActs; @@ -2238,7 +2238,7 @@ SetKeyBehaviors(XkbSrvInfoPtr xkbi, xkbSetMapReq * req, xkbBehaviorWireDesc * wire, XkbChangesPtr changes) { - register unsigned i; + unsigned i; int maxRG = -1; XkbDescPtr xkb = xkbi->desc; XkbServerMapPtr server = xkb->server; @@ -2295,7 +2295,7 @@ static char * SetVirtualMods(XkbSrvInfoPtr xkbi, xkbSetMapReq * req, CARD8 *wire, XkbChangesPtr changes) { - register int i, bit, nMods; + int i, bit, nMods; XkbServerMapPtr srv = xkbi->desc->server; if (((req->present & XkbVirtualModsMask) == 0) || (req->virtualMods == 0)) @@ -2317,7 +2317,7 @@ static char * SetKeyExplicit(XkbSrvInfoPtr xkbi, xkbSetMapReq * req, CARD8 *wire, XkbChangesPtr changes) { - register unsigned i, first, last; + unsigned i, first, last; XkbServerMapPtr xkb = xkbi->desc->server; CARD8 *start; @@ -2350,7 +2350,7 @@ static char * SetModifierMap(XkbSrvInfoPtr xkbi, xkbSetMapReq * req, CARD8 *wire, XkbChangesPtr changes) { - register unsigned i, first, last; + unsigned i, first, last; XkbClientMapPtr xkb = xkbi->desc->map; CARD8 *start; @@ -2384,7 +2384,7 @@ SetVirtualModMap(XkbSrvInfoPtr xkbi, xkbSetMapReq * req, xkbVModMapWireDesc * wire, XkbChangesPtr changes) { - register unsigned i, first, last; + unsigned i, first, last; XkbServerMapPtr srv = xkbi->desc->server; first = req->firstVModMapKey; @@ -2550,7 +2550,7 @@ _XkbSetMapChecks(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq * req, map = &xkb->map->key_sym_map[xkb->min_key_code]; for (i = xkb->min_key_code; i < xkb->max_key_code; i++, map++) { - register int g, ng, w; + int g, ng, w; ng = XkbNumGroups(map->group_info); for (w = g = 0; g < ng; g++) { @@ -2852,7 +2852,7 @@ XkbComputeGetCompatMapReplySize(XkbCompatMapPtr compat, nGroups = 0; if (rep->groups != 0) { - register int i, bit; + int i, bit; for (i = 0, bit = 1; i < XkbNumKbdGroups; i++, bit <<= 1) { if (rep->groups & bit) @@ -2871,7 +2871,7 @@ XkbAssembleCompatMap(ClientPtr client, xkbGetCompatMapReply rep, x_rpcbuf_t *rpcbuf) { - register unsigned i, bit; + unsigned i, bit; XkbSymInterpretPtr sym = &compat->sym_interpret[rep.firstSI]; for (i = 0; i < rep.nSI; i++, sym++) { @@ -3220,7 +3220,7 @@ static Status XkbComputeGetIndicatorMapReplySize(XkbIndicatorPtr indicators, xkbGetIndicatorMapReply * rep) { - register int i, bit; + int i, bit; int nIndicators; rep->realIndicators = indicators->phys_indicators; @@ -3239,8 +3239,8 @@ XkbAssembleIndicatorMap(ClientPtr client, xkbGetIndicatorMapReply rep, x_rpcbuf_t *rpcbuf) { - register int i; - register unsigned bit; + int i; + unsigned bit; for (i = 0, bit = 1; i < XkbNumIndicators; i++, bit <<= 1) { if (rep.which & bit) { @@ -3433,7 +3433,7 @@ ProcXkbGetNamedIndicator(ClientPtr client) } DeviceIntPtr dev; - register int i = 0; + int i = 0; XkbSrvLedInfoPtr sli; XkbIndicatorMapPtr map = NULL; @@ -3704,8 +3704,8 @@ ProcXkbSetNamedIndicator(ClientPtr client) static CARD32 _XkbCountAtoms(Atom *atoms, int maxAtoms, int *count) { - register unsigned int i, bit, nAtoms; - register CARD32 atomsPresent; + unsigned int i, bit, nAtoms; + CARD32 atomsPresent; for (i = nAtoms = atomsPresent = 0, bit = 1; i < maxAtoms; i++, bit <<= 1) { if (atoms[i] != None) { @@ -3729,8 +3729,8 @@ static void __rpcbuf_write_atoms(x_rpcbuf_t *rpcbuf, Atom *atoms, size_t maxAtom static Status XkbComputeGetNamesReplySize(XkbDescPtr xkb, xkbGetNamesReply * rep) { - register unsigned which, length; - register int i; + unsigned which, length; + int i; rep->minKeyCode = xkb->min_key_code; rep->maxKeyCode = xkb->max_key_code; @@ -3847,7 +3847,7 @@ XkbComputeGetNamesReplySize(XkbDescPtr xkb, xkbGetNamesReply * rep) static void XkbAssembleNames(ClientPtr client, XkbDescPtr xkb, xkbGetNamesReply rep, x_rpcbuf_t *rpcbuf) { - register unsigned i, which; + unsigned i, which; which = rep.which; @@ -3969,7 +3969,7 @@ ProcXkbGetNames(ClientPtr client) static CARD32 * _XkbCheckAtoms(CARD32 *wire, int nAtoms, int swapped, Atom *pError) { - register int i; + int i; for (i = 0; i < nAtoms; i++, wire++) { if (swapped) { @@ -3987,7 +3987,7 @@ static CARD32 * _XkbCheckMaskedAtoms(CARD32 *wire, int nAtoms, CARD32 present, int swapped, Atom *pError) { - register unsigned i, bit; + unsigned i, bit; for (i = 0, bit = 1; (i < nAtoms) && (present); i++, bit <<= 1) { if ((present & bit) == 0) @@ -4007,7 +4007,7 @@ _XkbCheckMaskedAtoms(CARD32 *wire, int nAtoms, CARD32 present, int swapped, static Atom * _XkbCopyMaskedAtoms(Atom *wire, Atom *dest, int nAtoms, CARD32 present) { - register int i, bit; + int i, bit; for (i = 0, bit = 1; (i < nAtoms) && (present); i++, bit <<= 1) { if ((present & bit) == 0) @@ -4239,8 +4239,8 @@ _XkbSetNames(ClientPtr client, DeviceIntPtr dev, xkbSetNamesReq * stuff) if (stuff->which & XkbCompatNameMask) names->compat = *tmp++; if ((stuff->which & XkbKeyTypeNamesMask) && (stuff->nTypes > 0)) { - register unsigned i; - register XkbKeyTypePtr type; + unsigned i; + XkbKeyTypePtr type; type = &xkb->map->types[stuff->firstType]; for (i = 0; i < stuff->nTypes; i++, type++) { @@ -4250,8 +4250,8 @@ _XkbSetNames(ClientPtr client, DeviceIntPtr dev, xkbSetNamesReq * stuff) nn.nTypes = stuff->nTypes; } if (stuff->which & XkbKTLevelNamesMask) { - register XkbKeyTypePtr type; - register unsigned i; + XkbKeyTypePtr type; + unsigned i; CARD8 *width; width = (CARD8 *) tmp; @@ -4260,7 +4260,7 @@ _XkbSetNames(ClientPtr client, DeviceIntPtr dev, xkbSetNamesReq * stuff) for (i = 0; i < stuff->nKTLevels; i++, type++) { if (width[i] > 0) { if (type->level_names) { - register unsigned n; + unsigned n; for (n = 0; n < width[i]; n++) { type->level_names[n] = tmp[n]; @@ -4296,7 +4296,7 @@ _XkbSetNames(ClientPtr client, DeviceIntPtr dev, xkbSetNamesReq * stuff) } if (stuff->which & XkbKeyAliasesMask) { if (stuff->nKeyAliases > 0) { - register int na = stuff->nKeyAliases; + int na = stuff->nKeyAliases; if (XkbAllocNames(xkb, XkbKeyAliasesMask, 0, na) != Success) return BadAlloc; @@ -4313,7 +4313,7 @@ _XkbSetNames(ClientPtr client, DeviceIntPtr dev, xkbSetNamesReq * stuff) } if (stuff->which & XkbRGNamesMask) { if (stuff->nRadioGroups > 0) { - register unsigned i, nrg; + unsigned i, nrg; nrg = stuff->nRadioGroups; if (XkbAllocNames(xkb, XkbRGNamesMask, nrg, 0) != Success) @@ -4339,8 +4339,8 @@ _XkbSetNames(ClientPtr client, DeviceIntPtr dev, xkbSetNamesReq * stuff) if (needExtEvent) { XkbSrvLedInfoPtr sli; xkbExtensionDeviceNotify edev; - register int i; - register unsigned bit; + int i; + unsigned bit; sli = XkbFindSrvLedInfo(dev, XkbDfltXIClass, XkbDfltXIId, XkbXI_IndicatorsMask); @@ -4535,7 +4535,7 @@ XkbWriteCountedString(char *wire, const char *str, Bool swap) static int XkbSizeGeomProperties(XkbGeometryPtr geom) { - register int i, size; + int i, size; XkbPropertyPtr prop; for (size = i = 0, prop = geom->properties; i < geom->num_properties; @@ -4548,8 +4548,8 @@ XkbSizeGeomProperties(XkbGeometryPtr geom) static inline void XkbWriteGeomProperties(x_rpcbuf_t *rpcbuf, XkbGeometryPtr geom) { - register int i; - register XkbPropertyPtr prop; + int i; + XkbPropertyPtr prop; for (i = 0, prop = geom->properties; i < geom->num_properties; i++, prop++) { x_rpcbuf_write_counted_string_pad(rpcbuf, prop->name); @@ -4573,8 +4573,8 @@ static inline void XkbWriteGeomKeyAliases(x_rpcbuf_t *rpcbuf, XkbGeometryPtr geo static int XkbSizeGeomColors(XkbGeometryPtr geom) { - register int i, size; - register XkbColorPtr color; + int i, size; + XkbColorPtr color; for (i = size = 0, color = geom->colors; i < geom->num_colors; i++, color++) { size += XkbSizeCountedString(color->spec); @@ -4584,8 +4584,8 @@ XkbSizeGeomColors(XkbGeometryPtr geom) static inline void XkbWriteGeomColors(x_rpcbuf_t *rpcbuf, XkbGeometryPtr geom) { - register int i; - register XkbColorPtr color; + int i; + XkbColorPtr color; for (i = 0, color = geom->colors; i < geom->num_colors; i++, color++) { x_rpcbuf_write_counted_string_pad(rpcbuf, color->spec); @@ -4595,12 +4595,12 @@ static inline void XkbWriteGeomColors(x_rpcbuf_t *rpcbuf, XkbGeometryPtr geom) static int XkbSizeGeomShapes(XkbGeometryPtr geom) { - register int i, size; - register XkbShapePtr shape; + int i, size; + XkbShapePtr shape; for (i = size = 0, shape = geom->shapes; i < geom->num_shapes; i++, shape++) { - register int n; - register XkbOutlinePtr ol; + int n; + XkbOutlinePtr ol; size += SIZEOF(xkbShapeWireDesc); for (n = 0, ol = shape->outlines; n < shape->num_outlines; n++, ol++) { @@ -4617,7 +4617,7 @@ static void XkbWriteGeomShapes(x_rpcbuf_t *rpcbuf, XkbGeometryPtr geom) XkbShapePtr shape; for (i = 0, shape = geom->shapes; i < geom->num_shapes; i++, shape++) { - register int o; + int o; XkbOutlinePtr ol; /* write xkbShapeWireDesc */ @@ -4631,7 +4631,7 @@ static void XkbWriteGeomShapes(x_rpcbuf_t *rpcbuf, XkbGeometryPtr geom) x_rpcbuf_write_CARD8(rpcbuf, 0); /* pad1 */ for (o = 0, ol = shape->outlines; o < shape->num_outlines; o++, ol++) { - register int p; + int p; XkbPointPtr pt; /* write xkbOutlineWireDesc */ @@ -4651,7 +4651,7 @@ static void XkbWriteGeomShapes(x_rpcbuf_t *rpcbuf, XkbGeometryPtr geom) static int XkbSizeGeomDoodads(int num_doodads, XkbDoodadPtr doodad) { - register int i, size; + int i, size; for (i = size = 0; i < num_doodads; i++, doodad++) { size += SIZEOF(xkbAnyDoodadWireDesc); @@ -4668,7 +4668,7 @@ XkbSizeGeomDoodads(int num_doodads, XkbDoodadPtr doodad) static void XkbWriteGeomDoodads(x_rpcbuf_t *rpcbuf, int num_doodads, XkbDoodadPtr doodad) { - register int i; + int i; for (i = 0; i < num_doodads; i++, doodad++) { /* write xkbAnyDoodadWireDesc head part */ @@ -4725,7 +4725,7 @@ static void XkbWriteGeomDoodads(x_rpcbuf_t *rpcbuf, int num_doodads, XkbDoodadPt static void XkbWriteGeomOverlay(x_rpcbuf_t *rpcbuf, XkbOverlayPtr ol) { - register int r; + int r; XkbOverlayRowPtr row; /* write xkbOverlayWireDesc */ @@ -4754,7 +4754,7 @@ static void XkbWriteGeomOverlay(x_rpcbuf_t *rpcbuf, XkbOverlayPtr ol) static int XkbSizeGeomSections(XkbGeometryPtr geom) { - register int i, size; + int i, size; XkbSectionPtr section; for (i = size = 0, section = geom->sections; i < geom->num_sections; @@ -4793,7 +4793,7 @@ XkbSizeGeomSections(XkbGeometryPtr geom) static void XkbWriteGeomSections(x_rpcbuf_t *rpcbuf, XkbGeometryPtr geom) { - register int i; + int i; XkbSectionPtr section; for (i = 0, section = geom->sections; i < geom->num_sections; @@ -4843,7 +4843,7 @@ static void XkbWriteGeomSections(x_rpcbuf_t *rpcbuf, XkbGeometryPtr geom) XkbWriteGeomDoodads(rpcbuf, section->num_doodads, section->doodads); } if (section->overlays) { - register int o; + int o; for (o = 0; o < section->num_overlays; o++) { XkbWriteGeomOverlay(rpcbuf, §ion->overlays[o]); } @@ -5131,7 +5131,7 @@ static Status _CheckSetOverlay(char **wire_inout, xkbSetGeometryReq *req, XkbGeometryPtr geom, XkbSectionPtr section, ClientPtr client) { - register int r; + int r; char *wire; XkbOverlayPtr ol; xkbOverlayWireDesc *olWire; @@ -5149,7 +5149,7 @@ _CheckSetOverlay(char **wire_inout, xkbSetGeometryReq *req, ol = XkbAddGeomOverlay(section, olWire->name, olWire->nRows); rWire = (xkbOverlayRowWireDesc *) &olWire[1]; for (r = 0; r < olWire->nRows; r++) { - register int k; + int k; xkbOverlayKeyWireDesc *kWire; XkbOverlayRowPtr row; @@ -5187,7 +5187,7 @@ _CheckSetSections(XkbGeometryPtr geom, xkbSetGeometryReq * req, char **wire_inout, ClientPtr client) { Status status; - register int s; + int s; char *wire; xkbSectionWireDesc *sWire; XkbSectionPtr section; @@ -5197,7 +5197,7 @@ _CheckSetSections(XkbGeometryPtr geom, return Success; sWire = (xkbSectionWireDesc *) wire; for (s = 0; s < req->nSections; s++) { - register int r; + int r; xkbRowWireDesc *rWire; if (!_XkbCheckRequestBounds(client, req, sWire, sWire + 1)) @@ -5224,7 +5224,7 @@ _CheckSetSections(XkbGeometryPtr geom, section->angle = sWire->angle; rWire = (xkbRowWireDesc *) &sWire[1]; for (r = 0; r < sWire->nRows; r++) { - register int k; + int k; XkbRowPtr row; xkbKeyWireDesc *kWire; @@ -5270,7 +5270,7 @@ _CheckSetSections(XkbGeometryPtr geom, } wire = (char *) rWire; if (sWire->nDoodads > 0) { - register int d; + int d; for (d = 0; d < sWire->nDoodads; d++) { status = _CheckSetDoodad(&wire, req, geom, section, client); @@ -5279,7 +5279,7 @@ _CheckSetSections(XkbGeometryPtr geom, } } if (sWire->nOverlays > 0) { - register int o; + int o; for (o = 0; o < sWire->nOverlays; o++) { status = _CheckSetOverlay(&wire, req, geom, section, client); @@ -5298,7 +5298,7 @@ static Status _CheckSetShapes(XkbGeometryPtr geom, xkbSetGeometryReq * req, char **wire_inout, ClientPtr client) { - register int i; + int i; char *wire; wire = *wire_inout; @@ -5309,7 +5309,7 @@ _CheckSetShapes(XkbGeometryPtr geom, else { xkbShapeWireDesc *shapeWire; XkbShapePtr shape; - register int o; + int o; shapeWire = (xkbShapeWireDesc *) wire; for (i = 0; i < req->nShapes; i++) { @@ -5325,7 +5325,7 @@ _CheckSetShapes(XkbGeometryPtr geom, return BadAlloc; olWire = (xkbOutlineWireDesc *) (&shapeWire[1]); for (o = 0; o < shapeWire->nOutlines; o++) { - register int p; + int p; XkbPointPtr pt; xkbPointWireDesc *ptWire; @@ -5371,7 +5371,7 @@ _CheckSetShapes(XkbGeometryPtr geom, static Status _CheckSetGeom(XkbGeometryPtr geom, xkbSetGeometryReq * req, ClientPtr client) { - register int i; + int i; Status status; char *wire; @@ -5617,7 +5617,7 @@ ProcXkbPerClientFlags(ClientPtr client) return BadAlloc; } if (interest && want) { - register unsigned affect; + unsigned affect; affect = stuff->ctrlsToChange; @@ -5672,7 +5672,7 @@ GetComponentSpec(ClientPtr client, xkbGetKbdByNameReq *stuff, unsigned char **pWire, Bool allowExpr, int *errRtrn) { int len; - register int i; + int i; unsigned char *wire, *str, *tmp, *legal; if (allowExpr) @@ -6216,7 +6216,7 @@ ComputeDeviceLedInfoSize(DeviceIntPtr dev, unsigned int what, XkbSrvLedInfoPtr sli) { int nNames = 0, nMaps = 0; - register unsigned n, bit; + unsigned n, bit; if (sli == NULL) return 0; @@ -6325,7 +6325,7 @@ FillDeviceLedInfo(XkbSrvLedInfoPtr sli, x_rpcbuf_t *rpcbuf, ClientPtr client) x_rpcbuf_write_CARD32(rpcbuf, sli->effectiveState); if (sli->namesPresent | sli->mapsPresent) { - register unsigned i, bit; + unsigned i, bit; if (sli->namesPresent) { for (i = 0, bit = 1; i < XkbNumIndicators; i++, bit <<= 1) { @@ -6477,7 +6477,7 @@ ProcXkbGetDeviceInfo(ClientPtr client) rep.nBtnsWanted = stuff->nBtns; if (dev->button->xkb_acts != NULL) { XkbAction *act; - register int i; + int i; rep.firstBtnRtrn = stuff->firstBtn; rep.nBtnsRtrn = stuff->nBtns; @@ -6590,8 +6590,8 @@ CheckSetDeviceIndicators(char *wire, sli = XkbFindSrvLedInfo(dev, ledWire->ledClass, ledWire->ledID, XkbXI_IndicatorsMask); if (sli != NULL) { - register int n; - register unsigned bit; + int n; + unsigned bit; int nMaps, nNames; CARD32 *atomWire; xkbIndicatorMapWireDesc *mapWire; @@ -6671,8 +6671,8 @@ SetDeviceIndicators(char *wire, XkbSetCauseXkbReq(&cause, X_kbSetDeviceInfo, client); ledWire = (xkbDeviceLedsWireDesc *) wire; for (i = 0; i < num; i++) { - register int n; - register unsigned bit; + int n; + unsigned bit; CARD32 *atomWire; xkbIndicatorMapWireDesc *mapWire; XkbSrvLedInfoPtr sli; diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index 28ba5654ab..6ab5e01e21 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -144,8 +144,8 @@ XkbGetKeyAction(XkbSrvInfoPtr xkbi, XkbStatePtr xkbState, CARD8 key) type = XkbKeyKeyType(xkb, key, effectiveGroup); if (type->map != NULL) { - register unsigned i, mods; - register XkbKTMapEntryPtr entry; + unsigned i, mods; + XkbKTMapEntryPtr entry; mods = xkbState->mods & type->mods.mask; for (entry = type->map, i = 0; i < type->map_count; i++, entry++) { @@ -592,7 +592,7 @@ _XkbFilterPointerBtn(XkbSrvInfoPtr xkbi, break; case XkbSA_PtrBtn: { - register int i, nClicks; + int i, nClicks; AccessXCancelRepeatKey(xkbi, keycode); if (pAction->btn.count > 0) { @@ -1141,7 +1141,7 @@ _XkbFilterDeviceBtn(XkbSrvInfoPtr xkbi, static XkbFilterPtr _XkbNextFreeFilter(XkbSrvInfoPtr xkbi) { - register int i; + int i; if (xkbi->szFilters == 0) { xkbi->szFilters = 4; @@ -1166,7 +1166,7 @@ _XkbNextFreeFilter(XkbSrvInfoPtr xkbi) static int _XkbApplyFilters(XkbSrvInfoPtr xkbi, unsigned kc, XkbAction *pAction) { - register int i, send; + int i, send; send = 1; for (i = 0; i < xkbi->szFilters; i++) { diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c index 280d4ef60f..02b94b2d56 100644 --- a/xkb/xkbEvents.c +++ b/xkb/xkbEvents.c @@ -206,7 +206,7 @@ XkbSendStateNotify(DeviceIntPtr kbd, xkbStateNotify * pSN) XkbStatePtr state; XkbInterestPtr interest; Time time; - register CARD16 changed, bState; + CARD16 changed, bState; interest = kbd->xkb_interest; if (!interest || !kbd->key || !kbd->key->xkbInfo) diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index 458bae11ce..3527941b63 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -338,7 +338,7 @@ XkbInitRadioGroups(XkbSrvInfoPtr xkbi) static Status XkbInitCompatStructs(XkbDescPtr xkb) { - register int i; + int i; XkbCompatMapPtr compat; if (xkb->defined & XkmCompatMapMask) diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c index 4941c83eb2..2a8b1b5651 100644 --- a/xkb/xkbLEDs.c +++ b/xkb/xkbLEDs.c @@ -53,7 +53,7 @@ unsigned XkbIndicatorsToUpdate(DeviceIntPtr dev, unsigned long state_changes, Bool enable_changes) { - register unsigned update = 0; + unsigned update = 0; XkbSrvLedInfoPtr sli; sli = XkbFindSrvLedInfo(dev, XkbDfltXIClass, XkbDfltXIId, 0); @@ -118,8 +118,8 @@ XkbApplyLEDChangeToKeyboard(XkbSrvInfoPtr xkbi, } state = &xkbi->state; if ((map->groups) && ((map->which_groups & (~XkbIM_UseBase)) != 0)) { - register int i; - register unsigned bit, match; + int i; + unsigned bit, match; if (on) match = (map->groups) & XkbAllGroupsMask; @@ -147,7 +147,7 @@ XkbApplyLEDChangeToKeyboard(XkbSrvInfoPtr xkbi, } if ((map->mods.mask) && ((map->which_mods & (~XkbIM_UseBase)) != 0)) { if (map->which_mods & (XkbIM_UseLocked | XkbIM_UseEffective)) { - register unsigned long old; + unsigned long old; old = state->locked_mods; if (on) @@ -158,7 +158,7 @@ XkbApplyLEDChangeToKeyboard(XkbSrvInfoPtr xkbi, stateChange = TRUE; } if (map->which_mods & (XkbIM_UseLatched | XkbIM_UseEffective)) { - register unsigned long newmods; + unsigned long newmods; newmods = state->latched_mods; if (on) @@ -236,8 +236,8 @@ XkbUpdateLedAutoState(DeviceIntPtr dev, XkbControlsPtr ctrls; XkbChangesRec my_changes; xkbExtensionDeviceNotify my_ed; - register unsigned i, bit, affected; - register XkbIndicatorMapPtr map; + unsigned i, bit, affected; + XkbIndicatorMapPtr map; unsigned oldState; if ((maps_to_check == 0) || (sli->maps == NULL) || (sli->mapsPresent == 0)) @@ -417,7 +417,7 @@ XkbSetIndicators(DeviceIntPtr dev, void XkbUpdateIndicators(DeviceIntPtr dev, - register CARD32 update, + CARD32 update, Bool check_edevs, XkbChangesPtr changes, XkbEventCausePtr cause) { @@ -486,7 +486,7 @@ XkbForceUpdateDeviceLEDs(DeviceIntPtr dev) void XkbCheckIndicatorMaps(DeviceIntPtr dev, XkbSrvLedInfoPtr sli, unsigned which) { - register unsigned i, bit; + unsigned i, bit; XkbIndicatorMapPtr map; XkbDescPtr xkb; @@ -640,7 +640,7 @@ XkbAllocSrvLedInfo(DeviceIntPtr dev, if ((sli->maps == NULL) && (needed_parts & XkbXI_IndicatorMapsMask)) sli->maps = calloc(XkbNumIndicators, sizeof(XkbIndicatorMapRec)); if (checkNames) { - register unsigned i, bit; + unsigned i, bit; sli->namesPresent = 0; for (i = 0, bit = 1; i < XkbNumIndicators; i++, bit <<= 1) { @@ -962,7 +962,7 @@ XkbApplyLedStateChanges(DeviceIntPtr dev, DeviceIntPtr kbd; XkbChangesRec my_changes; xkbExtensionDeviceNotify my_ed; - register unsigned i, bit, affected; + unsigned i, bit, affected; XkbIndicatorMapPtr map; unsigned oldState; Bool kb_changed; diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index 12793098dd..76672427b3 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -177,7 +177,7 @@ _XkbLookupButtonDevice(DeviceIntPtr *pDev, int id, ClientPtr client, void XkbSetActionKeyMods(XkbDescPtr xkb, XkbAction *act, unsigned mods) { - register unsigned tmp; + unsigned tmp; switch (act->type) { case XkbSA_SetMods: @@ -201,8 +201,8 @@ XkbSetActionKeyMods(XkbDescPtr xkb, XkbAction *act, unsigned mods) unsigned XkbMaskForVMask(XkbDescPtr xkb, unsigned vmask) { - register int i, bit; - register unsigned mask; + int i, bit; + unsigned mask; for (mask = i = 0, bit = 1; i < XkbNumVirtualMods; i++, bit <<= 1) { if (vmask & bit) @@ -269,7 +269,7 @@ void XkbUpdateDescActions(XkbDescPtr xkb, KeyCode first, CARD8 num, XkbChangesPtr changes) { - register unsigned key; + unsigned key; for (key = first; key < (first + num); key++) { XkbApplyCompatMapToKey(xkb, key, changes); @@ -277,7 +277,7 @@ XkbUpdateDescActions(XkbDescPtr xkb, if (changes->map.changed & (XkbVirtualModMapMask | XkbModifierMapMask)) { unsigned char newVMods[XkbNumVirtualMods]; - register unsigned bit, i; + unsigned bit, i; unsigned present; memset(newVMods, 0, XkbNumVirtualMods); @@ -359,7 +359,7 @@ XkbUpdateActions(DeviceIntPtr pXDev, KeySymsPtr XkbGetCoreMap(DeviceIntPtr keybd) { - register int key, tmp; + int key, tmp; int maxSymsPerKey, maxGroup1Width; XkbDescPtr xkb; KeySymsPtr syms; @@ -506,7 +506,7 @@ XkbGetCoreMap(DeviceIntPtr keybd) } pXKB += XkbKeyGroupsWidth(xkb, key); for (n = XkbGroup3Index; n < nGroups; n++) { - register int s; + int s; groupWidth = XkbKeyGroupWidth(xkb, key, n); for (s = 0; s < groupWidth; s++) { @@ -827,7 +827,7 @@ XkbLookupNamedGeometry(DeviceIntPtr dev, Atom name, Bool *shouldFree) } void -XkbConvertCase(register KeySym sym, KeySym * lower, KeySym * upper) +XkbConvertCase(KeySym sym, KeySym * lower, KeySym * upper) { *lower = sym; *upper = sym; diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c index 2ec3b85edb..9a97e8347c 100644 --- a/xkb/xkbfmisc.c +++ b/xkb/xkbfmisc.c @@ -362,7 +362,7 @@ XkbWriteXKBKeymapForNames(FILE * file, int XkbFindKeycodeByName(XkbDescPtr xkb, char *name, Bool use_aliases) { - register int i; + int i; if ((!xkb) || (!xkb->names) || (!xkb->names->keys)) return 0; diff --git a/xkb/xkbout.c b/xkb/xkbout.c index e19e704845..0bfeccdf3b 100644 --- a/xkb/xkbout.c +++ b/xkb/xkbout.c @@ -53,7 +53,7 @@ static Bool WriteXKBVModDecl(FILE * file, XkbDescPtr xkb, int showValue) { - register int i, nMods; + int i, nMods; Atom *vmodNames; if (xkb == NULL) @@ -107,7 +107,7 @@ XkbWriteXKBKeycodes(FILE * file, Bool showImplicit, XkbFileAddOnFunc addOn, void *priv) { Atom kcName; - register unsigned i; + unsigned i; const char *alternate; if ((!xkb) || (!xkb->names) || (!xkb->names->keys)) { @@ -168,7 +168,7 @@ XkbWriteXKBKeyTypes(FILE * file, Bool topLevel, Bool showImplicit, XkbFileAddOnFunc addOn, void *priv) { - register unsigned i, n; + unsigned i, n; XkbKeyTypePtr type; XkbKTMapEntryPtr entry; @@ -275,7 +275,7 @@ XkbWriteXKBCompatMap(FILE * file, Bool topLevel, Bool showImplicit, XkbFileAddOnFunc addOn, void *priv) { - register unsigned i; + unsigned i; XkbSymInterpretPtr interp; if ((!xkb) || (!xkb->compat) || (!xkb->compat->sym_interpret)) { @@ -352,7 +352,7 @@ XkbWriteXKBSymbols(FILE * file, Bool topLevel, Bool showImplicit, XkbFileAddOnFunc addOn, void *priv) { - register unsigned i, tmp; + unsigned i, tmp; XkbClientMapPtr map; XkbServerMapPtr srv; Bool showActions; @@ -533,7 +533,7 @@ XkbWriteXKBSymbols(FILE * file, if (map && map->modmap) { for (i = xkb->min_key_code; i <= xkb->max_key_code; i++) { if (map->modmap[i] != 0) { - register int n, bit; + int n, bit; for (bit = 1, n = 0; n < XkbNumModifiers; n++, bit <<= 1) { if (map->modmap[i] & bit) { @@ -559,7 +559,7 @@ WriteXKBOutline(FILE * file, XkbShapePtr shape, XkbOutlinePtr outline, int lastRadius, int first, int indent) { - register int i; + int i; XkbPointPtr pt; char *iStr; @@ -598,7 +598,7 @@ static Bool WriteXKBDoodad(FILE * file, unsigned indent, XkbGeometryPtr geom, XkbDoodadPtr doodad) { - register char *i_str; + char *i_str; XkbShapePtr shape; XkbColorPtr color; @@ -686,7 +686,7 @@ WriteXKBDoodad(FILE * file, WriteXKBOverlay(FILE * file, unsigned indent, XkbGeometryPtr geom, XkbOverlayPtr ol) { - register char *i_str; + char *i_str; int r, k, nOut; XkbOverlayRowPtr row; XkbOverlayKeyPtr key; @@ -720,7 +720,7 @@ WriteXKBOverlay(FILE * file, static Bool WriteXKBSection(FILE * file, XkbSectionPtr s, XkbGeometryPtr geom) { - register int i; + int i; XkbRowPtr row; int dfltKeyColor = 0; @@ -752,8 +752,8 @@ WriteXKBSection(FILE * file, XkbSectionPtr s, XkbGeometryPtr geom) if (row->vertical) fprintf(file, " vertical;\n"); if (row->num_keys > 0) { - register int k; - register XkbKeyPtr key; + int k; + XkbKeyPtr key; int forceNL = 0; int nThisLine = 0; @@ -816,7 +816,7 @@ XkbWriteXKBGeometry(FILE * file, Bool topLevel, Bool showImplicit, XkbFileAddOnFunc addOn, void *priv) { - register unsigned i, n; + unsigned i, n; XkbGeometryPtr geom; if ((!xkb) || (!xkb->geom)) { diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c index 5d8caf4fb7..41ae412689 100644 --- a/xkb/xkbtext.c +++ b/xkb/xkbtext.c @@ -114,8 +114,8 @@ XkbAtomText(Atom atm, unsigned format) char * XkbVModIndexText(XkbDescPtr xkb, unsigned ndx, unsigned format) { - register int len; - register Atom *vmodNames; + int len; + Atom *vmodNames; char *rtrn; const char *tmp; char numBuf[20]; @@ -154,7 +154,7 @@ char * XkbVModMaskText(XkbDescPtr xkb, unsigned modMask, unsigned mask, unsigned format) { - register int i, bit; + int i, bit; int len; char *mm, *rtrn; char *str, buf[VMOD_BUFFER_SIZE]; @@ -266,7 +266,7 @@ XkbModIndexText(unsigned ndx, unsigned format) char * XkbModMaskText(unsigned mask, unsigned format) { - register int i, bit; + int i, bit; char buf[64], *rtrn; if ((mask & 0xff) == 0xff) { @@ -557,7 +557,7 @@ char * XkbStringText(char *str, unsigned format) { char *buf; - register char *in, *out; + char *in, *out; int len; Bool ok; @@ -731,7 +731,7 @@ XkbActionTypeText(unsigned type, unsigned format) static int TryCopyStr(char *to, const char *from, int *pLeft) { - register int len; + int len; if (*pLeft > 0) { len = strlen(from); @@ -1327,7 +1327,7 @@ char * XkbIndentText(unsigned size) { static char buf[32]; - register int i; + int i; if (size > 31) size = 31; diff --git a/xkb/xkmread.c b/xkb/xkmread.c index fa8bae8a5f..3002e34c93 100644 --- a/xkb/xkmread.c +++ b/xkb/xkmread.c @@ -115,7 +115,7 @@ XkmGetCARD32(FILE * file, int *pNRead) static int XkmSkipPadding(FILE * file, unsigned pad) { - register int i, nRead = 0; + int i, nRead = 0; for (i = 0; i < pad; i++) { if (getc(file) != EOF) @@ -162,7 +162,7 @@ XkmGetCountedString(FILE * file, char *str, int max_len) static int ReadXkmVirtualMods(FILE * file, XkbDescPtr xkb, XkbChangesPtr changes) { - register unsigned int i, bit; + unsigned int i, bit; unsigned int bound, named, tmp; int nRead = 0; @@ -205,7 +205,7 @@ ReadXkmVirtualMods(FILE * file, XkbDescPtr xkb, XkbChangesPtr changes) static int ReadXkmKeycodes(FILE * file, XkbDescPtr xkb, XkbChangesPtr changes) { - register int i; + int i; unsigned minKC, maxKC, nAl; int nRead = 0; char name[100]; @@ -272,7 +272,7 @@ ReadXkmKeycodes(FILE * file, XkbDescPtr xkb, XkbChangesPtr changes) static int ReadXkmKeyTypes(FILE * file, XkbDescPtr xkb, XkbChangesPtr changes) { - register unsigned i, n; + unsigned i, n; unsigned num_types; int nRead = 0; int tmp; @@ -414,7 +414,7 @@ ReadXkmKeyTypes(FILE * file, XkbDescPtr xkb, XkbChangesPtr changes) static int ReadXkmCompatMap(FILE * file, XkbDescPtr xkb, XkbChangesPtr changes) { - register int i; + int i; unsigned num_si, groups; char name[100]; XkbSymInterpretPtr interp; @@ -579,7 +579,7 @@ ReadXkmCompatMap(FILE * file, XkbDescPtr xkb, XkbChangesPtr changes) changes->compat.num_si = compat->num_si; } if (groups) { - register unsigned bit; + unsigned bit; for (i = 0, bit = 1; i < XkbNumKbdGroups; i++, bit <<= 1) { xkmModsDesc md; @@ -608,7 +608,7 @@ ReadXkmCompatMap(FILE * file, XkbDescPtr xkb, XkbChangesPtr changes) static int ReadXkmIndicators(FILE * file, XkbDescPtr xkb, XkbChangesPtr changes) { - register unsigned nLEDs; + unsigned nLEDs; xkmIndicatorMapDesc wire; char buf[100]; unsigned tmp; @@ -668,7 +668,7 @@ FindTypeForKey(XkbDescPtr xkb, Atom name, unsigned width, KeySym * syms) if ((!xkb) || (!xkb->map)) return NULL; if (name != None) { - register unsigned i; + unsigned i; for (i = 0; i < xkb->map->num_types; i++) { if (xkb->map->types[i].name == name) { @@ -692,7 +692,7 @@ FindTypeForKey(XkbDescPtr xkb, Atom name, unsigned width, KeySym * syms) static int ReadXkmSymbols(FILE * file, XkbDescPtr xkb) { - register int i, g, s, totalVModMaps; + int i, g, s, totalVModMaps; xkmKeySymMapDesc wireMap; char buf[100]; unsigned minKC, maxKC, groupNames, tmp; @@ -922,7 +922,7 @@ ReadXkmGeomOverlay(FILE * file, XkbGeometryPtr geom, XkbSectionPtr section) XkbOverlayRowPtr row; xkmOverlayDesc olWire; xkmOverlayRowDesc rowWire; - register int r; + int r; nRead += XkmGetCountedString(file, buf, 100); tmp = fread(&olWire, SIZEOF(xkmOverlayDesc), 1, file); @@ -955,7 +955,7 @@ ReadXkmGeomOverlay(FILE * file, XkbGeometryPtr geom, XkbSectionPtr section) static int ReadXkmGeomSection(FILE * file, XkbGeometryPtr geom) { - register int i; + int i; XkbSectionPtr section; xkmSectionDesc sectionWire; unsigned tmp; @@ -981,7 +981,7 @@ ReadXkmGeomSection(FILE * file, XkbGeometryPtr geom) section->angle = sectionWire.angle; section->priority = sectionWire.priority; if (sectionWire.num_rows > 0) { - register int k; + int k; XkbRowPtr row; xkmRowDesc rowWire; XkbKeyPtr key; @@ -1035,7 +1035,7 @@ ReadXkmGeomSection(FILE * file, XkbGeometryPtr geom) static int ReadXkmGeometry(FILE * file, XkbDescPtr xkb) { - register int i; + int i; char buf[100]; unsigned tmp; int nRead = 0; @@ -1092,7 +1092,7 @@ ReadXkmGeometry(FILE * file, XkbDescPtr xkb) Atom nameAtom; for (i = 0; i < wireGeom.num_shapes; i++) { - register int n; + int n; XkbOutlinePtr ol; xkmOutlineDesc olWire; @@ -1106,7 +1106,7 @@ ReadXkmGeometry(FILE * file, XkbDescPtr xkb) return nRead; } for (n = 0; n < shapeWire.num_outlines; n++) { - register int p; + int p; xkmPointDesc ptWire; tmp = fread(&olWire, SIZEOF(xkmOutlineDesc), 1, file); @@ -1209,7 +1209,7 @@ XkmReadTOC(FILE * file, xkmFileInfo * file_info, int max_toc, unsigned XkmReadFile(FILE * file, unsigned need, unsigned want, XkbDescPtr *xkb) { - register unsigned i; + unsigned i; xkmSectionInfo toc[MAX_TOC] = { 0 }, tmpTOC = { 0 }; xkmFileInfo fileInfo; unsigned tmp, nRead = 0; From 387768b5116ad6e36e5b6da4bfeecb149aa5b3cc Mon Sep 17 00:00:00 2001 From: Chase Date: Sat, 15 Nov 2025 17:28:16 -0500 Subject: [PATCH 2/2] xf86/common/compiler.h: remove register keyword --- hw/xfree86/common/compiler.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index af9ac044d8..601f2587c5 100644 --- a/hw/xfree86/common/compiler.h +++ b/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)));