[PATCH 3/9] XineramaInitData ignores its argument. Quit passing one.

[Alan Coopersmith]

On 09/17/11 01:22, Jamey Sharp wrote:
> Also fix up XineramaInitData's caller, XineramaReinitData.
>
> Commit by Jamey Sharp and Josh Triplett.
>
> Signed-off-by: Jamey Sharp<jamey at minilop.net>
> Signed-off-by: Josh Triplett<josh at joshtriplett.org>
> ---
>   Xext/panoramiX.c      |   12 ++++++------
>   Xext/panoramiXsrv.h   |    2 +-
>   hw/dmx/dmxextension.c |    2 +-
>   3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
> index 00afe94..425c10c 100644
> --- a/Xext/panoramiX.c
> +++ b/Xext/panoramiX.c
> @@ -388,7 +388,7 @@ XineramaRegisterConnectionBlockCallback(void (*func)(void))
>       return TRUE;
>   }
>
> -static void XineramaInitData(ScreenPtr pScreen)
> +static void XineramaInitData(void)
>   {
>       int i, w, h;
>
> @@ -397,7 +397,7 @@ static void XineramaInitData(ScreenPtr pScreen)
>   	BoxRec TheBox;
>   	RegionRec ScreenRegion;
>
> -        pScreen = screenInfo.screens[i];
> +	ScreenPtr pScreen = screenInfo.screens[i];
>
>   	TheBox.x1 = pScreen->x;
>   	TheBox.x2 = TheBox.x1 + pScreen->width;
> @@ -414,7 +414,7 @@ static void XineramaInitData(ScreenPtr pScreen)
>       PanoramiXPixHeight = screenInfo.screens[0]->y + screenInfo.screens[0]->height;
>
>       FOR_NSCREENS_FORWARD_SKIP(i) {
> -	pScreen = screenInfo.screens[i];
> +	ScreenPtr pScreen = screenInfo.screens[i];
>   	w = pScreen->x + pScreen->width;
>   	h = pScreen->y + pScreen->height;
>
> @@ -425,10 +425,10 @@ static void XineramaInitData(ScreenPtr pScreen)
>       }
>   }
>
> -void XineramaReinitData(ScreenPtr pScreen)
> +void XineramaReinitData(void)
>   {
>       RegionUninit(&PanoramiXScreenRegion);
> -    XineramaInitData(pScreen);
> +    XineramaInitData();
>   }
>
>   /*
> @@ -525,7 +525,7 @@ void PanoramiXExtensionInit(int argc, char *argv[])
>   	return;
>       }
>
> -    XineramaInitData(pScreen);
> +    XineramaInitData();
>
>       /*
>        *	Put our processes into the ProcVector
> diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h
> index 6fc903b..39d4952 100644
> --- a/Xext/panoramiXsrv.h
> +++ b/Xext/panoramiXsrv.h
> @@ -19,7 +19,7 @@ extern _X_EXPORT PanoramiXRes * PanoramiXFindIDByScrnum(RESTYPE, XID, int);
>   extern _X_EXPORT Bool XineramaRegisterConnectionBlockCallback(void (*func)(void));
>   extern _X_EXPORT int XineramaDeleteResource(pointer, XID);
>
> -extern _X_EXPORT void XineramaReinitData(ScreenPtr);
> +extern _X_EXPORT void XineramaReinitData(void);
>
>   extern _X_EXPORT RESTYPE XRC_DRAWABLE;
>   extern _X_EXPORT RESTYPE XRT_WINDOW;
> diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c
> index db5709e..80d11ee 100644
> --- a/hw/dmx/dmxextension.c
> +++ b/hw/dmx/dmxextension.c
> @@ -455,7 +455,7 @@ static void dmxSetRootWindowOrigin(int idx, int x, int y)
>       pScreen->y = dmxScreen->rootYOrigin;
>
>       /* Recalculate the Xinerama regions and data structs */
> -    XineramaReinitData(pScreen);
> +    XineramaReinitData();
>
>       /* Adjust each of the root window's children */
>       if (!idx) ReinitializeRootWindow(screenInfo.screens[0]->root, xoff, yoff);

Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System