diff options
Diffstat (limited to 'hw')
78 files changed, 339 insertions, 339 deletions
diff --git a/hw/dmx/dmx_glxvisuals.c b/hw/dmx/dmx_glxvisuals.c index 59173ca5f..f0050c283 100644 --- a/hw/dmx/dmx_glxvisuals.c +++ b/hw/dmx/dmx_glxvisuals.c @@ -51,7 +51,7 @@ __GLXvisualConfig *GetGLXVisualConfigs(Display *dpy, int screen, int *nconfigs) int num_good_visuals; if (!XQueryExtension(dpy, "GLX", &majorOpcode, &dummy, &dummy)) { - return(NULL); + return NULL; } /* Send the glXGetVisualConfigs request */ @@ -228,7 +228,7 @@ __GLXvisualConfig *GetGLXVisualConfigs(Display *dpy, int screen, int *nconfigs) SyncHandle(); *nconfigs = nvisuals; - return( configs ); + return configs; } @@ -500,7 +500,7 @@ GetGLXVisualConfigsFromFBConfigs(__GLXFBConfig *fbconfigs, int nfbconfigs, __GLXvisualConfig *configs = NULL; int i; - if (!fbconfigs || !nfbconfigs || !nconfigs) return(NULL); + if (!fbconfigs || !nfbconfigs || !nconfigs) return NULL; *nconfigs = 0; /* Allocate memory for our config structure */ @@ -596,6 +596,6 @@ GetGLXVisualConfigsFromFBConfigs(__GLXFBConfig *fbconfigs, int nfbconfigs, } } - return( configs ); + return configs; } diff --git a/hw/dmx/dmxcmap.c b/hw/dmx/dmxcmap.c index e3d2fdcdc..ca9ef1ff9 100644 --- a/hw/dmx/dmxcmap.c +++ b/hw/dmx/dmxcmap.c @@ -75,7 +75,7 @@ Bool dmxBECreateColormap(ColormapPtr pColormap) visual, (pVisual->class & DynamicClass ? AllocAll : AllocNone)); - return (pCmapPriv->cmap != 0); + return pCmapPriv->cmap != 0; } else { dmxLog(dmxWarning, "dmxBECreateColormap: No visual found\n"); diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c index 7a418c813..34161f214 100644 --- a/hw/dmx/dmxfont.c +++ b/hw/dmx/dmxfont.c @@ -108,7 +108,7 @@ static Bool dmxCheckFontPathElement(DMXScreenInfo *dmxScreen, char *fp) dmxSync(dmxScreen, TRUE); /* Must complete before removing handler */ XSetErrorHandler(oldErrorHandler); - return (dmxFontLastError == 0); + return dmxFontLastError == 0; } static int dmxSetFontPath(DMXScreenInfo *dmxScreen) diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c index 7cd50dadf..075553208 100644 --- a/hw/dmx/dmxinit.c +++ b/hw/dmx/dmxinit.c @@ -404,7 +404,7 @@ Bool dmxGetVisualInfo(DMXScreenInfo *dmxScreen) dmxLogVisual(dmxScreen, &dmxScreen->beVisuals[i], (i == dmxScreen->beDefVisualIndex)); - return (dmxScreen->beDefVisualIndex >= 0); + return dmxScreen->beDefVisualIndex >= 0; } void dmxGetColormaps(DMXScreenInfo *dmxScreen) diff --git a/hw/dmx/dmxpixmap.c b/hw/dmx/dmxpixmap.c index 587a27dad..81b71151a 100644 --- a/hw/dmx/dmxpixmap.c +++ b/hw/dmx/dmxpixmap.c @@ -247,5 +247,5 @@ RegionPtr dmxBitmapToRegion(PixmapPtr pPixmap) RegionValidate(pReg, &overlap); dmxSync(dmxScreen, FALSE); - return(pReg); + return pReg; } diff --git a/hw/dmx/glxProxy/compsize.c b/hw/dmx/glxProxy/compsize.c index cae8fea3c..9a40d65b0 100644 --- a/hw/dmx/glxProxy/compsize.c +++ b/hw/dmx/glxProxy/compsize.c @@ -145,7 +145,7 @@ GLint __glDrawPixels_size(GLenum format, GLenum type, GLsizei w, GLsizei h) default: return 0; } - return (elements * esize * w * h); + return elements * esize * w * h; } GLint __glBitmap_size(GLsizei w, GLsizei h) @@ -294,7 +294,7 @@ GLint __glTexImage1D_size(GLenum format, GLenum type, GLsizei w) default: return 0; } - return (elements * esize * w); + return elements * esize * w; } GLint __glTexImage2D_size(GLenum format, GLenum type, GLsizei w, GLsizei h) @@ -371,7 +371,7 @@ GLint __glTexImage2D_size(GLenum format, GLenum type, GLsizei w, GLsizei h) default: return 0; } - return (elements * esize * w * h); + return elements * esize * w * h; } GLint __glTexImage3D_size(GLenum format, GLenum type, GLsizei w, GLsizei h, @@ -450,7 +450,7 @@ GLint __glTexImage3D_size(GLenum format, GLenum type, GLsizei w, GLsizei h, default: return 0; } - return (elements * esize * w * h * d); + return elements * esize * w * h * d; } GLint __glLightfv_size(GLenum pname) diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c index c559ce7c6..88cf901f7 100644 --- a/hw/dmx/glxProxy/glxcmds.c +++ b/hw/dmx/glxProxy/glxcmds.c @@ -80,7 +80,7 @@ Display *GetBackEndDisplay( __GLXclientState *cl, int s ) if (! cl->be_displays[s] ) { cl->be_displays[s] = XOpenDisplay( DisplayString(dmxScreens[s].beDisplay) ); } - return( cl->be_displays[s] ); + return cl->be_displays[s]; } /* @@ -628,7 +628,7 @@ int GetCurrentBackEndTag(__GLXclientState *cl, GLXContextTag tag, int s) return( cl->be_currentCTag[ (tag-1)*screenInfo.numScreens + s ] ); } else { - return( 0 ); + return 0; } } diff --git a/hw/dmx/glxProxy/glxfbconfig.c b/hw/dmx/glxProxy/glxfbconfig.c index c721fdd24..a7741ff59 100644 --- a/hw/dmx/glxProxy/glxfbconfig.c +++ b/hw/dmx/glxProxy/glxfbconfig.c @@ -90,7 +90,7 @@ int AreFBConfigsMatch( __GLXFBConfig *c1, __GLXFBConfig *c2 ) (c1->maxAlpha == c2->maxAlpha) ); - return( match ); + return match; } __GLXFBConfig *FindMatchingFBConfig( __GLXFBConfig *c, __GLXFBConfig *configs, int nconfigs ) @@ -99,8 +99,8 @@ __GLXFBConfig *FindMatchingFBConfig( __GLXFBConfig *c, __GLXFBConfig *configs, i for (i=0; i<nconfigs; i++) { if ( AreFBConfigsMatch( c, configs + i ) ) - return( configs + i ); + return configs + i; } - return(0); + return 0; } diff --git a/hw/dmx/glxProxy/glxscreens.c b/hw/dmx/glxProxy/glxscreens.c index 029843563..a0e8bea28 100644 --- a/hw/dmx/glxProxy/glxscreens.c +++ b/hw/dmx/glxProxy/glxscreens.c @@ -327,7 +327,7 @@ char *__glXGetServerString( unsigned int name ) break; } - return( ret ); + return ret; } @@ -338,10 +338,10 @@ __GLXFBConfig *glxLookupFBConfig( GLXFBConfigID id ) for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) { if ( __glXFBConfigs[j]->id == id) - return( __glXFBConfigs[j] ); + return __glXFBConfigs[j]; } - return(NULL); + return NULL; } __GLXFBConfig *glxLookupFBConfigByVID( VisualID vid ) @@ -350,10 +350,10 @@ __GLXFBConfig *glxLookupFBConfigByVID( VisualID vid ) for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) { if ( __glXFBConfigs[j]->associatedVisualId == vid) - return( __glXFBConfigs[j] ); + return __glXFBConfigs[j]; } - return(NULL); + return NULL; } __GLXFBConfig *glxLookupBackEndFBConfig( GLXFBConfigID id, int screen ) @@ -363,10 +363,10 @@ __GLXFBConfig *glxLookupBackEndFBConfig( GLXFBConfigID id, int screen ) for (i=0, j=0; i<__glXNumFBConfigs; i++,j+=(__glXNumActiveScreens+1) ) { if ( __glXFBConfigs[j]->id == id) - return( __glXFBConfigs[j+screen+1] ); + return __glXFBConfigs[j+screen+1]; } - return(NULL); + return NULL; } diff --git a/hw/dmx/glxProxy/glxsingle.c b/hw/dmx/glxProxy/glxsingle.c index 7a732cca2..a7ed57427 100644 --- a/hw/dmx/glxProxy/glxsingle.c +++ b/hw/dmx/glxProxy/glxsingle.c @@ -668,7 +668,7 @@ static GLint __glReadPixels_size(GLenum format, GLenum type, GLint w, GLint h, } if (elementbits_return) *elementbits_return = elements; if (rowbytes_return) *rowbytes_return = rowsize; - return (rowsize * h); + return rowsize * h; } else { return -1; } @@ -718,7 +718,7 @@ static GLint __glReadPixels_size(GLenum format, GLenum type, GLint w, GLint h, if (elementbits_return) *elementbits_return = esize*elements*8; if (rowbytes_return) *rowbytes_return = rowsize; - return (rowsize * h); + return rowsize * h; } static int intersectRect( int x1, int x2, int y1, int y2, @@ -734,14 +734,14 @@ static int intersectRect( int x1, int x2, int y1, int y2, if ( (width <= 0) || (height <= 0) ) { *ix1 = *ix2 = *iy1 = *iy2 = 0; - return(0); + return 0; } else { *ix1 = left; *ix2 = right; *iy1 = top; *iy2 = bottom; - return( width * height ); + return width * height; } } @@ -811,7 +811,7 @@ int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc) if (buf_size > 0) { buf = (char *) malloc( buf_size ); if ( !buf ) { - return( BadAlloc ); + return BadAlloc; } } else { diff --git a/hw/dmx/glxProxy/glxvisuals.c b/hw/dmx/glxProxy/glxvisuals.c index 4c64db24a..d738ec293 100644 --- a/hw/dmx/glxProxy/glxvisuals.c +++ b/hw/dmx/glxProxy/glxvisuals.c @@ -77,11 +77,11 @@ int glxVisualsMatch( __GLXvisualConfig *v1, __GLXvisualConfig *v2 ) (v1->nMultiSampleBuffers == v2->nMultiSampleBuffers) && (v1->visualSelectGroup == v2->visualSelectGroup) ) { - return(1); + return 1; } - return(0); + return 0; } @@ -93,12 +93,12 @@ VisualID glxMatchGLXVisualInConfigList( __GLXvisualConfig *pGlxVisual, __GLXvisu if (glxVisualsMatch( pGlxVisual, &configs[i] )) { - return( configs[i].vid ); + return configs[i].vid; } } - return(0); + return 0; } VisualID glxMatchVisualInConfigList( ScreenPtr pScreen, VisualPtr pVisual, __GLXvisualConfig *configs, int nconfigs ) @@ -109,7 +109,7 @@ VisualID glxMatchVisualInConfigList( ScreenPtr pScreen, VisualPtr pVisual, __GLX /* check that the glx extension has been initialized */ if ( !__glXActiveScreens ) - return(0); + return 0; pGlxScreen = &__glXActiveScreens[pScreen->myNum]; pGlxVisual = pGlxScreen->pGlxVisual; @@ -124,7 +124,7 @@ VisualID glxMatchVisualInConfigList( ScreenPtr pScreen, VisualPtr pVisual, __GLX /* * the visual is not supported by glx */ - return(0); + return 0; } return( glxMatchGLXVisualInConfigList(pGlxVisual, configs, nconfigs) ); @@ -151,12 +151,12 @@ VisualPtr glxMatchVisual( ScreenPtr pScreen, VisualPtr pVisual, ScreenPtr pMatch */ for (j=0; j<pMatchScreen->numVisuals; j++) { if (vid == pMatchScreen->visuals[j].vid) { - return( &pMatchScreen->visuals[j] ); + return &pMatchScreen->visuals[j]; } } } - return(0); + return 0; } void glxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs, @@ -198,7 +198,7 @@ static VisualID FindClosestVisual( VisualPtr pVisual, int rootDepth, while( pdepth[d].vids[v] != vis->vid ) vis++; if (vis->class == pVisual->class) { - return( pdepth[d].vids[v] ); + return pdepth[d].vids[v]; } } } @@ -216,7 +216,7 @@ static VisualID FindClosestVisual( VisualPtr pVisual, int rootDepth, while( pdepth[d].vids[v] != vis->vid ) vis++; if (vis->class == pVisual->class) { - return( pdepth[d].vids[v] ); + return pdepth[d].vids[v]; } } } @@ -224,7 +224,7 @@ static VisualID FindClosestVisual( VisualPtr pVisual, int rootDepth, /* * if not found - just take the first visual */ - return( pdepth[0].vids[0] ); + return pdepth[0].vids[0]; } Bool glxInitVisuals(int *nvisualp, VisualPtr *visualp, diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index d546370ba..38ee06d25 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -532,7 +532,7 @@ hostx_get_server_depth (EphyrScreenInfo screen) { struct EphyrHostScreen *host_screen = host_screen_from_screen_info (screen); - return (host_screen ? host_screen->server_depth : 0); + return host_screen ? host_screen->server_depth : 0; } void diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c index 3af6acfb2..c07829a5f 100644 --- a/hw/kdrive/src/kxv.c +++ b/hw/kdrive/src/kxv.c @@ -1173,7 +1173,7 @@ KdXVQueryAdaptors( *p_nAdaptors = pxvs->nAdaptors; *p_pAdaptors = pxvs->pAdaptors; - return (Success); + return Success; } static Bool diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index be8c03607..e10973480 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -401,7 +401,7 @@ vfbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) /* By the time we are processing requests, we can guarantee that there * is always a colormap installed */ *pmaps = GetInstalledColormap(pScreen)->mid; - return (1); + return 1; } diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c index 167bc7805..200cb8f03 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c @@ -185,7 +185,7 @@ xf86AutoConfig(void) if (ret != CONFIG_OK) xf86Msg(X_ERROR, "Error parsing the built-in default configuration.\n"); - return (ret == CONFIG_OK); + return ret == CONFIG_OK; } static void diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 7876ba90e..90c1914f0 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -245,7 +245,7 @@ xf86AllocateEntity(void) xf86Entities[xf86NumEntities - 1] = xnfcalloc(1,sizeof(EntityRec)); xf86Entities[xf86NumEntities - 1]->entityPrivates = xnfcalloc(sizeof(DevUnion) * xf86EntityPrivateCount, 1); - return (xf86NumEntities - 1); + return xf86NumEntities - 1; } Bool @@ -257,9 +257,9 @@ xf86IsEntityPrimary(int entityIndex) switch (pEnt->bus.type) { case BUS_PCI: - return (pEnt->bus.id.pci == primaryBus.id.pci); + return pEnt->bus.id.pci == primaryBus.id.pci; case BUS_SBUS: - return (pEnt->bus.id.sbus.fbNum == primaryBus.id.sbus.fbNum); + return pEnt->bus.id.sbus.fbNum == primaryBus.id.sbus.fbNum; default: return FALSE; } @@ -342,7 +342,7 @@ xf86FindScreenForEntity(int entityIndex) for (i = 0; i < xf86NumScreens; i++) { for (j = 0; j < xf86Screens[i]->numEntities; j++) { if ( xf86Screens[i]->entityList[j] == entityIndex ) - return (xf86Screens[i]); + return xf86Screens[i]; } } } @@ -557,7 +557,7 @@ int xf86GetLastScrnFlag(int entityIndex) { if(entityIndex < xf86NumEntities) { - return(xf86Entities[entityIndex]->lastScrnFlag); + return xf86Entities[entityIndex]->lastScrnFlag; } else { return -1; } diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index c7a68e560..28786baa3 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -163,7 +163,7 @@ xf86GetPathElem(char **pnt) **pnt = '\0'; *pnt += 1; } - return(p1); + return p1; } /* @@ -239,7 +239,7 @@ xf86ValidateFontPath(char *path) strcat(out_pnt, path_elem); out_pnt += strlen(path_elem); } - return(tmp_path); + return tmp_path; } diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 394fb06b9..cd4891480 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -1360,7 +1360,7 @@ xf86TokenToString(SymTabPtr table, int token) if (table[i].token < 0) return NULL; else - return(table[i].name); + return table[i].name; } int @@ -1374,7 +1374,7 @@ xf86StringToToken(SymTabPtr table, const char *string) for (i = 0; table[i].token >= 0 && xf86NameCmp(string, table[i].name); i++) ; - return(table[i].token); + return table[i].token; } /* @@ -1993,7 +1993,7 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, ScrnIndex, property, type, format, len, value); if (ScrnIndex<0 || ScrnIndex>=xf86NumScreens) { - return(BadMatch); + return BadMatch; } if (xf86RegisteredPropertiesTable && @@ -2007,7 +2007,7 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, if (!pNewProp) { if ((pNewProp = (RootWinPropPtr)malloc(sizeof(RootWinProp))) == NULL) { - return(BadAlloc); + return BadAlloc; } /* * We will put this property at the end of the list so that @@ -2031,7 +2031,7 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, DebugF("creating xf86RegisteredPropertiesTable[] size %d\n", xf86NumScreens); if ( NULL==(xf86RegisteredPropertiesTable=(RootWinPropPtr*)xnfcalloc(sizeof(RootWinProp),xf86NumScreens) )) { - return(BadAlloc); + return BadAlloc; } for (i=0; i<xf86NumScreens; i++) { xf86RegisteredPropertiesTable[i] = NULL; @@ -2056,7 +2056,7 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, } } DebugF("xf86RegisterRootWindowProperty succeeded\n"); - return(Success); + return Success; } Bool diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 98bbd5d2f..ca532ee81 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -294,7 +294,7 @@ xf86CreateRootWindow(WindowPtr pWin) } DebugF("xf86CreateRootWindow() returns %d\n", ret); - return (ret); + return ret; } diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c index 61d0dcc2e..91a67186f 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -745,7 +745,7 @@ xf86IsOptionSet(const OptionInfoRec *table, int token) OptionInfoPtr p; p = xf86TokenToOptinfo(table, token); - return (p && p->found); + return p && p->found; } diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index c3a1dddc4..889339a9e 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -278,9 +278,9 @@ xf86SendDragEvents(DeviceIntPtr device) LocalDevicePtr local = (LocalDevicePtr) device->public.devicePrivate; if (device->button && device->button->buttonsDown > 0) - return (local->flags & XI86_SEND_DRAG_EVENTS); + return local->flags & XI86_SEND_DRAG_EVENTS; else - return (TRUE); + return TRUE; } /*********************************************************************** @@ -1193,7 +1193,7 @@ xf86ScaleAxis(int Cx, if (X < Sxlow) X = Sxlow; - return (X); + return X; } /* diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index 184f2213e..151795167 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -465,7 +465,7 @@ xf86PciAddMatchingDev(DriverPtr drvp) pci_iterator_destroy(iter); - return (numFound != 0); + return numFound != 0; } Bool diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index 30a420249..fe3f0a84a 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -530,7 +530,7 @@ xf86GetSbusInfoForEntity(int entityIndex) for (psdpp = xf86SbusInfo; *psdpp != NULL; psdpp++) { if (p->bus.id.sbus.fbNum == (*psdpp)->fbNum) - return (*psdpp); + return *psdpp; } return NULL; } diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index 3d5d9a685..948f82d8f 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -1220,7 +1220,7 @@ xf86XVQueryAdaptors( *p_nAdaptors = pxvs->nAdaptors; *p_pAdaptors = pxvs->pAdaptors; - return (Success); + return Success; } diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c index 4455efd1d..e4c8bf25c 100644 --- a/hw/xfree86/common/xisb.c +++ b/hw/xfree86/common/xisb.c @@ -69,12 +69,12 @@ XisbNew (int fd, ssize_t size) b = malloc(sizeof (XISBuffer)); if (!b) - return (NULL); + return NULL; b->buf = malloc((sizeof (unsigned char) * size)); if (!b->buf) { free(b); - return (NULL); + return NULL; } b->fd = fd; @@ -83,7 +83,7 @@ XisbNew (int fd, ssize_t size) b->current = 1; /* force it to be past the end to trigger initial read */ b->end = 0; b->buffer_size = size; - return (b); + return b; } void @@ -103,7 +103,7 @@ XisbRead (XISBuffer *b) if (b->block_duration >= 0) { if (xf86WaitForInput (b->fd, b->block_duration) < 1) - return (-1); + return -1; } else { @@ -119,9 +119,9 @@ XisbRead (XISBuffer *b) switch (ret) { case 0: - return (-1); /* timeout */ + return -1; /* timeout */ case -1: - return (-2); /* error */ + return -2; /* error */ default: b->end = ret; b->current = 0; @@ -132,7 +132,7 @@ XisbRead (XISBuffer *b) ErrorF ("read 0x%02x (%c)\n", b->buf[b->current], isprint(b->buf[b->current])?b->buf[b->current]:'.'); - return (b->buf[b->current++]); + return b->buf[b->current++]; } /* the only purpose of this function is to provide output tracing */ diff --git a/hw/xfree86/ddc/ddc.c b/hw/xfree86/ddc/ddc.c index e64e2f369..7379e959b 100644 --- a/hw/xfree86/ddc/ddc.c +++ b/hw/xfree86/ddc/ddc.c @@ -53,8 +53,8 @@ find_start(unsigned int *ptr) } } for (i=0;i<9;i++) - if (test[i]) return (i+1); - return (-1); + if (test[i]) return i+1; + return -1; } static unsigned char * @@ -75,8 +75,8 @@ find_header(unsigned char *block) if (i==8) break; ptr++; } - if (ptr == end) return (NULL); - return (ptr); + if (ptr == end) return NULL; + return ptr; } static unsigned char * @@ -98,7 +98,7 @@ resort(unsigned char *s_block) if (s_ptr == s_end) s_ptr = s_block; } free(s_block); - return (d_new); + return d_new; } static int @@ -120,7 +120,7 @@ DDC_checksum(unsigned char *block, int len) /* catch the trivial case where all bytes are 0 */ if (!not_null) return 1; - return (result&0xFF); + return result&0xFF; } static unsigned char * @@ -169,7 +169,7 @@ FetchEDID_DDC1(register ScrnInfoPtr pScrn, *xp = read_DDC(pScrn); xp++; } while(--count); - return (ptr); + return ptr; } /* test if DDC1 return 0 if not */ @@ -184,7 +184,7 @@ TestDDC1(ScrnInfoPtr pScrn, unsigned int (*read_DDC)(ScrnInfoPtr)) /* wait for next retrace */ if (old != read_DDC(pScrn)) break; } while(count--); - return (count); + return count; } /* diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c index d63e25d23..acb7efaf2 100644 --- a/hw/xfree86/ddc/interpret_edid.c +++ b/hw/xfree86/ddc/interpret_edid.c @@ -183,7 +183,7 @@ xf86InterpretEDID(int scrnIndex, Uchar *block) handle_edid_quirks(m); encode_aspect_ratio(m); - return (m); + return m; error: free(m); diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c index 203fccf16..e522b5c47 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga2.c +++ b/hw/xfree86/dixmods/extmod/xf86dga2.c @@ -692,10 +692,10 @@ ProcXF86DGAGetVideoLL(ClientPtr client) rep.sequenceNumber = client->sequence; if(!DGAAvailable(stuff->screen)) - return (DGAErrorBase + XF86DGANoDirectVideoMode); + return DGAErrorBase + XF86DGANoDirectVideoMode; if(!(num = DGAGetOldDGAMode(stuff->screen))) - return (DGAErrorBase + XF86DGANoDirectVideoMode); + return DGAErrorBase + XF86DGANoDirectVideoMode; /* get the parameters for the mode that best matches */ DGAGetModeInfo(stuff->screen, &mode, num); @@ -736,12 +736,12 @@ ProcXF86DGADirectVideo(ClientPtr client) if (stuff->enable & XF86DGADirectGraphics) { if(!(num = DGAGetOldDGAMode(stuff->screen))) - return (DGAErrorBase + XF86DGANoDirectVideoMode); + return DGAErrorBase + XF86DGANoDirectVideoMode; } else num = 0; if(Success != DGASetMode(stuff->screen, num, &mode, &pix)) - return (DGAErrorBase + XF86DGAScreenNotActive); + return DGAErrorBase + XF86DGAScreenNotActive; DGASetInputMode (stuff->screen, (stuff->enable & XF86DGADirectKeyb) != 0, @@ -785,10 +785,10 @@ ProcXF86DGAGetViewPortSize(ClientPtr client) rep.sequenceNumber = client->sequence; if (!DGAAvailable(stuff->screen)) - return (DGAErrorBase + XF86DGANoDirectVideoMode); + return DGAErrorBase + XF86DGANoDirectVideoMode; if(!(num = DGAGetOldDGAMode(stuff->screen))) - return (DGAErrorBase + XF86DGANoDirectVideoMode); + return DGAErrorBase + XF86DGANoDirectVideoMode; DGAGetModeInfo(stuff->screen, &mode, num); @@ -813,7 +813,7 @@ ProcXF86DGASetViewPort(ClientPtr client) REQUEST_SIZE_MATCH(xXF86DGASetViewPortReq); if (!DGAAvailable(stuff->screen)) - return (DGAErrorBase + XF86DGANoDirectVideoMode); + return DGAErrorBase + XF86DGANoDirectVideoMode; if (!DGAActive(stuff->screen)) return DGAErrorBase + XF86DGADirectNotActivated; @@ -877,7 +877,7 @@ ProcXF86DGAInstallColormap(ClientPtr client) REQUEST_SIZE_MATCH(xXF86DGAInstallColormapReq); if (!DGAActive(stuff->screen)) - return (DGAErrorBase + XF86DGADirectNotActivated); + return DGAErrorBase + XF86DGADirectNotActivated; rc = dixLookupResourceByType((pointer *)&pcmp, stuff->id, RT_COLORMAP, client, DixInstallAccess); @@ -926,7 +926,7 @@ ProcXF86DGAViewPortChanged(ClientPtr client) REQUEST_SIZE_MATCH(xXF86DGAViewPortChangedReq); if (!DGAActive(stuff->screen)) - return (DGAErrorBase + XF86DGADirectNotActivated); + return DGAErrorBase + XF86DGADirectNotActivated; rep.type = X_Reply; rep.length = 0; diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c index 363136986..0001c9eeb 100644 --- a/hw/xfree86/dixmods/extmod/xf86vmode.c +++ b/hw/xfree86/dixmods/extmod/xf86vmode.c @@ -520,7 +520,7 @@ ProcXF86VidModeGetAllModeLines(ClientPtr client) modecount = VidModeGetNumOfModes(stuff->screen); if (modecount < 1) - return (VidModeErrorBase + XF86VidModeExtensionDisabled); + return VidModeErrorBase + XF86VidModeExtensionDisabled; if (!VidModeGetFirstModeline(stuff->screen, &mode, &dotClock)) return BadValue; diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c index d33b0d1b0..e20595ab9 100644 --- a/hw/xfree86/dri2/dri2.c +++ b/hw/xfree86/dri2/dri2.c @@ -949,7 +949,7 @@ DRI2HasSwapControl(ScreenPtr pScreen) { DRI2ScreenPtr ds = DRI2GetScreen(pScreen); - return (ds->ScheduleSwap && ds->GetMSC); + return ds->ScheduleSwap && ds->GetMSC; } Bool diff --git a/hw/xfree86/loader/loadext.c b/hw/xfree86/loader/loadext.c index 8ac50a620..4078b7705 100644 --- a/hw/xfree86/loader/loadext.c +++ b/hw/xfree86/loader/loadext.c @@ -163,7 +163,7 @@ get_node(const char *name) for (n = graph; n && n->n_name && strcmp(n->n_name, name); n = n->n_next) ; if (n) - return (n); + return n; n = xnfalloc(sizeof(NODE)); @@ -180,7 +180,7 @@ get_node(const char *name) n->n_prevp = &graph; graph = n; - return (n); + return n; } /* @@ -285,7 +285,7 @@ find_cycle(NODE * from, NODE * to, int longest_len, int depth) * to be acyclic */ if (from->n_flags & (NF_NODEST | NF_MARK | NF_ACYCLIC)) - return (0); + return 0; from->n_flags |= NF_MARK; for (np = from->n_arcs, i = from->n_narcs; --i >= 0; np++) { @@ -317,7 +317,7 @@ find_cycle(NODE * from, NODE * to, int longest_len, int depth) } } from->n_flags &= ~NF_MARK; - return (longest_len); + return longest_len; } /* do topological sort on graph */ diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index defe560ba..496244312 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -114,7 +114,7 @@ static char **defaultPathList = NULL; static Bool PathIsAbsolute(const char *path) { - return (*path == '/'); + return *path == '/'; } /* @@ -739,7 +739,7 @@ static ModuleDescPtr AddSibling(ModuleDescPtr head, ModuleDescPtr new) { new->sib = head; - return (new); + return new; } pointer @@ -789,7 +789,7 @@ NewModuleDesc(const char *name) mdp->TearDownData = NULL; } - return (mdp); + return mdp; } ModuleDescPtr diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index cd978aed5..a62a63fec 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -577,7 +577,7 @@ xf86OutputInitialRotation (xf86OutputPtr output) for (i = 0; i < 4; i++) if (xf86nameCompare (direction[i], rotate_name) == 0) - return (1 << i); + return 1 << i; return RR_Rotate_0; } @@ -2201,7 +2201,7 @@ xf86TargetFallback(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, target_rotation, width, height); } - return (target_mode != NULL); + return target_mode != NULL; } static Bool @@ -3220,7 +3220,7 @@ xf86_crtc_supports_gamma(ScrnInfoPtr pScrn) return FALSE; crtc = xf86_config->crtc[0]; - return (crtc->funcs->gamma_set != NULL); + return crtc->funcs->gamma_set != NULL; } return FALSE; diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c index 18e1e0b67..bb3a5cb47 100644 --- a/hw/xfree86/os-support/bsd/alpha_video.c +++ b/hw/xfree86/os-support/bsd/alpha_video.c @@ -328,7 +328,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) "xf86MapVidMem", DEV_MEM, Size, Base, strerror(errno)); } - return(base); + return base; } /* else, mmap /dev/vga */ @@ -347,7 +347,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)\n", strerror(errno)); } - return(base); + return base; } static void @@ -370,7 +370,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, checkDevMem(TRUE); if (devMemFd == -1) { - return(-1); + return -1; } psize = getpagesize(); @@ -384,7 +384,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap[s=%x,a=%lx,o=%lx] failed (%s)\n", DEV_MEM, Len, Base, Offset, strerror(errno)); - return(-1); + return -1; } #ifdef DEBUG xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n", @@ -397,7 +397,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, "-> %02x %02x %02x %02x...\n", Base, Offset, Len, Buf[0], Buf[1], Buf[2], Buf[3]); #endif - return(Len); + return Len; } diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c index 466a8a0db..482d53fc3 100644 --- a/hw/xfree86/os-support/bsd/arm_video.c +++ b/hw/xfree86/os-support/bsd/arm_video.c @@ -201,7 +201,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) "xf86MapVidMem", DEV_MEM, Size, Base, strerror(errno)); } - return(base); + return base; } /* else, mmap /dev/vga */ @@ -220,7 +220,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)\n", strerror(errno)); } - return(base); + return base; } static void @@ -243,7 +243,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, checkDevMem(TRUE); if (devMemFd == -1) { - return(-1); + return -1; } psize = getpagesize(); @@ -257,7 +257,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap[s=%x,a=%x,o=%x] failed (%s)\n", DEV_MEM, Len, Base, Offset, strerror(errno)); - return(-1); + return -1; } #ifdef DEBUG ErrorF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n", @@ -270,7 +270,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, "-> %02x %02x %02x %02x...\n", Base, Offset, Len, Buf[0], Buf[1], Buf[2], Buf[3]); #endif - return(Len); + return Len; } @@ -430,7 +430,7 @@ armMapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) } base = xf86MapInfoMap(memInfoP, Base, Size); - return (base); + return base; } return mapVidMem(ScreenNum, Base, Size, flags); } diff --git a/hw/xfree86/os-support/bsd/bsd_VTsw.c b/hw/xfree86/os-support/bsd/bsd_VTsw.c index 4842be5c9..57d832a20 100644 --- a/hw/xfree86/os-support/bsd/bsd_VTsw.c +++ b/hw/xfree86/os-support/bsd/bsd_VTsw.c @@ -57,7 +57,7 @@ xf86VTSwitchPending() { #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) { - return(xf86Info.vtRequestsPending ? TRUE : FALSE); + return xf86Info.vtRequestsPending ? TRUE : FALSE; } #endif return FALSE; @@ -70,9 +70,9 @@ xf86VTSwitchAway() if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) { xf86Info.vtRequestsPending = FALSE; if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0) - return(FALSE); + return FALSE; else - return(TRUE); + return TRUE; } #endif return FALSE; @@ -85,19 +85,19 @@ xf86VTSwitchTo() if (xf86Info.consType == SYSCONS || xf86Info.consType == PCVT) { xf86Info.vtRequestsPending = FALSE; if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0) - return(FALSE); + return FALSE; else - return(TRUE); + return TRUE; } #endif - return(TRUE); + return TRUE; } Bool xf86VTActivate(int vtno) { if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, vtno) < 0) { - return(FALSE); + return FALSE; } - return(TRUE); + return TRUE; } diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c index 7698084ee..13c6ec37c 100644 --- a/hw/xfree86/os-support/bsd/bsd_init.c +++ b/hw/xfree86/os-support/bsd/bsd_init.c @@ -724,13 +724,13 @@ xf86ProcessArgument(int argc, char *argv[], int i) if (!strcmp(argv[i], "-keeptty")) { KeepTty = TRUE; - return(1); + return 1; } #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) if (!strcmp(argv[i], "-sharevts")) { ShareVTs = TRUE; - return(1); + return 1; } if ((argv[i][0] == 'v') && (argv[i][1] == 't')) { @@ -739,12 +739,12 @@ xf86ProcessArgument(int argc, char *argv[], int i) { UseMsg(); VTnum = -1; - return(0); + return 0; } - return(1); + return 1; } #endif /* SYSCONS_SUPPORT || PCVT_SUPPORT */ - return(0); + return 0; } void diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index 44abb9d55..7aef07901 100644 --- a/hw/xfree86/os-support/bsd/i386_video.c +++ b/hw/xfree86/os-support/bsd/i386_video.c @@ -246,7 +246,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) "xf86MapVidMem", DEV_MEM, Size, Base, strerror(errno)); } - return(base); + return base; } /* else, mmap /dev/vga */ @@ -266,7 +266,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) FatalError("xf86MapVidMem: Could not mmap /dev/vga (%s)", strerror(errno)); } - return(base); + return base; } static void @@ -289,7 +289,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, checkDevMem(TRUE); if (devMemFd == -1) { - return(-1); + return -1; } psize = getpagesize(); @@ -308,7 +308,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, xf86Msg(X_WARNING, SYSCTL_MSG2); } #endif - return(-1); + return -1; } #ifdef DEBUG ErrorF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n", @@ -321,7 +321,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, "-> %02x %02x %02x %02x...\n", Base, Offset, Len, Buf[0], Buf[1], Buf[2], Buf[3]); #endif - return(Len); + return Len; } #ifdef USE_I386_IOPL diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c index ea520c49e..c838792b5 100644 --- a/hw/xfree86/os-support/bsd/sparc64_video.c +++ b/hw/xfree86/os-support/bsd/sparc64_video.c @@ -87,5 +87,5 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, int Len) { - return (0); + return 0; } diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c index 44db8662d..c65f1e3f3 100644 --- a/hw/xfree86/os-support/linux/lnx_agp.c +++ b/hw/xfree86/os-support/linux/lnx_agp.c @@ -64,7 +64,7 @@ GARTInit(int screenNum) struct _agp_info agpinf; if (initDone) - return (gartFd != -1); + return gartFd != -1; initDone = TRUE; diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index 297e7a65a..c8cec2ecb 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -365,17 +365,17 @@ xf86ProcessArgument(int argc, char *argv[], int i) if (!strcmp(argv[i], "-keeptty")) { KeepTty = TRUE; - return(1); + return 1; } if (!strcmp(argv[i], "-novtswitch")) { VTSwitch = FALSE; - return(1); + return 1; } if (!strcmp(argv[i], "-sharevts")) { ShareVTs = TRUE; - return(1); + return 1; } if ((argv[i][0] == 'v') && (argv[i][1] == 't')) { @@ -383,11 +383,11 @@ xf86ProcessArgument(int argc, char *argv[], int i) { UseMsg(); VTnum = -1; - return(0); + return 0; } - return(1); + return 1; } - return(0); + return 0; } void diff --git a/hw/xfree86/os-support/sco/VTsw_sco.c b/hw/xfree86/os-support/sco/VTsw_sco.c index 0a59fb965..c9194ec8d 100644 --- a/hw/xfree86/os-support/sco/VTsw_sco.c +++ b/hw/xfree86/os-support/sco/VTsw_sco.c @@ -58,7 +58,7 @@ xf86VTRequest(int sig) Bool xf86VTSwitchPending(void) { - return(xf86Info.vtRequestsPending ? TRUE : FALSE); + return xf86Info.vtRequestsPending ? TRUE : FALSE; } /* @@ -79,9 +79,9 @@ xf86VTSwitchAway(void) xf86Info.vtRequestsPending = FALSE; if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_TRUE) < 0) { - return(FALSE); + return FALSE; } else { - return(TRUE); + return TRUE; } } @@ -97,7 +97,7 @@ xf86VTSwitchTo(void) xf86Info.vtRequestsPending = FALSE; if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0) { - return(FALSE); + return FALSE; } else { if (sco_ledstatus >= 0) { ioctl (xf86Info.consoleFd, KDSETLED, sco_ledstate); @@ -120,8 +120,8 @@ Bool xf86VTActivate(int vtno) { if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, vtno - 1) < 0) { - return(FALSE); + return FALSE; } - return(TRUE); + return TRUE; } diff --git a/hw/xfree86/os-support/sco/sco_init.c b/hw/xfree86/os-support/sco/sco_init.c index 5f7db3437..3322ed589 100644 --- a/hw/xfree86/os-support/sco/sco_init.c +++ b/hw/xfree86/os-support/sco/sco_init.c @@ -233,7 +233,7 @@ xf86ProcessArgument(int argc, char *argv[], int i) */ if (!strcmp(argv[i], "-keeptty")) { KeepTty = TRUE; - return(1); + return 1; } /* @@ -246,7 +246,7 @@ xf86ProcessArgument(int argc, char *argv[], int i) */ if (!strcmp(argv[i], "-nompxlock")) { mpxLock = FALSE; - return (1); + return 1; } /* @@ -256,14 +256,14 @@ xf86ProcessArgument(int argc, char *argv[], int i) if (sscanf(argv[i], "vt%2d", &VTnum) == 0) { UseMsg(); VTnum = -1; - return(0); + return 0; } if (VTnum <= 0) { UseMsg(); VTnum = -1; - return(0); + return 0; } - return(1); + return 1; } /* @@ -273,14 +273,14 @@ xf86ProcessArgument(int argc, char *argv[], int i) if (++i > argc) { UseMsg(); VTnum = -1; - return(0); + return 0; } else { VTnum = -2; strlcpy (vtdevice, argv[i], sizeof(vtdevice)); - return(2); + return 2; } } - return(0); + return 0; } void diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c index 3425840a2..98b3a8da3 100644 --- a/hw/xfree86/os-support/shared/VTsw_noop.c +++ b/hw/xfree86/os-support/shared/VTsw_noop.c @@ -38,23 +38,23 @@ Bool xf86VTSwitchPending(void) { - return(FALSE); + return FALSE; } Bool xf86VTSwitchAway(void) { - return(FALSE); + return FALSE; } Bool xf86VTSwitchTo(void) { - return(TRUE); + return TRUE; } Bool xf86VTActivate(int vtno) { - return(TRUE); + return TRUE; } diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c index 393f1c0b9..d4ef0f713 100644 --- a/hw/xfree86/os-support/shared/VTsw_usl.c +++ b/hw/xfree86/os-support/shared/VTsw_usl.c @@ -55,7 +55,7 @@ xf86VTRequest(int sig) Bool xf86VTSwitchPending(void) { - return(xf86Info.vtRequestsPending ? TRUE : FALSE); + return xf86Info.vtRequestsPending ? TRUE : FALSE; } Bool @@ -64,14 +64,14 @@ xf86VTSwitchAway(void) xf86Info.vtRequestsPending = FALSE; if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0) { - return(FALSE); + return FALSE; } else { #ifdef OSSWITCHAWAY OSSWITCHAWAY; #endif - return(TRUE); + return TRUE; } } @@ -81,11 +81,11 @@ xf86VTSwitchTo(void) xf86Info.vtRequestsPending = FALSE; if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0) { - return(FALSE); + return FALSE; } else { - return(TRUE); + return TRUE; } } @@ -94,8 +94,8 @@ xf86VTActivate(int vtno) { #ifdef VT_ACTIVATE if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, vtno) < 0) { - return(FALSE); + return FALSE; } #endif - return(TRUE); + return TRUE; } diff --git a/hw/xfree86/os-support/shared/bios_devmem.c b/hw/xfree86/os-support/shared/bios_devmem.c index 67a14f5d6..b9dfb7dcd 100644 --- a/hw/xfree86/os-support/shared/bios_devmem.c +++ b/hw/xfree86/os-support/shared/bios_devmem.c @@ -53,7 +53,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, { xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to open %s (%s)\n", DEV_MEM, strerror(errno)); - return(-1); + return -1; } if (lseek(fd, (Base+Offset), SEEK_SET) < 0) @@ -61,15 +61,15 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, xf86Msg(X_WARNING, "xf86ReadBIOS: %s seek failed (%s)\n", DEV_MEM, strerror(errno)); close(fd); - return(-1); + return -1; } if (read(fd, Buf, Len) != Len) { xf86Msg(X_WARNING, "xf86ReadBIOS: %s read failed (%s)\n", DEV_MEM, strerror(errno)); close(fd); - return(-1); + return -1; } close(fd); - return(Len); + return Len; } diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c index 40afd5b8e..33a8df042 100644 --- a/hw/xfree86/os-support/shared/bios_mmap.c +++ b/hw/xfree86/os-support/shared/bios_mmap.c @@ -53,7 +53,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, { xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to open %s (%s)\n", DEV_MEM, strerror(errno)); - return(-1); + return -1; } psize = getpagesize(); Offset += Base & (psize - 1); @@ -66,14 +66,14 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, xf86Msg(X_WARNING, "xf86ReadBIOS: %s mmap failed (%s)\n", DEV_MEM, strerror(errno)); close(fd); - return(-1); + return -1; } DebugF("xf86ReadBIOS: BIOS at 0x%08x has signature 0x%04x\n", Base, ptr[0] | (ptr[1] << 8)); (void)memcpy(Buf, (void *)(ptr + Offset), Len); (void)munmap((caddr_t)ptr, mlen); (void)close(fd); - return(Len); + return Len; } #else /* __alpha__ */ @@ -114,7 +114,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, { xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to open %s (%s)\n", DEV_MEM, strerror(errno)); - return(-1); + return -1; } psize = getpagesize(); @@ -128,14 +128,14 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, { xf86Msg(X_WARNING, "xf86ReadBIOS: Failed to mmap %s (%s)\n", DEV_MEM, strerror(errno)); - return(-1); + return -1; } xf86SlowBCopyFromBus((unsigned char *)(base+Offset), Buf, Len); munmap((caddr_t)base, mlen); close(fd); - return(Len); + return Len; } #endif /* __alpha__ */ diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c index 2e22bc3ff..1a330703c 100644 --- a/hw/xfree86/os-support/shared/posix_tty.c +++ b/hw/xfree86/os-support/shared/posix_tty.c @@ -108,7 +108,7 @@ GetBaud (int baudrate) if (baudrate == 460800) return B460800; #endif - return (0); + return 0; } int @@ -122,7 +122,7 @@ xf86OpenSerial (pointer options) if (!dev) { xf86Msg (X_ERROR, "xf86OpenSerial: No Device specified.\n"); - return (-1); + return -1; } SYSCALL (fd = open (dev, O_RDWR | O_NONBLOCK)); @@ -132,14 +132,14 @@ xf86OpenSerial (pointer options) "xf86OpenSerial: Cannot open device %s\n\t%s.\n", dev, strerror (errno)); free(dev); - return (-1); + return -1; } if (!isatty (fd)) { /* Allow non-tty devices to be opened. */ free(dev); - return (fd); + return fd; } /* set up default port parameters */ @@ -162,7 +162,7 @@ xf86OpenSerial (pointer options) { SYSCALL (close (fd)); free(dev); - return (-1); + return -1; } SYSCALL (i = fcntl (fd, F_GETFL, 0)); @@ -170,7 +170,7 @@ xf86OpenSerial (pointer options) { SYSCALL (close (fd)); free(dev); - return (-1); + return -1; } i &= ~O_NONBLOCK; SYSCALL (i = fcntl (fd, F_SETFL, i)); @@ -178,10 +178,10 @@ xf86OpenSerial (pointer options) { SYSCALL (close (fd)); free(dev); - return (-1); + return -1; } free(dev); - return (fd); + return fd; } int @@ -212,7 +212,7 @@ xf86SetSerial (int fd, pointer options) { xf86Msg (X_ERROR, "Invalid Option BaudRate value: %d\n", val); - return (-1); + return -1; } } @@ -229,7 +229,7 @@ xf86SetSerial (int fd, pointer options) default: xf86Msg (X_ERROR, "Invalid Option StopBits value: %d\n", val); - return (-1); + return -1; break; } } @@ -257,7 +257,7 @@ xf86SetSerial (int fd, pointer options) default: xf86Msg (X_ERROR, "Invalid Option DataBits value: %d\n", val); - return (-1); + return -1; break; } } @@ -281,7 +281,7 @@ xf86SetSerial (int fd, pointer options) { xf86Msg (X_ERROR, "Invalid Option Parity value: %s\n", s); - return (-1); + return -1; } } @@ -317,7 +317,7 @@ xf86SetSerial (int fd, pointer options) { xf86Msg (X_ERROR, "Invalid Option FlowControl value: %s\n", s); - return (-1); + return -1; } } @@ -333,7 +333,7 @@ xf86SetSerial (int fd, pointer options) #else xf86Msg (X_WARNING, "Option ClearDTR not supported on this OS\n"); - return (-1); + return -1; #endif xf86MarkOptionUsedByName (options, "ClearDTR"); } @@ -342,12 +342,12 @@ xf86SetSerial (int fd, pointer options) { xf86Msg (X_WARNING, "Option ClearRTS not supported on this OS\n"); - return (-1); + return -1; xf86MarkOptionUsedByName (options, "ClearRTS"); } SYSCALL (r = tcsetattr (fd, TCSANOW, &t)); - return (r); + return r; } int @@ -374,11 +374,11 @@ xf86SetSerialSpeed (int fd, int speed) { xf86Msg (X_ERROR, "Invalid Option BaudRate value: %d\n", speed); - return (-1); + return -1; } SYSCALL (r = tcsetattr (fd, TCSANOW, &t)); - return (r); + return r; } int @@ -393,7 +393,7 @@ xf86ReadSerial (int fd, void *buf, int count) for (i = 1; i < r; i++) DebugF(", 0x%x",(unsigned char)*(((unsigned char *)buf) + i)); DebugF("\n"); - return (r); + return r; } int @@ -407,7 +407,7 @@ xf86WriteSerial (int fd, const void *buf, int count) ErrorF(", 0x%x",(unsigned char)*(((unsigned char *)buf) + i)); DebugF("\n"); SYSCALL (r = write (fd, buf, count)); - return (r); + return r; } int @@ -416,7 +416,7 @@ xf86CloseSerial (int fd) int r; SYSCALL (r = close (fd)); - return (r); + return r; } int @@ -442,7 +442,7 @@ xf86WaitForInput (int fd, int timeout) SYSCALL (r = select (FD_SETSIZE, NULL, NULL, NULL, &to)); } xf86ErrorFVerb (9,"select returned %d\n", r); - return (r); + return r; } int @@ -451,7 +451,7 @@ xf86SerialSendBreak (int fd, int duration) int r; SYSCALL (r = tcsendbreak (fd, duration)); - return (r); + return r; } diff --git a/hw/xfree86/os-support/solaris/sun_VTsw.c b/hw/xfree86/os-support/solaris/sun_VTsw.c index 1e2774b11..cff279e0c 100644 --- a/hw/xfree86/os-support/solaris/sun_VTsw.c +++ b/hw/xfree86/os-support/solaris/sun_VTsw.c @@ -66,7 +66,7 @@ xf86VTAcquire(int sig) Bool xf86VTSwitchPending(void) { - return(xf86Info.vtRequestsPending ? TRUE : FALSE); + return xf86Info.vtRequestsPending ? TRUE : FALSE; } Bool @@ -81,7 +81,7 @@ xf86VTSwitchAway(void) if (xf86VTPruneDoor) { xf86VTPruneDoor = 0; ioctl(xf86Info.consoleFd, VT_RELDISP, 1); - return (TRUE); + return TRUE; } vt_door_arg.vt_ev = VT_EV_HOTKEYS; @@ -94,15 +94,15 @@ xf86VTSwitchAway(void) door_arg.desc_num = 0; if ((door_fd = open(VT_DAEMON_DOOR_FILE, O_RDONLY)) < 0) - return (FALSE); + return FALSE; if (door_call(door_fd, &door_arg) != 0) { close(door_fd); - return (FALSE); + return FALSE; } close(door_fd); - return (TRUE); + return TRUE; } Bool @@ -111,11 +111,11 @@ xf86VTSwitchTo(void) xf86Info.vtRequestsPending = FALSE; if (ioctl(xf86Info.consoleFd, VT_RELDISP, VT_ACKACQ) < 0) { - return(FALSE); + return FALSE; } else { - return(TRUE); + return TRUE; } } @@ -125,13 +125,13 @@ xf86VTActivate(int vtno) struct vt_stat state; if (ioctl(xf86Info.consoleFd, VT_GETSTATE, &state) < 0) - return(FALSE); + return FALSE; if ((state.v_state & (1 << vtno)) == 0) - return(FALSE); + return FALSE; xf86Info.vtRequestsPending = TRUE; xf86Info.vtPendingNum = vtno; - return(TRUE); + return TRUE; } diff --git a/hw/xfree86/os-support/solaris/sun_agp.c b/hw/xfree86/os-support/solaris/sun_agp.c index ccecd112d..734a6e1a6 100644 --- a/hw/xfree86/os-support/solaris/sun_agp.c +++ b/hw/xfree86/os-support/solaris/sun_agp.c @@ -78,7 +78,7 @@ static Bool GARTInit(int screenNum) { if (initDone) - return (gartFd != -1); + return gartFd != -1; if (gartFd == -1) gartFd = open(AGP_DEVICE, O_RDWR); diff --git a/hw/xfree86/os-support/sysv/sysv_init.c b/hw/xfree86/os-support/sysv/sysv_init.c index 170bb8914..9a423ffa5 100644 --- a/hw/xfree86/os-support/sysv/sysv_init.c +++ b/hw/xfree86/os-support/sysv/sysv_init.c @@ -215,7 +215,7 @@ xf86ProcessArgument(int argc, char *argv[], int i) if (!strcmp(argv[i], "-keeptty")) { KeepTty = TRUE; - return(1); + return 1; } #ifdef SVR4 /* @@ -226,7 +226,7 @@ xf86ProcessArgument(int argc, char *argv[], int i) if (!strcmp(argv[i], "-protect0")) { Protect0 = TRUE; - return(1); + return 1; } #endif if ((argv[i][0] == 'v') && (argv[i][1] == 't')) @@ -235,11 +235,11 @@ xf86ProcessArgument(int argc, char *argv[], int i) { UseMsg(); VTnum = -1; - return(0); + return 0; } - return(1); + return 1; } - return(0); + return 0; } void diff --git a/hw/xfree86/os-support/sysv/sysv_video.c b/hw/xfree86/os-support/sysv/sysv_video.c index 43c30621c..480abe5f9 100644 --- a/hw/xfree86/os-support/sysv/sysv_video.c +++ b/hw/xfree86/os-support/sysv/sysv_video.c @@ -106,7 +106,7 @@ mmapStat(pointer Base, unsigned long Size) { } } if (region == -1 && nmmreg > 0) region=region * i; - return(region); + return region; } #endif @@ -211,7 +211,7 @@ mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags) "xf86MapVidMem: SUCCEED Mapping FrameBuffer \n"); #endif /* HAS_SVR3_MMAPDRV */ #endif /* SVR4 */ - return(base); + return base; } /* ARGSUSED */ diff --git a/hw/xfree86/parser/Configint.h b/hw/xfree86/parser/Configint.h index 03509b397..dda020e68 100644 --- a/hw/xfree86/parser/Configint.h +++ b/hw/xfree86/parser/Configint.h @@ -105,7 +105,7 @@ if( (ptr=calloc(1,sizeof(typerec))) == NULL ) { return; } if ((ptr->f=func) == NULL)\ {\ CLEANUP (ptr);\ - return (NULL);\ + return NULL;\ } #define HANDLE_LIST(field,func,type)\ @@ -114,7 +114,7 @@ type p = func ();\ if (p == NULL)\ {\ CLEANUP (ptr);\ - return (NULL);\ + return NULL;\ }\ else\ {\ diff --git a/hw/xfree86/parser/Device.c b/hw/xfree86/parser/Device.c index 47ece07de..d71abc6c2 100644 --- a/hw/xfree86/parser/Device.c +++ b/hw/xfree86/parser/Device.c @@ -363,9 +363,9 @@ xf86findDevice (const char *ident, XF86ConfDevicePtr p) while (p) { if (xf86nameCompare (ident, p->dev_identifier) == 0) - return (p); + return p; p = p->list.next; } - return (NULL); + return NULL; } diff --git a/hw/xfree86/parser/Flags.c b/hw/xfree86/parser/Flags.c index f4fea286c..699dc6bcb 100644 --- a/hw/xfree86/parser/Flags.c +++ b/hw/xfree86/parser/Flags.c @@ -318,10 +318,10 @@ xf86findOption (XF86OptionPtr list, const char *name) while (list) { if (xf86nameCompare (list->opt_name, name) == 0) - return (list); + return list; list = list->list.next; } - return (NULL); + return NULL; } /* @@ -339,11 +339,11 @@ xf86findOptionValue (XF86OptionPtr list, const char *name) if (p) { if (p->opt_val) - return (p->opt_val); + return p->opt_val; else return ""; } - return (NULL); + return NULL; } XF86OptionPtr @@ -361,7 +361,7 @@ xf86optionListCreate( const char **options, int count, int used ) if( (count % 2) != 0 ) { fprintf( stderr, "xf86optionListCreate: count must be an even number.\n" ); - return (NULL); + return NULL; } for (i = 0; i < count; i += 2) { @@ -375,7 +375,7 @@ xf86optionListCreate( const char **options, int count, int used ) p = addNewOption2 (p, t1, t2, used); } - return (p); + return p; } /* the 2 given lists are merged. If an option with the same name is present in @@ -425,7 +425,7 @@ xf86optionListMerge (XF86OptionPtr head, XF86OptionPtr tail) } else head = tail; - return (head); + return head; } char * @@ -452,7 +452,7 @@ xf86parseOption(XF86OptionPtr head) if ((token = xf86getSubToken(&comment)) != STRING) { xf86parseError(BAD_OPTION_MSG, NULL); free(comment); - return (head); + return head; } name = val.str; @@ -489,7 +489,7 @@ xf86parseOption(XF86OptionPtr head) if (old == NULL) return ((XF86OptionPtr)xf86addListItem((glp)head, (glp)cnew)); - return (head); + return head; } void diff --git a/hw/xfree86/parser/Input.c b/hw/xfree86/parser/Input.c index 8c8e46fb4..50869d488 100644 --- a/hw/xfree86/parser/Input.c +++ b/hw/xfree86/parser/Input.c @@ -175,11 +175,11 @@ xf86validateInput (XF86ConfigPtr p) while (input) { if (!input->inp_driver) { xf86validationError (UNDEFINED_INPUTDRIVER_MSG, input->inp_identifier); - return (FALSE); + return FALSE; } input = input->list.next; } - return (TRUE); + return TRUE; } XF86ConfInputPtr @@ -188,11 +188,11 @@ xf86findInput (const char *ident, XF86ConfInputPtr p) while (p) { if (xf86nameCompare (ident, p->inp_identifier) == 0) - return (p); + return p; p = p->list.next; } - return (NULL); + return NULL; } XF86ConfInputPtr @@ -201,10 +201,10 @@ xf86findInputByDriver (const char *driver, XF86ConfInputPtr p) while (p) { if (xf86nameCompare (driver, p->inp_driver) == 0) - return (p); + return p; p = p->list.next; } - return (NULL); + return NULL; } diff --git a/hw/xfree86/parser/Layout.c b/hw/xfree86/parser/Layout.c index 00c1e7d09..e1f770bc3 100644 --- a/hw/xfree86/parser/Layout.c +++ b/hw/xfree86/parser/Layout.c @@ -513,7 +513,7 @@ xf86validateLayout (XF86ConfigPtr p) { xf86validationError (UNDEFINED_SCREEN_MSG, adj->adj_screen_str, layout->lay_identifier); - return (FALSE); + return FALSE; } else adj->adj_screen = screen; @@ -529,7 +529,7 @@ xf86validateLayout (XF86ConfigPtr p) { xf86validationError (UNDEFINED_DEVICE_LAY_MSG, iptr->inactive_device_str, layout->lay_identifier); - return (FALSE); + return FALSE; } else iptr->inactive_device = device; @@ -541,7 +541,7 @@ xf86validateLayout (XF86ConfigPtr p) layout = layout->list.next; } - return (TRUE); + return TRUE; } XF86ConfLayoutPtr @@ -550,9 +550,9 @@ xf86findLayout (const char *name, XF86ConfLayoutPtr list) while (list) { if (xf86nameCompare (list->lay_identifier, name) == 0) - return (list); + return list; list = list->list.next; } - return (NULL); + return NULL; } diff --git a/hw/xfree86/parser/Monitor.c b/hw/xfree86/parser/Monitor.c index 50de091fc..76c35ae74 100644 --- a/hw/xfree86/parser/Monitor.c +++ b/hw/xfree86/parser/Monitor.c @@ -264,7 +264,7 @@ xf86parseModeLine (void) #ifdef DEBUG printf ("ModeLine parsed\n"); #endif - return (ptr); + return ptr; } static XF86ConfModeLinePtr @@ -413,7 +413,7 @@ xf86parseVerboseMode (void) #ifdef DEBUG printf ("Verbose Mode parsed\n"); #endif - return (ptr); + return ptr; } #undef CLEANUP @@ -848,11 +848,11 @@ xf86findMonitor (const char *ident, XF86ConfMonitorPtr p) while (p) { if (xf86nameCompare (ident, p->mon_identifier) == 0) - return (p); + return p; p = p->list.next; } - return (NULL); + return NULL; } XF86ConfModesPtr @@ -861,11 +861,11 @@ xf86findModes (const char *ident, XF86ConfModesPtr p) while (p) { if (xf86nameCompare (ident, p->modes_identifier) == 0) - return (p); + return p; p = p->list.next; } - return (NULL); + return NULL; } XF86ConfModeLinePtr @@ -874,11 +874,11 @@ xf86findModeLine (const char *ident, XF86ConfModeLinePtr p) while (p) { if (xf86nameCompare (ident, p->ml_identifier) == 0) - return (p); + return p; p = p->list.next; } - return (NULL); + return NULL; } int @@ -895,10 +895,10 @@ xf86validateMonitor (XF86ConfigPtr p, XF86ConfScreenPtr screen) xf86validationError (UNDEFINED_MODES_MSG, modeslnk->ml_modes_str, screen->scrn_identifier); - return (FALSE); + return FALSE; } modeslnk->ml_modes = modes; modeslnk = modeslnk->list.next; } - return (TRUE); + return TRUE; } diff --git a/hw/xfree86/parser/Screen.c b/hw/xfree86/parser/Screen.c index b3b004df6..dd2319d95 100644 --- a/hw/xfree86/parser/Screen.c +++ b/hw/xfree86/parser/Screen.c @@ -522,7 +522,7 @@ xf86validateScreen (XF86ConfigPtr p) { screen->scrn_monitor = monitor; if (!xf86validateMonitor(p, screen)) - return (FALSE); + return FALSE; } } @@ -535,13 +535,13 @@ xf86validateScreen (XF86ConfigPtr p) if (!adaptor->al_adaptor) { xf86validationError (UNDEFINED_ADAPTOR_MSG, adaptor->al_adaptor_str, screen->scrn_identifier); - return (FALSE); + return FALSE; } else if (adaptor->al_adaptor->va_fwdref) { xf86validationError (ADAPTOR_REF_TWICE_MSG, adaptor->al_adaptor_str, adaptor->al_adaptor->va_fwdref); - return (FALSE); + return FALSE; } adaptor->al_adaptor->va_fwdref = strdup(screen->scrn_identifier); @@ -551,7 +551,7 @@ xf86validateScreen (XF86ConfigPtr p) screen = screen->list.next; } - return (TRUE); + return TRUE; } XF86ConfScreenPtr @@ -560,10 +560,10 @@ xf86findScreen (const char *ident, XF86ConfScreenPtr p) while (p) { if (xf86nameCompare (ident, p->scrn_identifier) == 0) - return (p); + return p; p = p->list.next; } - return (NULL); + return NULL; } diff --git a/hw/xfree86/parser/Video.c b/hw/xfree86/parser/Video.c index beeb43e4f..377438749 100644 --- a/hw/xfree86/parser/Video.c +++ b/hw/xfree86/parser/Video.c @@ -288,9 +288,9 @@ xf86findVideoAdaptor (const char *ident, XF86ConfVideoAdaptorPtr p) while (p) { if (xf86nameCompare (ident, p->va_identifier) == 0) - return (p); + return p; p = p->list.next; } - return (NULL); + return NULL; } diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c index 4e42b24f0..d4d525218 100644 --- a/hw/xfree86/parser/read.c +++ b/hw/xfree86/parser/read.c @@ -87,7 +87,7 @@ xf86validateConfig (XF86ConfigPtr p) if (!xf86validateLayout (p)) return FALSE; - return (TRUE); + return TRUE; } XF86ConfigPtr @@ -113,7 +113,7 @@ xf86readConfigFile (void) { xf86parseError (QUOTE_MSG, "Section"); CLEANUP (ptr); - return (NULL); + return NULL; } xf86setSection (val.str); if (xf86nameCompare (val.str, "files") == 0) @@ -232,11 +232,11 @@ xf86readConfigFile (void) } if (xf86validateConfig (ptr)) - return (ptr); + return ptr; else { CLEANUP (ptr); - return (NULL); + return NULL; } } @@ -263,10 +263,10 @@ xf86addListItem (GenericListPtr head, GenericListPtr new) if (last) { last->next = new; - return (head); + return head; } else - return (new); + return new; } /* diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c index 05fbc8995..531214350 100644 --- a/hw/xfree86/parser/scan.c +++ b/hw/xfree86/parser/scan.c @@ -155,11 +155,11 @@ xf86strToUL (char *str) } else { - return (tot); + return tot; } p++; } - return (tot); + return tot; } /* @@ -289,7 +289,7 @@ xf86getNextLine(void) } while (!eolFound); - return (ret); + return ret; } /* @@ -308,7 +308,7 @@ xf86getToken (xf86ConfigSymTabRec * tab) * oth * case the next token must be read from the input. */ if (pushToken == EOF_TOKEN) - return (EOF_TOKEN); + return EOF_TOKEN; else if (pushToken == LOCK_TOKEN) { /* @@ -350,7 +350,7 @@ again: goto again; } else - return (pushToken = EOF_TOKEN); + return pushToken = EOF_TOKEN; } configLineNo++; configPos = 0; @@ -387,7 +387,7 @@ again: * Use xf86addComment when setting a comment. */ val.str = configRBuf; - return (COMMENT); + return COMMENT; } /* GJA -- handle '-' and ',' * Be careful: "-hsync" is a keyword. */ @@ -436,7 +436,7 @@ again: configRBuf[i] = '\0'; val.num = xf86strToUL (configRBuf); val.realnum = atof (configRBuf); - return (NUMBER); + return NUMBER; } /* @@ -453,7 +453,7 @@ again: configRBuf[i] = '\0'; val.str = malloc (strlen (configRBuf) + 1); strcpy (val.str, configRBuf); /* private copy ! */ - return (STRING); + return STRING; } /* @@ -486,9 +486,9 @@ again: pushToken = LOCK_TOKEN; if (temp == COMMA || temp == DASH) - return (temp); + return temp; if (temp == NUMBER || temp == STRING) - return (temp); + return temp; } /* @@ -499,12 +499,12 @@ again: i = 0; while (tab[i].token != -1) if (xf86nameCompare (configRBuf, tab[i].name) == 0) - return (tab[i].token); + return tab[i].token; else i++; } - return (ERROR_TOKEN); /* Error catcher */ + return ERROR_TOKEN; /* Error catcher */ } int @@ -519,7 +519,7 @@ xf86getSubToken (char **comment) *comment = xf86addComment(*comment, val.str); } else - return (token); + return token; } /*NOTREACHED*/ } @@ -536,7 +536,7 @@ xf86getSubTokenWithTab (char **comment, xf86ConfigSymTabRec *tab) *comment = xf86addComment(*comment, val.str); } else - return (token); + return token; } /*NOTREACHED*/ } @@ -1112,7 +1112,7 @@ StringToToken (char *str, xf86ConfigSymTabRec * tab) if (!xf86nameCompare (tab[i].name, str)) return tab[i].token; } - return (ERROR_TOKEN); + return ERROR_TOKEN; } @@ -1127,9 +1127,9 @@ xf86nameCompare (const char *s1, const char *s2) if (!s1 || *s1 == 0) { if (!s2 || *s2 == 0) - return (0); + return 0; else - return (1); + return 1; } while (*s1 == '_' || *s1 == ' ' || *s1 == '\t') @@ -1141,7 +1141,7 @@ xf86nameCompare (const char *s1, const char *s2) while (c1 == c2) { if (c1 == '\0') - return (0); + return 0; s1++; s2++; while (*s1 == '_' || *s1 == ' ' || *s1 == '\t') @@ -1151,7 +1151,7 @@ xf86nameCompare (const char *s1, const char *s2) c1 = (isupper (*s1) ? tolower (*s1) : *s1); c2 = (isupper (*s2) ? tolower (*s2) : *s2); } - return (c1 - c2); + return c1 - c2; } char * @@ -1161,7 +1161,7 @@ xf86addComment(char *cur, char *add) int len, curlen, iscomment, hasnewline = 0, endnewline; if (add == NULL || add[0] == '\0') - return (cur); + return cur; if (cur) { curlen = strlen(cur); @@ -1186,7 +1186,7 @@ xf86addComment(char *cur, char *add) len += 1 + iscomment + (!hasnewline) + (!endnewline) + eol_seen; if ((str = realloc(cur, len + curlen)) == NULL) - return (cur); + return cur; cur = str; @@ -1198,7 +1198,7 @@ xf86addComment(char *cur, char *add) if (!endnewline) strcat(cur, "\n"); - return (cur); + return cur; } Bool diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c index 2d9fe4d8f..89fb25c87 100644 --- a/hw/xfree86/ramdac/IBM.c +++ b/hw/xfree86/ramdac/IBM.c @@ -96,13 +96,13 @@ IBMramdac640CalculateMNPCForClock( lowestFreqErr = freqErr; /* Return if we found an exact match */ if (freqErr == 0) - return (ActualClock); + return ActualClock; } } } } - return (ActualClock); + return ActualClock; } unsigned long @@ -162,13 +162,13 @@ IBMramdac526CalculateMNPCForClock( lowestFreqErr = freqErr; /* Return if we found an exact match */ if (freqErr == 0) - return (ActualClock); + return ActualClock; } } } } - return (ActualClock); + return ActualClock; } void diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c index 1c541d76b..eee5d45cf 100644 --- a/hw/xfree86/ramdac/TI.c +++ b/hw/xfree86/ramdac/TI.c @@ -118,7 +118,7 @@ TIramdacCalculateMNPForClock( DebugF( "f_out=%ld f_vco=%.1f n=%d m=%d p=%d\n", ActualClock, VCO, *rN, *rM, *rP); - return (ActualClock); + return ActualClock; } void diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c index f4d127442..24806b689 100644 --- a/hw/xfree86/ramdac/xf86RamDac.c +++ b/hw/xfree86/ramdac/xf86RamDac.c @@ -82,7 +82,7 @@ RamDacInit(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPriv) ((RamDacScreenRecPtr) (pScrn)->privates[RamDacGetScreenIndex()].ptr); ramdacScrPtr->RamDacRec = ramdacPriv; - return(TRUE); + return TRUE; } void diff --git a/hw/xfree86/utils/gtf/gtf.c b/hw/xfree86/utils/gtf/gtf.c index 8ce93276a..bd5de7da9 100644 --- a/hw/xfree86/utils/gtf/gtf.c +++ b/hw/xfree86/utils/gtf/gtf.c @@ -634,7 +634,7 @@ mode *vert_refresh (int h_pixels, int v_lines, float freq, m->h_freq = h_freq; m->v_freq = freq; - return (m); + return m; } @@ -686,7 +686,7 @@ options *parse_command_line (int argc, char *argv[]) if (!o->fbmode && !o->xorgmode) o->xorgmode = 1; - return (o); + return o; bad_option: @@ -713,7 +713,7 @@ options *parse_command_line (int argc, char *argv[]) fprintf (stderr, "\n"); free (o); - return (NULL); + return NULL; } diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index 2ace752c1..0b34648e1 100644 --- a/hw/xfree86/vbe/vbe.c +++ b/hw/xfree86/vbe/vbe.c @@ -370,7 +370,7 @@ VBEGetVBEInfo(vbeInfoPtr pVbe) xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (NULL); + return NULL; block = calloc(sizeof(VbeInfoBlock), 1); block->VESASignature[0] = ((char*)pVbe->memory)[0]; @@ -418,7 +418,7 @@ VBEGetVBEInfo(vbeInfoPtr pVbe) memcpy(&block->OemData, ((char*)pVbe->memory) + 256, 256); } - return (block); + return block; } void @@ -493,10 +493,10 @@ VBEGetVBEMode(vbeInfoPtr pVbe, int *mode) if (R16(pVbe->pInt10->ax) == 0x4f) { *mode = R16(pVbe->pInt10->bx); - return (TRUE); + return TRUE; } - return (FALSE); + return FALSE; } VbeModeInfoBlock * @@ -525,7 +525,7 @@ VBEGetModeInfo(vbeInfoPtr pVbe, int mode) pVbe->pInt10->di = SEG_OFF(pVbe->real_mode_base); xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (NULL); + return NULL; block = calloc(sizeof(VbeModeInfoBlock), 1); @@ -591,7 +591,7 @@ VBEGetModeInfo(vbeInfoPtr pVbe, int mode) else memcpy(&block->PhysBasePtr, ((char*)pVbe->memory) + 40, 216); - return (block); + return block; } void @@ -657,7 +657,7 @@ VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function, pVbe->pInt10->cx = 0x000f; xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (FALSE); + return FALSE; if (function == MODE_SAVE) { int npages = (R16(pVbe->pInt10->bx) * 64) / 4096 + 1; @@ -665,7 +665,7 @@ VBESaveRestore(vbeInfoPtr pVbe, vbeSaveRestoreFunction function, real_mode_pages)) == NULL) { xf86DrvMsg(screen, X_ERROR, "Cannot allocate memory to save SVGA state.\n"); - return (FALSE); + return FALSE; } } *size = pVbe->pInt10->bx * 64; @@ -716,9 +716,9 @@ VBEBankSwitch(vbeInfoPtr pVbe, unsigned int iBank, int window) xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (FALSE); + return FALSE; - return (TRUE); + return TRUE; } Bool @@ -726,7 +726,7 @@ VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, vbeScanwidthCommand command, int width, int *pixels, int *bytes, int *max) { if (command < SCANWID_SET || command > SCANWID_GET_MAX) - return (FALSE); + return FALSE; /* Input: @@ -755,7 +755,7 @@ VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, vbeScanwidthCommand command, xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (FALSE); + return FALSE; if (command == SCANWID_GET || command == SCANWID_GET_MAX) { if (pixels) @@ -766,7 +766,7 @@ VBESetGetLogicalScanlineLength(vbeInfoPtr pVbe, vbeScanwidthCommand command, *max = R16(pVbe->pInt10->dx); } - return (TRUE); + return TRUE; } Bool @@ -780,9 +780,9 @@ VBESetDisplayStart(vbeInfoPtr pVbe, int x, int y, Bool wait_retrace) xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (FALSE); + return FALSE; - return (TRUE); + return TRUE; } Bool @@ -794,12 +794,12 @@ VBEGetDisplayStart(vbeInfoPtr pVbe, int *x, int *y) xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (FALSE); + return FALSE; *x = pVbe->pInt10->cx; *y = pVbe->pInt10->dx; - return (TRUE); + return TRUE; } int @@ -827,7 +827,7 @@ VBESetGetDACPaletteFormat(vbeInfoPtr pVbe, int bits) xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (0); + return 0; return (bits != 0 ? bits : (pVbe->pInt10->bx >> 8) & 0x00ff); } @@ -878,15 +878,15 @@ VBESetGetPaletteData(vbeInfoPtr pVbe, Bool set, int first, int num, xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (NULL); + return NULL; if (set) - return (data); + return data; data = malloc(num * sizeof(CARD32)); memcpy(data, pVbe->memory, num * sizeof(CARD32)); - return (data); + return data; } VBEpmi * @@ -915,14 +915,14 @@ VBEGetVBEpmi(vbeInfoPtr pVbe) xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (NULL); + return NULL; pmi = malloc(sizeof(VBEpmi)); pmi->seg_tbl = R16(pVbe->pInt10->es); pmi->tbl_off = R16(pVbe->pInt10->di); pmi->tbl_len = R16(pVbe->pInt10->cx); - return (pmi); + return pmi; } #if 0 @@ -1034,9 +1034,9 @@ VBEGetPixelClock(vbeInfoPtr pVbe, int mode, int clock) xf86ExecX86int10(pVbe->pInt10); if (R16(pVbe->pInt10->ax) != 0x4f) - return (0); + return 0; - return (pVbe->pInt10->cx); + return pVbe->pInt10->cx; } Bool diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c index 4720f4db8..83c29c36e 100644 --- a/hw/xfree86/vgahw/vgaCmap.c +++ b/hw/xfree86/vgahw/vgaCmap.c @@ -51,7 +51,7 @@ vgaListInstalledColormaps(pScreen, pmaps) * is always a colormap installed */ *pmaps = GetInstalledmiColormap(pScreen)->mid; - return(1); + return 1; } int @@ -63,7 +63,7 @@ vgaGetInstalledColormaps(pScreen, pmaps) * is always a colormap installed */ *pmaps = GetInstalledmiColormap(pScreen); - return(1); + return 1; } int vgaCheckColorMap(ColormapPtr pmap) diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index b6832c30a..ee045d15b 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -658,7 +658,7 @@ vgaHWSaveScreen(ScreenPtr pScreen, int mode) if ((pScrn != NULL) && pScrn->vtSema) { vgaHWBlankScreen(pScrn, on); } - return (TRUE); + return TRUE; } @@ -1351,7 +1351,7 @@ vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode) regp->Attribute[19] = 0x00; regp->Attribute[20] = 0x00; - return(TRUE); + return TRUE; } /* diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c index dde31c1f3..e1fecab01 100644 --- a/hw/xfree86/xaa/xaaFillRect.c +++ b/hw/xfree86/xaa/xaaFillRect.c @@ -1090,6 +1090,6 @@ XAAGetRectClipBoxes( } } - return(pboxClipped - pboxClippedBase); + return pboxClipped - pboxClippedBase; } diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c index a7fcf7ab9..7bfddcbcd 100644 --- a/hw/xfree86/xaa/xaaNonTEText.c +++ b/hw/xfree86/xaa/xaaNonTEText.c @@ -82,7 +82,7 @@ XAAPolyText8NonTEColorExpansion( infoRec->CharInfo); } - return (x + width); + return x + width; } @@ -112,7 +112,7 @@ XAAPolyText16NonTEColorExpansion( infoRec->CharInfo); } - return (x + width); + return x + width; } diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c index 194ec630a..62e17cb66 100644 --- a/hw/xnest/Events.c +++ b/hw/xnest/Events.c @@ -67,7 +67,7 @@ SetTimeSinceLastInputEvent(void) static Bool xnestExposurePredicate(Display *display, XEvent *event, char *args) { - return (event->type == Expose || event->type == ProcessedExpose); + return event->type == Expose || event->type == ProcessedExpose; } static Bool diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c index 6b76fc28b..829b86b2b 100644 --- a/hw/xnest/GCOps.c +++ b/hw/xnest/GCOps.c @@ -117,7 +117,7 @@ xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h, static Bool xnestBitBlitPredicate(Display *display, XEvent *event, char *args) { - return (event->type == GraphicsExpose || event->type == NoExpose); + return event->type == GraphicsExpose || event->type == NoExpose; } static RegionPtr @@ -158,7 +158,7 @@ xnestBitBlitHelper(GCPtr pGC) RegionDestroy(pTmpReg); RegionValidate(pReg, &overlap); - return(pReg); + return pReg; } } diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c index a0968b94d..3a92ffde8 100644 --- a/hw/xnest/Pixmap.c +++ b/hw/xnest/Pixmap.c @@ -133,5 +133,5 @@ xnestPixmapToRegion(PixmapPtr pPixmap) RegionValidate(pReg, &overlap); - return(pReg); + return pReg; } diff --git a/hw/xquartz/darwinXinput.c b/hw/xquartz/darwinXinput.c index 90e440e54..19aefb153 100644 --- a/hw/xquartz/darwinXinput.c +++ b/hw/xquartz/darwinXinput.c @@ -210,14 +210,14 @@ ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev, DEBUG_LOG("ChangeDeviceControl(%p, %p, %p)\n", client, dev, control); switch (control->control) { case DEVICE_RESOLUTION: - return (BadMatch); + return BadMatch; case DEVICE_ABS_CALIB: case DEVICE_ABS_AREA: - return (BadMatch); + return BadMatch; case DEVICE_CORE: - return (BadMatch); + return BadMatch; default: - return (BadMatch); + return BadMatch; } } diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c index 63a185fc8..6f7bbfdc2 100644 --- a/hw/xquartz/mach-startup/bundle-main.c +++ b/hw/xquartz/mach-startup/bundle-main.c @@ -641,7 +641,7 @@ static int execute(const char *command) { execvp (newargv[0], (char * const *) newargv); perror ("X11.app: Couldn't exec."); - return(1); + return 1; } static char *command_from_prefs(const char *key, const char *default_value) { diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c index 72a7ecfc8..dc780038d 100644 --- a/hw/xquartz/xpr/dri.c +++ b/hw/xquartz/xpr/dri.c @@ -289,7 +289,7 @@ DRIExtensionInit(void) DRIDrawablePrivResType = CreateNewResourceType(DRIDrawablePrivDelete, "DRIDrawable"); - return (DRIDrawablePrivResType != 0); + return DRIDrawablePrivResType != 0; } void diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c index c2dd05693..ab49aaa7a 100644 --- a/hw/xwin/winconfig.c +++ b/hw/xwin/winconfig.c @@ -730,7 +730,7 @@ winNameCompare (const char *s1, const char *s2) c1 = (isupper (*s1) ? tolower (*s1) : *s1); c2 = (isupper (*s2) ? tolower (*s2) : *s2); } - return (c1 - c2); + return c1 - c2; } @@ -765,11 +765,11 @@ winFindOptionValue (XF86OptionPtr list, const char *name) if (list) { if (list->opt_val) - return (list->opt_val); + return list->opt_val; else return ""; } - return (NULL); + return NULL; } |