From 726d467b534a30d8cbaafb858339c638c9f83195 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 25 Jun 2012 11:51:26 +0100 Subject: [PATCH] xf86: cleanup helper code to use a pointer. (v1.1) This is in preparation for gpu screens in here, just use a pScrn pointer to point at the new screen. suggested by Keith. v1.1: fix spacing as suggested by Aaron. Reviewed-by: Keith Packard Reviewed-by: Aaron Plattner Signed-off-by: Dave Airlie --- hw/xfree86/common/xf86Helper.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 5ef1dabfb..18f30b7c4 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -167,6 +167,7 @@ ScrnInfoPtr xf86AllocateScreen(DriverPtr drv, int flags) { int i; + ScrnInfoPtr pScrn; if (xf86Screens == NULL) xf86NumScreens = 0; @@ -174,22 +175,22 @@ xf86AllocateScreen(DriverPtr drv, int flags) i = xf86NumScreens++; xf86Screens = xnfrealloc(xf86Screens, xf86NumScreens * sizeof(ScrnInfoPtr)); xf86Screens[i] = xnfcalloc(sizeof(ScrnInfoRec), 1); - xf86Screens[i]->scrnIndex = i; /* Changes when a screen is removed */ - xf86Screens[i]->origIndex = i; /* This never changes */ - xf86Screens[i]->privates = xnfcalloc(sizeof(DevUnion), - xf86ScrnInfoPrivateCount); + pScrn = xf86Screens[i]; + pScrn->scrnIndex = i; /* Changes when a screen is removed */ + pScrn->origIndex = i; /* This never changes */ + pScrn->privates = xnfcalloc(sizeof(DevUnion), xf86ScrnInfoPrivateCount); /* * EnableDisableFBAccess now gets initialized in InitOutput() - * xf86Screens[i]->EnableDisableFBAccess = xf86EnableDisableFBAccess; + * pScrn->EnableDisableFBAccess = xf86EnableDisableFBAccess; */ - xf86Screens[i]->drv = drv; + pScrn->drv = drv; drv->refCount++; - xf86Screens[i]->module = DuplicateModule(drv->module, NULL); + pScrn->module = DuplicateModule(drv->module, NULL); - xf86Screens[i]->DriverFunc = drv->driverFunc; + pScrn->DriverFunc = drv->driverFunc; - return xf86Screens[i]; + return pScrn; } /*