diff options
| author | walter harms <wharms@bfs.de> | 2014-06-05 18:37:40 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-19 21:40:29 +0200 |
| commit | fc26b97ea9053a2aba54824243282e27bc4a1e15 (patch) | |
| tree | e4f0db001783947e7d522873d1e27aabe5e8885b /nx-X11/lib/X11/OpenDis.c | |
| parent | 191d1575f42affc0d86170132bef5a1535f7bdfa (diff) | |
| download | nx-libs-fc26b97ea9053a2aba54824243282e27bc4a1e15.tar.gz nx-libs-fc26b97ea9053a2aba54824243282e27bc4a1e15.tar.bz2 nx-libs-fc26b97ea9053a2aba54824243282e27bc4a1e15.zip | |
Remove redundant null checks before free
This patch removes some redundant null checks before free.
It should not change the code otherwise. Be aware that this
is only the first series.
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/OpenDis.c')
| -rw-r--r-- | nx-X11/lib/X11/OpenDis.c | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/nx-X11/lib/X11/OpenDis.c b/nx-X11/lib/X11/OpenDis.c index 3c56aa580..965924650 100644 --- a/nx-X11/lib/X11/OpenDis.c +++ b/nx-X11/lib/X11/OpenDis.c @@ -864,8 +864,7 @@ void _XFreeDisplayStructure(Display *dpy) while (dpy->ext_procs) { _XExtension *ext = dpy->ext_procs; dpy->ext_procs = ext->next; - if (ext->name) - Xfree (ext->name); + Xfree (ext->name); Xfree (ext); } if (dpy->im_filters) @@ -929,25 +928,18 @@ void _XFreeDisplayStructure(Display *dpy) Xfree (dpy->pixmap_format); } - if (dpy->display_name) - Xfree (dpy->display_name); - if (dpy->vendor) - Xfree (dpy->vendor); + free(dpy->display_name); - if (dpy->buffer) - Xfree (dpy->buffer); - if (dpy->keysyms) - Xfree (dpy->keysyms); - if (dpy->xdefaults) - Xfree (dpy->xdefaults); - if (dpy->error_vec) - Xfree (dpy->error_vec); + Xfree (dpy->vendor); + Xfree (dpy->buffer); + Xfree (dpy->keysyms); + Xfree (dpy->xdefaults); + Xfree (dpy->error_vec); _XFreeExtData (dpy->ext_data); - if (dpy->free_funcs) - Xfree (dpy->free_funcs); - if (dpy->scratch_buffer) - Xfree (dpy->scratch_buffer); + + Xfree (dpy->free_funcs); + Xfree (dpy->scratch_buffer); FreeDisplayLock(dpy); if (dpy->qfree) { @@ -962,8 +954,7 @@ void _XFreeDisplayStructure(Display *dpy) while (dpy->im_fd_info) { struct _XConnectionInfo *conni = dpy->im_fd_info; dpy->im_fd_info = conni->next; - if (conni->watch_data) - Xfree (conni->watch_data); + Xfree (conni->watch_data); Xfree (conni); } if (dpy->conn_watchers) { @@ -971,8 +962,8 @@ void _XFreeDisplayStructure(Display *dpy) dpy->conn_watchers = watcher->next; Xfree (watcher); } - if (dpy->filedes) - Xfree (dpy->filedes); + + Xfree (dpy->filedes); #if USE_XCB _XFreeX11XCBStructure(dpy); |