diff options
author | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-06-06 21:18:40 +0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2010-06-10 06:42:42 -0700 |
commit | 7287ef9e6cf953066e4a092cca9d0e4a279172bf (patch) | |
tree | b67414bd69d1a1afc881e224d2f04cd495eb81d2 /mi | |
parent | b3a7b229e1e1f212bdd185af5443311091824005 (diff) |
Remove unnecessary parentheses around return values in functions
This patch was generated by the following Perl code:
perl -i -pe 's/([^_])return\s*\(\s*([^(]+?)\s*\)s*;(\s+(\n))?/$1return $2;$4/g;'
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'mi')
-rw-r--r-- | mi/miarc.c | 4 | ||||
-rw-r--r-- | mi/mibitblt.c | 2 | ||||
-rw-r--r-- | mi/micmap.c | 2 | ||||
-rw-r--r-- | mi/mifpolycon.c | 2 | ||||
-rw-r--r-- | mi/mioverlay.c | 2 | ||||
-rw-r--r-- | mi/mipolycon.c | 10 | ||||
-rw-r--r-- | mi/mipolygen.c | 8 | ||||
-rw-r--r-- | mi/mipolyutil.c | 2 | ||||
-rw-r--r-- | mi/mivaltree.c | 2 | ||||
-rw-r--r-- | mi/miwideline.c | 4 |
10 files changed, 19 insertions, 19 deletions
diff --git a/mi/miarc.c b/mi/miarc.c index db21165df..881e0db03 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -1561,7 +1561,7 @@ miGetArcPts( cdt = 2 * miDcos(dt); if (!(poly = (SppPointPtr) realloc((pointer)*ppPts, (cpt + count) * sizeof(SppPointRec)))) - return(0); + return 0; *ppPts = poly; xc = parc->width/2.0; /* store half width and half height */ @@ -1598,7 +1598,7 @@ miGetArcPts( poly[cpt +i -1].y = (miDsin(st + et) * parc->height/2.0 + yc); } - return(count); + return count; } struct arcData { diff --git a/mi/mibitblt.c b/mi/mibitblt.c index 98857e8ce..49e17bde6 100644 --- a/mi/mibitblt.c +++ b/mi/mibitblt.c @@ -379,7 +379,7 @@ miGetPlane( pOut += delta; } } - return(result); + return result; } diff --git a/mi/micmap.c b/mi/micmap.c index 3effe6c76..8d76f4df7 100644 --- a/mi/micmap.c +++ b/mi/micmap.c @@ -47,7 +47,7 @@ miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) { if (GetInstalledmiColormap(pScreen)) { *pmaps = GetInstalledmiColormap(pScreen)->mid; - return (1); + return 1; } return 0; } diff --git a/mi/mifpolycon.c b/mi/mifpolycon.c index 1be01500a..e48686a58 100644 --- a/mi/mifpolycon.c +++ b/mi/mifpolycon.c @@ -276,5 +276,5 @@ GetFPolyYBounds( *by = ICEIL(ymin + yFtrans); *ty = ICEIL(ymax + yFtrans - 1); - return(ptMin-ptsStart); + return ptMin-ptsStart; } diff --git a/mi/mioverlay.c b/mi/mioverlay.c index e7a9401e4..766c5e7f7 100644 --- a/mi/mioverlay.c +++ b/mi/mioverlay.c @@ -444,7 +444,7 @@ miOverlayMarkOverlappedWindows( MIOVERLAY_GET_SCREEN_PRIVATE(pScreen)->underlayMarked = TRUE; } - return (underMarked || overMarked); + return underMarked || overMarked; } diff --git a/mi/mipolycon.c b/mi/mipolycon.c index 2404c56ef..c201e396f 100644 --- a/mi/mipolycon.c +++ b/mi/mipolycon.c @@ -104,14 +104,14 @@ miFillConvexPoly( dy = ymax - ymin + 1; if ((count < 3) || (dy < 0)) - return(TRUE); + return TRUE; ptsOut = FirstPoint = malloc(sizeof(DDXPointRec)*dy); width = FirstWidth = malloc(sizeof(int) * dy); if(!FirstPoint || !FirstWidth) { free(FirstWidth); free(FirstPoint); - return(FALSE); + return FALSE; } nextleft = nextright = imin; @@ -177,7 +177,7 @@ miFillConvexPoly( { free(FirstWidth); free(FirstPoint); - return(TRUE); + return TRUE; } while (i-- > 0) { @@ -212,7 +212,7 @@ miFillConvexPoly( 1); free(FirstWidth); free(FirstPoint); - return(TRUE); + return TRUE; } @@ -243,5 +243,5 @@ getPolyYBounds(DDXPointPtr pts, int n, int *by, int *ty) *by = ymin; *ty = ymax; - return(ptMin-ptsStart); + return ptMin-ptsStart; } diff --git a/mi/mipolygen.c b/mi/mipolygen.c index d975165da..7c7c593bf 100644 --- a/mi/mipolygen.c +++ b/mi/mipolygen.c @@ -90,16 +90,16 @@ miFillGeneralPoly( int fixWAET = 0; if (count < 3) - return(TRUE); + return TRUE; if(!(pETEs = malloc(sizeof(EdgeTableEntry) * count))) - return(FALSE); + return FALSE; ptsOut = FirstPoint; width = FirstWidth; if (!miCreateETandAET(count, ptsIn, &ET, &AET, pETEs, &SLLBlock)) { free(pETEs); - return(FALSE); + return FALSE; } pSLL = ET.scanlines.next; @@ -226,5 +226,5 @@ miFillGeneralPoly( (*pgc->ops->FillSpans)(dst, pgc, nPts, FirstPoint, FirstWidth, 1); free(pETEs); miFreeStorage(SLLBlock.next); - return(TRUE); + return TRUE; } diff --git a/mi/mipolyutil.c b/mi/mipolyutil.c index c4ce882b1..d978ee844 100644 --- a/mi/mipolyutil.c +++ b/mi/mipolyutil.c @@ -365,7 +365,7 @@ miInsertionSort(EdgeTableEntry *AET) changed = 1; } } - return(changed); + return changed; } /* diff --git a/mi/mivaltree.c b/mi/mivaltree.c index 7e0c22ac0..0e00c2fb5 100644 --- a/mi/mivaltree.c +++ b/mi/mivaltree.c @@ -809,5 +809,5 @@ miValidateTree ( RegionUninit(&exposed); if (pScreen->ClipNotify) (*pScreen->ClipNotify) (pParent, 0, 0); - return (1); + return 1; } diff --git a/mi/miwideline.c b/mi/miwideline.c index 5f3d58215..b11b40bd2 100644 --- a/mi/miwideline.c +++ b/mi/miwideline.c @@ -717,7 +717,7 @@ miLineArcI ( *--bwids = slw; } } - return (pGC->lineWidth); + return pGC->lineWidth; } #define CLIPSTEPEDGE(edgey,edge,edgeleft) \ @@ -911,7 +911,7 @@ miLineArcD ( *wids++ = xcr - xcl + 1; } } - return (pts - points); + return pts - points; } static int |