diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 21:46:33 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-03 21:46:33 +0100 |
commit | 96e2556031c8aff62a4650b9cfb814991f5240e1 (patch) | |
tree | 78bbb0c52085036b2a3ff82b29f242173bf39eda /nx-X11/programs/Xserver/Xext/xf86bigfont.c | |
parent | 89ccf26d65a3f205e54d9f6240b672f970e7b9c1 (diff) | |
parent | 09ef99919c010801bd4220d482a867035b6f4f25 (diff) | |
download | nx-libs-96e2556031c8aff62a4650b9cfb814991f5240e1.tar.gz nx-libs-96e2556031c8aff62a4650b9cfb814991f5240e1.tar.bz2 nx-libs-96e2556031c8aff62a4650b9cfb814991f5240e1.zip |
Merge branch 'uli42-pr/remove_allocate_local' into 3.6.x
Attribute GH PR #369: https://github.com/ArcticaProject/nx-libs/pull/369
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/xf86bigfont.c')
-rw-r--r-- | nx-X11/programs/Xserver/Xext/xf86bigfont.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/Xext/xf86bigfont.c b/nx-X11/programs/Xserver/Xext/xf86bigfont.c index 9530a9d7f..64b65900e 100644 --- a/nx-X11/programs/Xserver/Xext/xf86bigfont.c +++ b/nx-X11/programs/Xserver/Xext/xf86bigfont.c @@ -66,7 +66,6 @@ #include <nx-X11/X.h> #include <nx-X11/Xproto.h> #include "misc.h" -#include "os.h" #include "dixstruct.h" #include "gcstruct.h" #include "dixfontstr.h" @@ -491,7 +490,7 @@ ProcXF86BigfontQueryFont( } else { #endif pCI = (xCharInfo *) - ALLOCATE_LOCAL(nCharInfos * sizeof(xCharInfo)); + malloc(nCharInfos * sizeof(xCharInfo)); if (!pCI) return BadAlloc; #ifdef HAS_SHM @@ -554,9 +553,9 @@ ProcXF86BigfontQueryFont( hashModulus = nCharInfos+1; tmp = (CARD16*) - ALLOCATE_LOCAL((4*nCharInfos+1) * sizeof(CARD16)); + malloc((4*nCharInfos+1) * sizeof(CARD16)); if (!tmp) { - if (!pDesc) DEALLOCATE_LOCAL(pCI); + if (!pDesc) free(pCI); return BadAlloc; } pIndex2UniqIndex = tmp; @@ -643,8 +642,8 @@ ProcXF86BigfontQueryFont( char* p; if (!reply) { if (nCharInfos > 0) { - if (shmid == -1) DEALLOCATE_LOCAL(pIndex2UniqIndex); - if (!pDesc) DEALLOCATE_LOCAL(pCI); + if (shmid == -1) free(pIndex2UniqIndex); + if (!pDesc) free(pCI); } return BadAlloc; } @@ -721,8 +720,8 @@ ProcXF86BigfontQueryFont( WriteToClient(client, rlength, reply); free(reply); if (nCharInfos > 0) { - if (shmid == -1) DEALLOCATE_LOCAL(pIndex2UniqIndex); - if (!pDesc) DEALLOCATE_LOCAL(pCI); + if (shmid == -1) free(pIndex2UniqIndex); + if (!pDesc) free(pCI); } return (client->noClientException); } |