[PATCH] Kill unused/useless macros in panoramiX.h: BREAK_IF, IF_RETURN, FORCE_ROOT
Matt Turner
mattst88 at gmail.com
Mon Apr 26 16:03:35 PDT 2010
On Mon, Apr 26, 2010 at 6:37 PM, Jamey Sharp <jamey at minilop.net> wrote:
> This header doesn't seem to be used outside the server tree, so I don't
> think anything was depending on these except what I've fixed in this
> patch.
>
> FORCE_ROOT is not used anywhere, and never has been in all the history
> that's in git. ajax removed its FORCE_WIN and FORCE_CMAP companions
> three years ago, in 04b87d6dfae02e4ecdb5216d12c6cdafd1e8c2b4.
>
> BREAK_IF and IF_RETURN expanded to exactly the keywords in their names,
> which is silly. They were rarely used and served only to make callers
> inconsistent with the idioms used elsewhere in the server.
>
> Signed-off-by: Jamey Sharp <jamey at minilop.net>
> ---
> Xext/panoramiX.c | 3 ++-
> Xext/panoramiX.h | 13 -------------
> Xext/panoramiXprocs.c | 2 +-
> Xext/shape.c | 6 +++---
> 4 files changed, 6 insertions(+), 18 deletions(-)
>
> diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
> index 96eb8f9..d5965c2 100644
> --- a/Xext/panoramiX.c
> +++ b/Xext/panoramiX.c
> @@ -476,7 +476,8 @@ void PanoramiXExtensionInit(int argc, char *argv[])
> panoramiXdataPtr = (PanoramiXData *)
> xcalloc(PanoramiXNumScreens, sizeof(PanoramiXData));
>
> - BREAK_IF(!panoramiXdataPtr);
> + if (!panoramiXdataPtr)
> + break;
>
> if (!dixRequestPrivate(PanoramiXGCKey, sizeof(PanoramiXGCRec))) {
> noPanoramiXExtension = TRUE;
> diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h
> index 463a994..35de179 100644
> --- a/Xext/panoramiX.h
> +++ b/Xext/panoramiX.h
> @@ -80,19 +80,6 @@ typedef struct {
> #define FOR_NSCREENS_BACKWARD(j) for(j = PanoramiXNumScreens - 1; j >= 0; j--)
> #define FOR_NSCREENS(j) FOR_NSCREENS_FORWARD(j)
>
> -#define BREAK_IF(a) if ((a)) break
> -#define IF_RETURN(a,b) if ((a)) return (b)
> -
> -#define FORCE_ROOT(a) { \
> - int _j; \
> - for (_j = PanoramiXNumScreens - 1; _j; _j--) \
> - if ((a).root == WindowTable[_j]->drawable.id) \
> - break; \
> - (a).rootX += panoramiXdataPtr[_j].x; \
> - (a).rootY += panoramiXdataPtr[_j].y; \
> - (a).root = WindowTable[0]->drawable.id; \
> -}
> -
> #define IS_SHARED_PIXMAP(r) (((r)->type == XRT_PIXMAP) && (r)->u.pix.shared)
>
> #endif /* _PANORAMIX_H_ */
> diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
> index 6834efb..6635db9 100644
> --- a/Xext/panoramiXprocs.c
> +++ b/Xext/panoramiXprocs.c
> @@ -1728,7 +1728,7 @@ int PanoramiXPolyFillArc(ClientPtr client)
> isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
>
> narcs = (client->req_len << 2) - sizeof(xPolyFillArcReq);
> - IF_RETURN((narcs % sizeof(xArc)), BadLength);
> + if (narcs % sizeof(xArc)) return BadLength;
> narcs /= sizeof(xArc);
> if (narcs > 0) {
> origArcs = xalloc(narcs * sizeof(xArc));
> diff --git a/Xext/shape.c b/Xext/shape.c
> index cb4126b..58b5c23 100644
> --- a/Xext/shape.c
> +++ b/Xext/shape.c
> @@ -365,7 +365,7 @@ ProcPanoramiXShapeRectangles(
> FOR_NSCREENS(j) {
> stuff->dest = win->info[j].id;
> result = ProcShapeRectangles (client);
> - BREAK_IF(result != Success);
> + if (result != Success) break;
> }
> return (result);
> }
> @@ -474,7 +474,7 @@ ProcPanoramiXShapeMask(
> if(pmap)
> stuff->src = pmap->info[j].id;
> result = ProcShapeMask (client);
> - BREAK_IF(result != Success);
> + if (result != Success) break;
> }
> return (result);
> }
> @@ -600,7 +600,7 @@ ProcPanoramiXShapeCombine(
> stuff->dest = win->info[j].id;
> stuff->src = win2->info[j].id;
> result = ProcShapeCombine (client);
> - BREAK_IF(result != Success);
> + if (result != Success) break;
> }
> return (result);
> }
> --
> 1.7.0
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
More information about the xorg-devel
mailing list