summaryrefslogtreecommitdiff
path: root/hw/xfree86/int10
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xfree86/int10')
-rw-r--r--hw/xfree86/int10/generic.c22
-rw-r--r--hw/xfree86/int10/helper_exec.c2
-rw-r--r--hw/xfree86/int10/helper_mem.c6
3 files changed, 15 insertions, 15 deletions
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index 9d39e99b0..fe8bb69ac 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -137,7 +137,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
options = xf86HandleInt10Options(xf86Screens[screen],entityIndex);
if (int10skip(options)) {
- xfree(options);
+ free(options);
return NULL;
}
@@ -285,17 +285,17 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
xf86ExecX86int10(pInt);
UnlockLegacyVGA(pInt, &vga);
#endif
- xfree(options);
+ free(options);
return pInt;
error1:
- xfree(base);
+ free(base);
UnmapVRam(pInt);
- xfree(INTPriv(pInt)->alloc);
- xfree(pInt->private);
+ free(INTPriv(pInt)->alloc);
+ free(pInt->private);
error0:
- xfree(pInt);
- xfree(options);
+ free(pInt);
+ free(options);
return NULL;
}
@@ -339,11 +339,11 @@ xf86FreeInt10(xf86Int10InfoPtr pInt)
#endif
if (Int10Current == pInt)
Int10Current = NULL;
- xfree(INTPriv(pInt)->base);
+ free(INTPriv(pInt)->base);
UnmapVRam(pInt);
- xfree(INTPriv(pInt)->alloc);
- xfree(pInt->private);
- xfree(pInt);
+ free(INTPriv(pInt)->alloc);
+ free(pInt->private);
+ free(pInt);
}
void *
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c
index 6ba647f89..8f47afe2b 100644
--- a/hw/xfree86/int10/helper_exec.c
+++ b/hw/xfree86/int10/helper_exec.c
@@ -711,7 +711,7 @@ xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save)
if (pInt->BIOSScratch) {
for (i = 0; i < BIOS_SCRATCH_LEN; i++)
*(base + i) = *(pInt->BIOSScratch + i);
- xfree(pInt->BIOSScratch);
+ free(pInt->BIOSScratch);
pInt->BIOSScratch = NULL;
}
}
diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c
index 6f6ecc2b3..3f206c2e3 100644
--- a/hw/xfree86/int10/helper_mem.c
+++ b/hw/xfree86/int10/helper_mem.c
@@ -208,14 +208,14 @@ xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex)
configOptions = pEnt->device->options;
if (configOptions) {
- if (!(options = (OptionInfoPtr) xalloc(sizeof(INT10Options))))
+ if (!(options = (OptionInfoPtr) malloc(sizeof(INT10Options))))
return NULL;
(void)memcpy(options, INT10Options, sizeof(INT10Options));
xf86ProcessOptions(pScrn->scrnIndex, configOptions, options);
}
}
- xfree(pEnt);
+ free(pEnt);
return options;
}
@@ -276,7 +276,7 @@ xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt)
EntityInfoPtr pEnt = xf86GetEntityInfo(pInt->entityIndex);
location_type = pEnt->location.type;
- xfree(pEnt);
+ free(pEnt);
return location_type;
}