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/GetHints.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/GetHints.c')
| -rw-r--r-- | nx-X11/lib/X11/GetHints.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nx-X11/lib/X11/GetHints.c b/nx-X11/lib/X11/GetHints.c index 589ee9ae2..fae61e912 100644 --- a/nx-X11/lib/X11/GetHints.c +++ b/nx-X11/lib/X11/GetHints.c @@ -75,7 +75,7 @@ Status XGetSizeHints ( if ((actual_type != XA_WM_SIZE_HINTS) || (nitems < OldNumPropSizeElements) || (actual_format != 32)) { - if (prop != NULL) Xfree (prop); + Xfree (prop); return(0); } hints->flags = (prop->flags & (USPosition|USSize|PAllHints)); @@ -124,7 +124,7 @@ XWMHints *XGetWMHints ( if ((actual_type != XA_WM_HINTS) || (nitems < (NumPropWMHintsElements - 1)) || (actual_format != 32)) { - if (prop != NULL) Xfree (prop); + Xfree (prop); return(NULL); } /* static copies not allowed in library, due to reentrancy constraint*/ @@ -196,7 +196,7 @@ Status XGetIconSizes ( (nitems < NumPropIconSizeElements) || (nitems % NumPropIconSizeElements != 0) || (actual_format != 32)) { - if (prop != NULL) Xfree (prop); + Xfree (prop); return(0); } @@ -204,7 +204,7 @@ Status XGetIconSizes ( nitems /= NumPropIconSizeElements; if (! (hp = hints = Xcalloc (nitems, sizeof(XIconSize)))) { - if (prop) Xfree (prop); + Xfree (prop); return 0; } @@ -239,7 +239,7 @@ Status XGetCommand ( if (!XGetTextProperty (dpy, w, &tp, XA_WM_COMMAND)) return 0; if (tp.encoding != XA_STRING || tp.format != 8) { - if (tp.value) Xfree (tp.value); + Xfree (tp.value); return 0; } @@ -254,7 +254,7 @@ Status XGetCommand ( * create a string list and return if successful */ if (!XTextPropertyToStringList (&tp, &argv, &argc)) { - if (tp.value) Xfree (tp.value); + Xfree (tp.value); return (0); } @@ -291,7 +291,7 @@ XGetTransientForHint( return (1); } *propWindow = None; - if (data) Xfree( (char *) data); + Xfree( (char *) data); return(0); } @@ -333,6 +333,6 @@ XGetClassHint( Xfree( (char *) data); return(1); } - if (data) Xfree( (char *) data); + Xfree( (char *) data); return(0); } |