diff options
| author | Owain G. Ainsworth <oga@openbsd.org> | 2010-07-18 16:01:48 +0100 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2010-07-18 16:01:48 +0100 |
| commit | 9290ad77c5eef438ba02fc26334fd85ab3caa009 (patch) | |
| tree | a2ac0f1be6786545821e7aa75ecbf4bbc332a1f4 /src/i830_quirks.c | |
| parent | 09c5b49b691132d0085c29b74decb45e0d4215e9 (diff) | |
| parent | b2f4de3b7fb73bd51b1fd1b2b044862839c9a6ea (diff) | |
Merge branch 'bleeding_edge-oga' into 2.9.1-oga
Conflicts:
src/i830_display.c
This has now been commited to cvs, so the branch gets pulled.
Diffstat (limited to 'src/i830_quirks.c')
| -rw-r--r-- | src/i830_quirks.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/i830_quirks.c b/src/i830_quirks.c index 1d9b681c..28585693 100644 --- a/src/i830_quirks.c +++ b/src/i830_quirks.c @@ -73,7 +73,7 @@ static void i830_dmi_store_##field(void) \ int ret;\ f = fopen(DMIID_FILE(field), "r");\ if (f == NULL) {\ - xfree(i830_dmi_data[field]); i830_dmi_data[field] = NULL;\ + free(i830_dmi_data[field]); i830_dmi_data[field] = NULL;\ return;\ }\ ret = fread(i830_dmi_data[field], 64, 1, f); \ @@ -104,11 +104,11 @@ static void i830_dmi_scan(void) int i; for (i = 0; i < dmi_data_max; i++) { - i830_dmi_data[i] = xcalloc(64, sizeof(char)); + i830_dmi_data[i] = calloc(64, sizeof(char)); if (!i830_dmi_data[i]) { int j; for (j = 0; j < i; j++) { - xfree(i830_dmi_data[j]); + free(i830_dmi_data[j]); i830_dmi_data[i] = NULL; } return; @@ -426,5 +426,5 @@ void i830_fixup_devices(ScrnInfoPtr scrn) for (i = 0; i < dmi_data_max; i++) if (i830_dmi_data[i]) - xfree(i830_dmi_data[i]); + free(i830_dmi_data[i]); } |