diff options
| author | walter harms <wharms@bfs.de> | 2014-06-07 15:17:27 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-19 21:40:29 +0200 |
| commit | a98260726b8f878e72223899e21ad87882389e2d (patch) | |
| tree | ecc8e90ab360d58bc785b86ec1f79a57165ac1b4 /nx-X11/lib/X11/lcPublic.c | |
| parent | 1ff6961231eda8929406b93fe3d70071cbba2469 (diff) | |
| download | nx-libs-a98260726b8f878e72223899e21ad87882389e2d.tar.gz nx-libs-a98260726b8f878e72223899e21ad87882389e2d.tar.bz2 nx-libs-a98260726b8f878e72223899e21ad87882389e2d.zip | |
libX11: rm redundante NULL checks
This patch removes the last remaining NULL checks for Xfree()
Signed-off-by: Harms <wharms@bfs,de>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11/lib/X11/lcPublic.c')
| -rw-r--r-- | nx-X11/lib/X11/lcPublic.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/nx-X11/lib/X11/lcPublic.c b/nx-X11/lib/X11/lcPublic.c index 39ec0829b..98a7435fd 100644 --- a/nx-X11/lib/X11/lcPublic.c +++ b/nx-X11/lib/X11/lcPublic.c @@ -254,16 +254,14 @@ static void destroy_core( XLCd lcd) { - if (lcd->core) { - if (lcd->core->name) + if (lcd) { + if (lcd->core) { Xfree(lcd->core->name); - Xfree(lcd->core); + Xfree(lcd->core); + } + Xfree(lcd->methods); + Xfree(lcd); } - - if (lcd->methods) - Xfree(lcd->methods); - - Xfree(lcd); } static void @@ -274,10 +272,8 @@ destroy( _XlcDestroyLocaleDataBase(lcd); - if (pub->siname) - Xfree(pub->siname); - if (pub->encoding_name) - Xfree(pub->encoding_name); + Xfree(pub->siname); + Xfree(pub->encoding_name); destroy_core(lcd); } |