frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not jump through the hoops to deallocate xkbbasedirflag variable 

Fixes gcc warning as well.

Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Mikhail Gusarov 2010-05-12 18:54:51 +00:00
parent ff2b4cf832
commit 5a8e2f2745
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xkb/ddxLoad.c
View File

@ -186,7 +186,7 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
char *buf = NULL, keymap[PATH_MAX], xkm_output_dir[PATH_MAX]; char *buf = NULL, keymap[PATH_MAX], xkm_output_dir[PATH_MAX];
const char *emptystring = ""; const char *emptystring = "";
const char *xkbbasedirflag = emptystring; char *xkbbasedirflag = NULL;
const char *xkbbindir = emptystring; const char *xkbbindir = emptystring;
const char *xkbbindirsep = emptystring; const char *xkbbindirsep = emptystring;
@ -230,13 +230,11 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb,
xkbbindir, xkbbindirsep, xkbbindir, xkbbindirsep,
( (xkbDebugFlags < 2) ? 1 : ( (xkbDebugFlags < 2) ? 1 :
((xkbDebugFlags > 10) ? 10 : (int)xkbDebugFlags) ), ((xkbDebugFlags > 10) ? 10 : (int)xkbDebugFlags) ),
xkbbasedirflag, xkmfile, xkbbasedirflag ? xkbbasedirflag : "", xkmfile,
PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1, PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1,
xkm_output_dir, keymap); xkm_output_dir, keymap);
if (xkbbasedirflag != emptystring) { free(xkbbasedirflag);
free(xkbbasedirflag);
}
#ifndef WIN32 #ifndef WIN32
out= Popen(buf,"w"); out= Popen(buf,"w");