Dave Airlie <[email protected]> writes:
> -int
> -AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,
> - int /*argc */ ,
> - char ** /*argv */
> - ), int argc, char **argv)
> +static int init_screen(ScreenPtr pScreen, int i)
> {
> -
> - int i;
> int scanlinepad, format, depth, bitsPerPixel, j, k;
> - ScreenPtr pScreen;
> -
> - i = screenInfo.numScreens;
> - if (i == MAXSCREENS)
> - return -1;
> -
> - pScreen = (ScreenPtr) calloc(1, sizeof(ScreenRec));
> - if (!pScreen)
> - return -1;
>
> if (!dixAllocatePrivates(&pScreen->devPrivates, PRIVATE_SCREEN)) {
> - free(pScreen);
> return -1;
> }
> pScreen->myNum = i;
> @@ -3782,7 +3766,33 @@ AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,
> PixmapWidthPaddingInfo[depth].notPower2 = 0;
> }
> }
> + return 0;
> +}
This part seems fine.
> +
> +int
> +AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,
> + int /*argc */ ,
> + char ** /*argv */
> + ), int argc, char **argv)
> +{
>
> + int i;
> + ScreenPtr pScreen;
> + Bool ret;
> +
> + i = screenInfo.numScreens;
> + if (i == MAXSCREENS)
> + return -1;
> +
> + pScreen = (ScreenPtr) calloc(1, sizeof(ScreenRec));
> + if (!pScreen)
> + return -1;
> +
> + ret = init_screen(pScreen, i);
> + if (ret) {
> + free(pScreen);
> + return ret;
> + }
init_screen returns int, not Bool
--
[email protected]
pgpGT6EUWRAVz.pgp
Description: PGP signature
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
