diff options
Diffstat (limited to 'libX11/src/OpenDis.c')
| -rw-r--r-- | libX11/src/OpenDis.c | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/libX11/src/OpenDis.c b/libX11/src/OpenDis.c index 379381489..636860e24 100644 --- a/libX11/src/OpenDis.c +++ b/libX11/src/OpenDis.c @@ -590,8 +590,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) @@ -656,23 +655,17 @@ void _XFreeDisplayStructure(Display *dpy) } free(dpy->display_name); - if (dpy->vendor) - Xfree (dpy->vendor); - - 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) { @@ -687,8 +680,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) { @@ -696,8 +688,8 @@ void _XFreeDisplayStructure(Display *dpy) dpy->conn_watchers = watcher->next; Xfree (watcher); } - if (dpy->filedes) - Xfree (dpy->filedes); + + Xfree (dpy->filedes); _XFreeX11XCBStructure(dpy); |