diff options
| -rw-r--r-- | src/savage_dri.c | 4 | ||||
| -rw-r--r-- | src/savage_driver.c | 6 | ||||
| -rw-r--r-- | src/savage_vbe.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/savage_dri.c b/src/savage_dri.c index 6b58301..0a6590a 100644 --- a/src/savage_dri.c +++ b/src/savage_dri.c @@ -648,7 +648,7 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScreen ) pDRIInfo->SAREASize = SAREA_MAX; - pSAVAGEDRI = (SAVAGEDRIPtr)calloc( sizeof(SAVAGEDRIRec), 1 ); + pSAVAGEDRI = (SAVAGEDRIPtr)calloc( 1, sizeof(SAVAGEDRIRec) ); if ( !pSAVAGEDRI ) { DRIDestroyInfoRec( psav->pDRIInfo ); psav->pDRIInfo = 0; @@ -658,7 +658,7 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScreen ) } pSAVAGEDRIServer = (SAVAGEDRIServerPrivatePtr) - calloc( sizeof(SAVAGEDRIServerPrivateRec), 1 ); + calloc( 1, sizeof(SAVAGEDRIServerPrivateRec) ); if ( !pSAVAGEDRIServer ) { free( pSAVAGEDRI ); DRIDestroyInfoRec( psav->pDRIInfo ); diff --git a/src/savage_driver.c b/src/savage_driver.c index bd26a8d..0621c99 100644 --- a/src/savage_driver.c +++ b/src/savage_driver.c @@ -635,7 +635,7 @@ static Bool SavageGetRec(ScrnInfoPtr pScrn) if (pScrn->driverPrivate) return TRUE; - pScrn->driverPrivate = XNFcallocarray(sizeof(SavageRec), 1); + pScrn->driverPrivate = XNFcallocarray(1, sizeof(SavageRec)); return TRUE; } @@ -726,7 +726,7 @@ static Bool SavagePciProbe(DriverPtr drv, int entity_num, for (j = 0; j < instance; j++) xf86SetEntityInstanceForScreen(pScrn, pEnt->index, j); - pPriv->ptr = XNFcallocarray(sizeof(SavageEntRec), 1); + pPriv->ptr = XNFcallocarray(1, sizeof(SavageEntRec)); pSavageEnt = pPriv->ptr; pSavageEnt->HasSecondary = FALSE; } else { @@ -836,7 +836,7 @@ static Bool SavageProbe(DriverPtr drv, int flags) for (j = 0; j < instance; j++) xf86SetEntityInstanceForScreen(pScrn, pEnt->index, j); - pPriv->ptr = XNFcallocarray(sizeof(SavageEntRec), 1); + pPriv->ptr = XNFcallocarray(1, sizeof(SavageEntRec)); pSavageEnt = pPriv->ptr; pSavageEnt->HasSecondary = FALSE; } else { diff --git a/src/savage_vbe.c b/src/savage_vbe.c index 7dba538..0859c46 100644 --- a/src/savage_vbe.c +++ b/src/savage_vbe.c @@ -360,8 +360,8 @@ SavageGetBIOSModes( { s3vModeTable->RefreshRate = (unsigned char *) calloc( - sizeof(unsigned char), - (iRefresh+8) + (iRefresh+8), + sizeof(unsigned char) ); } } |