diff options
author | James Cloos <cloos@jhcloos.com> | 2008-11-08 12:18:13 -0500 |
---|---|---|
committer | James Cloos <cloos@jhcloos.com> | 2008-11-08 12:21:20 -0500 |
commit | b3c7e62664457a3802ebc23785446051624a8c2f (patch) | |
tree | ee5b7c80a614aca1f52fb8b0efb12d3689d7c767 | |
parent | 21c116219cd5c6845a0955f2d88fdb5fab5c17cf (diff) |
Remove some null statements.
Remove several doubled statement-terminal semicolons.
Reported by Fernando Carrijo.
-rw-r--r-- | Xext/panoramiX.c | 10 | ||||
-rw-r--r-- | dix/events.c | 2 | ||||
-rw-r--r-- | hw/dmx/glxProxy/glxswap.c | 2 | ||||
-rw-r--r-- | hw/kdrive/fbdev/fbdev.c | 2 | ||||
-rw-r--r-- | hw/xfree86/parser/scan.c | 2 | ||||
-rw-r--r-- | mi/mifillarc.c | 2 | ||||
-rw-r--r-- | randr/rrscreen.c | 2 | ||||
-rw-r--r-- | randr/rrsdispatch.c | 2 | ||||
-rw-r--r-- | xkb/xkb.c | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c index d948702b2..bab8c9839 100644 --- a/Xext/panoramiX.c +++ b/Xext/panoramiX.c @@ -550,8 +550,8 @@ void PanoramiXExtensionInit(int argc, char *argv[]) ProcVector[X_SetClipRectangles] = PanoramiXSetClipRectangles; ProcVector[X_FreeGC] = PanoramiXFreeGC; ProcVector[X_ClearArea] = PanoramiXClearToBackground; - ProcVector[X_CopyArea] = PanoramiXCopyArea;; - ProcVector[X_CopyPlane] = PanoramiXCopyPlane;; + ProcVector[X_CopyArea] = PanoramiXCopyArea; + ProcVector[X_CopyPlane] = PanoramiXCopyPlane; ProcVector[X_PolyPoint] = PanoramiXPolyPoint; ProcVector[X_PolyLine] = PanoramiXPolyLine; ProcVector[X_PolySegment] = PanoramiXPolySegment; @@ -574,10 +574,10 @@ void PanoramiXExtensionInit(int argc, char *argv[]) ProcVector[X_AllocColor] = PanoramiXAllocColor; ProcVector[X_AllocNamedColor] = PanoramiXAllocNamedColor; ProcVector[X_AllocColorCells] = PanoramiXAllocColorCells; - ProcVector[X_AllocColorPlanes] = PanoramiXAllocColorPlanes; + ProcVector[X_AllocColorPlanes] = PanoramiXAllocColorPlanes; ProcVector[X_FreeColors] = PanoramiXFreeColors; - ProcVector[X_StoreColors] = PanoramiXStoreColors; - ProcVector[X_StoreNamedColor] = PanoramiXStoreNamedColor; + ProcVector[X_StoreColors] = PanoramiXStoreColors; + ProcVector[X_StoreNamedColor] = PanoramiXStoreNamedColor; #ifdef RENDER PanoramiXRenderInit (); diff --git a/dix/events.c b/dix/events.c index dad786dd6..632c0f450 100644 --- a/dix/events.c +++ b/dix/events.c @@ -323,7 +323,7 @@ IsPointerDevice(DeviceIntPtr dev) _X_EXPORT Bool IsKeyboardDevice(DeviceIntPtr dev) { - return (dev->key && dev->kbdfeed) && !IsPointerDevice(dev);; + return (dev->key && dev->kbdfeed) && !IsPointerDevice(dev); } static void DoEnterLeaveEvents( diff --git a/hw/dmx/glxProxy/glxswap.c b/hw/dmx/glxProxy/glxswap.c index 8fa04f877..1e184f914 100644 --- a/hw/dmx/glxProxy/glxswap.c +++ b/hw/dmx/glxProxy/glxswap.c @@ -402,7 +402,7 @@ void SwapBarrierReset(void) int i; for (i = 0; i <= GLX_MAX_SWAP_BARRIERS; i++) { - SwapBarrierPtr pBarrier, pNextBarrier;; + SwapBarrierPtr pBarrier, pNextBarrier; for (pBarrier = SwapBarrierList[i]; pBarrier; pBarrier = pNextBarrier) { diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c index 04f697b9e..4eeca289a 100644 --- a/hw/kdrive/fbdev/fbdev.c +++ b/hw/kdrive/fbdev/fbdev.c @@ -770,7 +770,7 @@ fbdevGetColors (ScreenPtr pScreen, int fb, int n, xColorItem *pdefs) cmap.start = min; cmap.len = max - min + 1; cmap.red = &priv->red[min]; - cmap.green = &priv->green[min];; + cmap.green = &priv->green[min]; cmap.blue = &priv->blue[min]; cmap.transp = 0; k = ioctl (priv->fd, FBIOGETCMAP, &cmap); diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c index 0ed104d58..7f10c0daa 100644 --- a/hw/xfree86/parser/scan.c +++ b/hw/xfree86/parser/scan.c @@ -435,7 +435,7 @@ again: i = 0; do { - configRBuf[++i] = (c = configBuf[configPos++]);; + configRBuf[++i] = (c = configBuf[configPos++]); } while ((c != ' ') && (c != '\t') && (c != '\n') && (c != '\r') && (c != '\0') && (c != '#')); --configPos; diff --git a/mi/mifillarc.c b/mi/mifillarc.c index 2ca6a4d77..f2ab5ceb1 100644 --- a/mi/mifillarc.c +++ b/mi/mifillarc.c @@ -779,7 +779,7 @@ miPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) for(i = narcs, arc = parcs; --i >= 0; arc++) { if (miFillArcEmpty(arc)) - continue;; + continue; if ((arc->angle2 >= FULLCIRCLE) || (arc->angle2 <= -FULLCIRCLE)) { if (miCanFillArc(arc)) diff --git a/randr/rrscreen.c b/randr/rrscreen.c index 9c2d09cc9..a910368b3 100644 --- a/randr/rrscreen.c +++ b/randr/rrscreen.c @@ -597,7 +597,7 @@ ProcRRGetScreenInfo (ClientPtr client) if (!pScrPriv || !output) { rep.type = X_Reply; - rep.setOfRotations = RR_Rotate_0;; + rep.setOfRotations = RR_Rotate_0; rep.sequenceNumber = client->sequence; rep.length = 0; rep.root = WindowTable[pWin->drawable.pScreen->myNum]->drawable.id; diff --git a/randr/rrsdispatch.c b/randr/rrsdispatch.c index 80d16b75a..5037b9e32 100644 --- a/randr/rrsdispatch.c +++ b/randr/rrsdispatch.c @@ -125,7 +125,7 @@ static int SProcRRGetOutputInfo (ClientPtr client) { int n; - REQUEST(xRRGetOutputInfoReq);; + REQUEST(xRRGetOutputInfoReq); REQUEST_SIZE_MATCH(xRRGetOutputInfoReq); swaps(&stuff->length, n); @@ -420,7 +420,7 @@ _XkbBell(ClientPtr client, DeviceIntPtr dev, WindowPtr pWin, } } else { - client->errorValue = _XkbErrCode2(0x7, bellClass);; + client->errorValue = _XkbErrCode2(0x7, bellClass); return BadValue; } |