diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-26 01:38:22 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 14:05:30 +0200 |
| commit | acf87144d019f18e646501657d9082c6eba77f54 (patch) | |
| tree | dadb838cd54010836230358a4a5805bb0696b5bb /nx-X11/programs/Xserver/dix/extension.c | |
| parent | 279d37127db241a9ee685f6b671f51aa21a972ea (diff) | |
| download | nx-libs-acf87144d019f18e646501657d9082c6eba77f54.tar.gz nx-libs-acf87144d019f18e646501657d9082c6eba77f54.tar.bz2 nx-libs-acf87144d019f18e646501657d9082c6eba77f54.zip | |
nx-X11/programs/Xserver: Drop {X,x}free() macros, use free() instead.
Fixes ArcticaProject/nx-libs#105
Diffstat (limited to 'nx-X11/programs/Xserver/dix/extension.c')
| -rw-r--r-- | nx-X11/programs/Xserver/dix/extension.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/nx-X11/programs/Xserver/dix/extension.c b/nx-X11/programs/Xserver/dix/extension.c index fe51f8916..4f06c0af4 100644 --- a/nx-X11/programs/Xserver/dix/extension.c +++ b/nx-X11/programs/Xserver/dix/extension.c @@ -103,7 +103,7 @@ AddExtension(char *name, int NumEvents, int NumErrors, ext->aliases = (char **)NULL; if (!ext->name) { - xfree(ext); + free(ext); return((ExtensionEntry *) NULL); } strcpy(ext->name, name); @@ -112,8 +112,8 @@ AddExtension(char *name, int NumEvents, int NumErrors, (i + 1) * sizeof(ExtensionEntry *)); if (!newexts) { - xfree(ext->name); - xfree(ext); + free(ext->name); + free(ext); return((ExtensionEntry *) NULL); } NumExtensions++; @@ -263,13 +263,13 @@ CloseDownExtensions() if (extensions[i]->CloseDown) (* extensions[i]->CloseDown)(extensions[i]); NumExtensions = i; - xfree(extensions[i]->name); + free(extensions[i]->name); for (j = extensions[i]->num_aliases; --j >= 0;) - xfree(extensions[i]->aliases[j]); - xfree(extensions[i]->aliases); - xfree(extensions[i]); + free(extensions[i]->aliases[j]); + free(extensions[i]->aliases); + free(extensions[i]); } - xfree(extensions); + free(extensions); extensions = (ExtensionEntry **)NULL; lastEvent = EXTENSION_EVENT_BASE; lastError = FirstExtensionError; @@ -280,9 +280,9 @@ CloseDownExtensions() while (spentry->num) { spentry->num--; - xfree(spentry->procList[spentry->num].name); + free(spentry->procList[spentry->num].name); } - xfree(spentry->procList); + free(spentry->procList); spentry->procList = (ProcEntryPtr)NULL; } } @@ -446,7 +446,7 @@ RegisterScreenProc(char *name, ScreenPtr pScreen, ExtensionLookupProc proc) sizeof(ProcEntryRec) * (spentry->num+1)); if (!procEntry) { - xfree(newname); + free(newname); return FALSE; } spentry->procList = procEntry; |