aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/imThaiIc.c
diff options
context:
space:
mode:
authorwalter harms <wharms@bfs.de>2014-06-06 22:53:05 +0200
committerUlrich Sibiller <uli42@gmx.de>2016-10-19 21:40:29 +0200
commit1ff6961231eda8929406b93fe3d70071cbba2469 (patch)
tree23b74007f819f15d2ab3acc2f55731cf17182a17 /nx-X11/lib/X11/imThaiIc.c
parentfc26b97ea9053a2aba54824243282e27bc4a1e15 (diff)
downloadnx-libs-1ff6961231eda8929406b93fe3d70071cbba2469.tar.gz
nx-libs-1ff6961231eda8929406b93fe3d70071cbba2469.tar.bz2
nx-libs-1ff6961231eda8929406b93fe3d70071cbba2469.zip
Remove more redundant null checks before Xfree()
Signed-off-by: Harms <wharms@bfs,de> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11/lib/X11/imThaiIc.c')
-rw-r--r--nx-X11/lib/X11/imThaiIc.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/nx-X11/lib/X11/imThaiIc.c b/nx-X11/lib/X11/imThaiIc.c
index 002219920..b559145d0 100644
--- a/nx-X11/lib/X11/imThaiIc.c
+++ b/nx-X11/lib/X11/imThaiIc.c
@@ -65,18 +65,20 @@ _XimThaiDestroyIC(
if(((Xim)ic->core.im)->private.local.current_ic == (XIC)ic) {
_XimThaiUnSetFocus(xic);
}
- if(ic->private.local.ic_resources) {
- Xfree(ic->private.local.ic_resources);
- ic->private.local.ic_resources = NULL;
- }
- if (b->tree) Xfree (b->tree);
- if (b->mb) Xfree (b->mb);
- if (b->wc) Xfree (b->wc);
- if (b->utf8) Xfree (b->utf8);
+ Xfree(ic->private.local.ic_resources);
+ ic->private.local.ic_resources = NULL;
+
+ Xfree (b->tree);
b->tree = NULL;
+
+ Xfree (b->mb);
b->mb = NULL;
+
+ Xfree (b->wc);
b->wc = NULL;
+
+ Xfree (b->utf8);
b->utf8 = NULL;
return;
}