diff options
| author | walter harms <wharms@bfs.de> | 2014-06-06 22:53:05 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-19 21:40:29 +0200 |
| commit | 1ff6961231eda8929406b93fe3d70071cbba2469 (patch) | |
| tree | 23b74007f819f15d2ab3acc2f55731cf17182a17 /nx-X11/lib/X11/imDefLkup.c | |
| parent | fc26b97ea9053a2aba54824243282e27bc4a1e15 (diff) | |
| download | nx-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/imDefLkup.c')
| -rw-r--r-- | nx-X11/lib/X11/imDefLkup.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/nx-X11/lib/X11/imDefLkup.c b/nx-X11/lib/X11/imDefLkup.c index 1cbd15b54..af39008bc 100644 --- a/nx-X11/lib/X11/imDefLkup.c +++ b/nx-X11/lib/X11/imDefLkup.c @@ -599,10 +599,9 @@ _XimUnregCommitInfo( if (!(info = ic->private.proto.commit_info)) return; - if (info->string) - Xfree(info->string); - if (info->keysym) - Xfree(info->keysym); + + Xfree(info->string); + Xfree(info->keysym); ic->private.proto.commit_info = info->next; Xfree(info); return; @@ -696,10 +695,8 @@ _XimCommitRecv( } if (!(_XimRegCommitInfo(ic, string, string_len, keysym, keysym_len))) { - if (string) - Xfree(string); - if (keysym) - Xfree(keysym); + Xfree(string); + Xfree(keysym); _XimError(im, ic, XIM_BadAlloc, (INT16)0, (CARD16)0, (char *)NULL); return False; } |