diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-07 12:45:50 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-07 12:47:05 -0700 |
| commit | dc6d77656d14853b462a8792007e73c5dc07a4b1 (patch) | |
| tree | a68ee340e15b567af4494f586e62c7f98345d377 | |
| parent | 3dc05f643235e78c2b9148c052a6bc45290fb34a (diff) | |
Also use calloc rather than xcalloc
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | src/sisusb_driver.c | 2 | ||||
| -rw-r--r-- | src/sisusb_utility.c | 2 | ||||
| -rw-r--r-- | src/sisusb_video.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c index cb6bff5..4531e1a 100644 --- a/src/sisusb_driver.c +++ b/src/sisusb_driver.c @@ -1147,7 +1147,7 @@ SISUSBPreInit(ScrnInfoPtr pScrn, int flags) #endif if(pSiSUSB->HWCursor) { - if(!(pSiSUSB->USBCursorBuf = xcalloc(pSiSUSB->CursorSize * 4, 1))) pSiSUSB->HWCursor = FALSE; + if(!(pSiSUSB->USBCursorBuf = calloc(pSiSUSB->CursorSize * 4, 1))) pSiSUSB->HWCursor = FALSE; pSiSUSB->availMem -= (pSiSUSB->CursorSize * 2); if(pSiSUSB->OptUseColorCursor) pSiSUSB->availMem -= (pSiSUSB->CursorSize * 2); diff --git a/src/sisusb_utility.c b/src/sisusb_utility.c index 3c1bff4..282f372 100644 --- a/src/sisusb_utility.c +++ b/src/sisusb_utility.c @@ -926,7 +926,7 @@ SiSUSBCtrlExtInit(ScrnInfoPtr pScrn) if(!(myext = CheckExtension(SISCTRL_PROTOCOL_NAME))) { - if(!(myctrl = xcalloc(sizeof(xSiSCtrlScreenTable), 1))) + if(!(myctrl = calloc(sizeof(xSiSCtrlScreenTable), 1))) return; if(!(myext = AddExtension(SISCTRL_PROTOCOL_NAME, 0, 0, diff --git a/src/sisusb_video.c b/src/sisusb_video.c index 88db5b3..1dbf4f1 100644 --- a/src/sisusb_video.c +++ b/src/sisusb_video.c @@ -377,7 +377,7 @@ SISUSBSetupImageVideo(ScreenPtr pScreen) XF86VideoAdaptorPtr adapt; SISUSBPortPrivPtr pPriv; - if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) + + if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) + sizeof(SISUSBPortPrivRec) + sizeof(DevUnion)))) return NULL; |