XLibre/xf86-video-xgi
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-xgi.git synced 2026-03-24 01:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

s/\<alloc\>/malloc/g

Browse Source 
ac3d39b1 apparently thought that just chopping off the initial 'x' was
okay.  Nope!

Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson
2011-08-05 11:19:45 -04:00
parent 28c9a066e2
commit 6bf14b432c
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/xgi_driver.c
View File

@@ -1048,10 +1048,10 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
ErrorF("XGICopyModeNLink()...Use Virtual Size-1\n");
if (!((mode = alloc(sizeof(DisplayModeRec)))))
if (!((mode = malloc(sizeof(DisplayModeRec)))))
return dest;
memcpy(mode, i, sizeof(DisplayModeRec));
if (!((mode->Private = alloc(sizeof(XGIMergedDisplayModeRec))))) {
if (!((mode->Private = malloc(sizeof(XGIMergedDisplayModeRec))))) {
free(mode);
return dest;
}
@@ -2442,7 +2442,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
#ifdef XGIMERGED
if (pXGI->MergedFB) {
pXGI->CRT2pScrn->monitor = alloc(sizeof(MonRec));
pXGI->CRT2pScrn->monitor = malloc(sizeof(MonRec));
if (pXGI->CRT2pScrn->monitor) {
DisplayModePtr tempm = NULL, currentm = NULL, newm = NULL;
memcpy(pXGI->CRT2pScrn->monitor, pScrn->monitor, sizeof(MonRec));
@@ -2450,10 +2450,10 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
pXGI->CRT2pScrn->monitor->Modes = NULL;
tempm = pScrn->monitor->Modes;
while (tempm) {
if (!(newm = alloc(sizeof(DisplayModeRec))))
if (!(newm = malloc(sizeof(DisplayModeRec))))
break;
memcpy(newm, tempm, sizeof(DisplayModeRec));
if (!(newm->name = alloc(strlen(tempm->name) + 1))) {
if (!(newm->name = malloc(strlen(tempm->name) + 1))) {
free(newm);
break;
}
@@ -3544,7 +3544,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
/* Do some MergedFB mode initialisation */
#ifdef XGIMERGED
if (pXGI->MergedFB) {
pXGI->CRT2pScrn = alloc(sizeof(ScrnInfoRec));
pXGI->CRT2pScrn = malloc(sizeof(ScrnInfoRec));
if (!pXGI->CRT2pScrn) {
XGIErrorLog(pScrn,
"Failed to allocate memory for 2nd pScrn, %s\n",
@@ -4905,7 +4905,7 @@ XGIScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
if (pXGI->ShadowFB) {
pXGI->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
pXGI->ShadowPtr = alloc(pXGI->ShadowPitch * height);
pXGI->ShadowPtr = malloc(pXGI->ShadowPitch * height);
displayWidth = pXGI->ShadowPitch / (pScrn->bitsPerPixel >> 3);
FBStart = pXGI->ShadowPtr;
}

2
src/xgi_opt.c
View File

@@ -195,7 +195,7 @@ xgiOptions(ScrnInfoPtr pScrn)
xf86CollectOptions(pScrn, NULL);
/* Process the options */
if(!(pXGI->Options = alloc(sizeof(XGIOptions)))) return;
if(!(pXGI->Options = malloc(sizeof(XGIOptions)))) return;
memcpy(pXGI->Options, XGIOptions, sizeof(XGIOptions));

2
src/xgi_video.c
View File

@@ -142,7 +142,7 @@ void XGIInitVideo(ScreenPtr pScreen)
adaptors = &newAdaptor;
} else {
newAdaptors = /* need to free this someplace */
alloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
if(newAdaptors) {
memcpy(newAdaptors, adaptors, num_adaptors *
sizeof(XF86VideoAdaptorPtr));