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/GetRGBCMap.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/GetRGBCMap.c')
-rw-r--r-- | nx-X11/lib/X11/GetRGBCMap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/lib/X11/GetRGBCMap.c b/nx-X11/lib/X11/GetRGBCMap.c index 08dc1deaf..746b53fbf 100644 --- a/nx-X11/lib/X11/GetRGBCMap.c +++ b/nx-X11/lib/X11/GetRGBCMap.c @@ -63,7 +63,7 @@ Status XGetRGBColormaps ( /* if wrong type or format, or too small for us, then punt */ if ((actual_type != XA_RGB_COLOR_MAP) || (actual_format != 32) || (nitems < OldNumPropStandardColormapElements)) { - if (data) Xfree (data); + Xfree (data); return False; } @@ -78,7 +78,7 @@ Status XGetRGBColormaps ( Screen *sp = _XScreenOfWindow (dpy, w); if (!sp) { - if (data) Xfree (data); + Xfree (data); return False; } def_visual = sp->root_visual->visualid; @@ -90,7 +90,7 @@ Status XGetRGBColormaps ( ncmaps = (nitems / NumPropStandardColormapElements); if ((((unsigned long) ncmaps) * NumPropStandardColormapElements) != nitems) { - if (data) Xfree (data); + Xfree (data); return False; } } @@ -101,7 +101,7 @@ Status XGetRGBColormaps ( */ cmaps = Xmalloc (ncmaps * sizeof (XStandardColormap)); if (!cmaps) { - if (data) Xfree (data); + Xfree (data); return False; } |