From 5a8e2f2745ae1f74501cd3f42614a1ed2cf974f2 Mon Sep 17 00:00:00 2001 From: Mikhail Gusarov Date: Wed, 12 May 2010 18:54:51 +0000 Subject: [PATCH] Do not jump through the hoops to deallocate xkbbasedirflag variable Fixes gcc warning as well. Signed-off-by: Mikhail Gusarov Reviewed-by: Jamey Sharp Reviewed-by: Matt Turner --- xkb/ddxLoad.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c index a9b5ca984c..b1d6294365 100644 --- a/xkb/ddxLoad.c +++ b/xkb/ddxLoad.c @@ -186,7 +186,7 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb, char *buf = NULL, keymap[PATH_MAX], xkm_output_dir[PATH_MAX]; const char *emptystring = ""; - const char *xkbbasedirflag = emptystring; + char *xkbbasedirflag = NULL; const char *xkbbindir = emptystring; const char *xkbbindirsep = emptystring; @@ -230,13 +230,11 @@ XkbDDXCompileKeymapByNames( XkbDescPtr xkb, xkbbindir, xkbbindirsep, ( (xkbDebugFlags < 2) ? 1 : ((xkbDebugFlags > 10) ? 10 : (int)xkbDebugFlags) ), - xkbbasedirflag, xkmfile, + xkbbasedirflag ? xkbbasedirflag : "", xkmfile, PRE_ERROR_MSG, ERROR_PREFIX, POST_ERROR_MSG1, xkm_output_dir, keymap); - if (xkbbasedirflag != emptystring) { - free(xkbbasedirflag); - } + free(xkbbasedirflag); #ifndef WIN32 out= Popen(buf,"w");