diff options
author | Markus Elfring <elfring@users.sourceforge.net> | 2014-08-21 20:51:02 +0200 |
---|---|---|
committer | Bert Münnich <ber.t@posteo.de> | 2014-08-22 19:24:08 +0200 |
commit | 0f6cb93a0910de6e142971b81d3717c26d94e860 (patch) | |
tree | e0cd28b350e05f97e8bdb88bd420dfced885ce8a /thumbs.c | |
parent | 75a665670a60d6b7f0ee31dd8bcccbb0bc22d9bc (diff) | |
download | nsxiv-0f6cb93a0910de6e142971b81d3717c26d94e860.tar.zst |
Bug #165: Deletion of unnecessary null pointer checks
The function "free" performs input parameter validation.
http://pubs.opengroup.org/onlinepubs/9699919799/functions/free.html
It is therefore not needed to check a passed pointer before this function call.
A corresponding update suggestion was generated by the software "Coccinelle"
from the following semantic patch approach.
http://coccinelle.lip6.fr/
@Remove_unnecessary_pointer_checks1@
expression x;
@@
-if (x != \(0 \| NULL\))
free(x);
@Remove_unnecessary_pointer_checks2@
expression x;
@@
-if (x != \(0 \| NULL\)) {
free(x);
x = \(0 \| NULL\);
-}
@Remove_unnecessary_pointer_checks3@
expression a, b;
@@
-if (a != \(0 \| NULL\) && b != \(0 \| NULL\))
+if (a)
free(b);
@Remove_unnecessary_pointer_checks4@
expression a, b;
@@
-if (a != \(0 \| NULL\) && b != \(0 \| NULL\)) {
+if (a) {
free(b);
b = \(0 \| NULL\);
}
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Diffstat (limited to 'thumbs.c')
-rw-r--r-- | thumbs.c | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -176,8 +176,7 @@ void tns_init(tns_t *tns, const fileinfo_t *files, int cnt, int *sel, win_t *win dsuffix = "/.cache"; } if (homedir != NULL) { - if (cache_dir != NULL) - free(cache_dir); + free(cache_dir); len = strlen(homedir) + strlen(dsuffix) + 6; cache_dir = (char*) s_malloc(len); snprintf(cache_dir, len, "%s%s/sxiv", homedir, dsuffix); @@ -204,10 +203,8 @@ void tns_free(tns_t *tns) tns->thumbs = NULL; } - if (cache_dir != NULL) { - free(cache_dir); - cache_dir = NULL; - } + free(cache_dir); + cache_dir = NULL; } bool tns_load(tns_t *tns, int n, bool force) |