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/XlibInt.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/XlibInt.c')
| -rw-r--r-- | nx-X11/lib/X11/XlibInt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c index deab8b3ad..418853391 100644 --- a/nx-X11/lib/X11/XlibInt.c +++ b/nx-X11/lib/X11/XlibInt.c @@ -2537,8 +2537,7 @@ _XUnregisterInternalConnection( watch=watch->next, wd++) { (*watch->fn) (dpy, watch->client_data, fd, False, wd); } - if (info_list->watch_data) - Xfree (info_list->watch_data); + Xfree (info_list->watch_data); Xfree (info_list); break; } @@ -3763,9 +3762,10 @@ char *_XAllocScratch( unsigned long nbytes) { if (nbytes > dpy->scratch_length) { - if (dpy->scratch_buffer) Xfree (dpy->scratch_buffer); - if ((dpy->scratch_buffer = Xmalloc(nbytes))) - dpy->scratch_length = nbytes; + Xfree (dpy->scratch_buffer); + dpy->scratch_buffer = Xmalloc(nbytes); + if (dpy->scratch_buffer) + dpy->scratch_length = nbytes; else dpy->scratch_length = 0; } return (dpy->scratch_buffer); @@ -3792,8 +3792,8 @@ void _XFreeTemp( char *buf, unsigned long nbytes) { - if (dpy->scratch_buffer) - Xfree(dpy->scratch_buffer); + + Xfree(dpy->scratch_buffer); dpy->scratch_buffer = buf; dpy->scratch_length = nbytes; } |