bit of code polish

1 files changed, 8 insertions, 20 deletions

diff --git a/libxklavier/xklavier_config_xkb.c b/libxklavier/xklavier_config_xkb.c
index a2efa9d..03ae80a 100644
--- a/libxklavier/xklavier_config_xkb.c
+++ b/libxklavier/xklavier_config_xkb.c
@@ -148,26 +148,14 @@ static void _XklConfigCleanAfterKbd(  )
 #ifdef XKB_HEADERS_PRESENT
   _XklFreeRulesSet();
 
-  if( locale != NULL )
-  {
-    free( locale );
-    locale = NULL;
-  }
-  if( _xklVarDefs.layout != NULL )
-  {
-    free( _xklVarDefs.layout );
-    _xklVarDefs.layout = NULL;
-  }
-  if( _xklVarDefs.variant != NULL )
-  {
-    free( _xklVarDefs.variant );
-    _xklVarDefs.variant = NULL;
-  }
-  if( _xklVarDefs.options != NULL )
-  {
-    free( _xklVarDefs.options );
-    _xklVarDefs.options = NULL;
-  }
+  free( locale );
+  locale = NULL;
+
+  free( _xklVarDefs.layout );
+  free( _xklVarDefs.variant );
+  free( _xklVarDefs.options );
+  memset( &_xklVarDefs, 0, sizeof( _xklVarDefs ) );
+
   free(componentNames.keymap);
   free(componentNames.keycodes);
   free(componentNames.compat);