diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 14:11:38 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 14:11:38 +0200 |
| commit | 1dbd3c888a3eee51db5303bd93e95b84999f5d31 (patch) | |
| tree | 84db92271726b42b8c0864c8b7c77b2330566fc1 /nx-X11/programs/Xserver/xkb/ddxLoad.c | |
| parent | 279d37127db241a9ee685f6b671f51aa21a972ea (diff) | |
| parent | e85808245810d0cc6918104deef25213d5f9e06c (diff) | |
| download | nx-libs-1dbd3c888a3eee51db5303bd93e95b84999f5d31.tar.gz nx-libs-1dbd3c888a3eee51db5303bd93e95b84999f5d31.tar.bz2 nx-libs-1dbd3c888a3eee51db5303bd93e95b84999f5d31.zip | |
Merge branch 'sunweaver-pr/backport-Xorg-memory-handling' into 3.6.x
Attributes GH PR #159: https://github.com/ArcticaProject/nx-libs/pull/159
Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 12:47:46 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/ddxLoad.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/ddxLoad.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/xkb/ddxLoad.c b/nx-X11/programs/Xserver/xkb/ddxLoad.c index b3ef60f22..9134e4754 100644 --- a/nx-X11/programs/Xserver/xkb/ddxLoad.c +++ b/nx-X11/programs/Xserver/xkb/ddxLoad.c @@ -151,7 +151,7 @@ Win32System(const char *cmdline) LocalFree(buffer); } - xfree(cmd); + free(cmd); return -1; } /* Wait until child process exits. */ @@ -162,7 +162,7 @@ Win32System(const char *cmdline) /* Close process and thread handles. */ CloseHandle( pi.hProcess ); CloseHandle( pi.hThread ); - xfree(cmd); + free(cmd); return dwExitCode; } @@ -620,7 +620,7 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile; if (outFile!=NULL) _XkbFree(outFile); if (cmd!=NULL) - xfree(cmd); + free(cmd); return True; } #ifdef DEBUG @@ -629,7 +629,7 @@ char *cmd = NULL,file[PATH_MAX],xkm_output_dir[PATH_MAX],*map,*outFile; if (outFile!=NULL) _XkbFree(outFile); if (cmd!=NULL) - xfree(cmd); + free(cmd); return False; } @@ -802,7 +802,7 @@ char tmpname[PATH_MAX]; } #endif if (buf != NULL) - xfree (buf); + free (buf); return True; } #ifdef DEBUG @@ -826,7 +826,7 @@ char tmpname[PATH_MAX]; if (nameRtrn) nameRtrn[0]= '\0'; if (buf != NULL) - xfree (buf); + free (buf); return False; } |