remove unnecessary checks for NULL before calling free()

The function free() handles the case wher argument is NULL
by doing nothing. So the extra checks are not needed.

Found by modified version of kernel coccinelle script.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/ip/ipnexthop.c b/ip/ipnexthop.c
index 9f16b8097b40c4f5b991ea64a4341d4e384ecd27..894f2a126f401512540c0e706cadcc95088c4b1d 100644 (file)
--- a/ip/ipnexthop.c
+++ b/ip/ipnexthop.c
@@ -345,10 +345,8 @@ static void print_nh_res_bucket(FILE *fp, const struct rtattr *res_bucket_attr)
 
 static void ipnh_destroy_entry(struct nh_entry *nhe)
 {
-       if (nhe->nh_encap)
-               free(nhe->nh_encap);
-       if (nhe->nh_groups)
-               free(nhe->nh_groups);
+       free(nhe->nh_encap);
+       free(nhe->nh_groups);
 }
 
 /* parse nhmsg into nexthop entry struct which must be destroyed by
@@ -586,8 +584,7 @@ static struct nh_entry *ipnh_cache_add(__u32 nh_id)
        ipnh_cache_link_entry(nhe);
 
 out:
-       if (answer)
-               free(answer);
+       free(answer);
 
        return nhe;
 

diff --git a/lib/utils.c b/lib/utils.c
index b740531ab6c9c06415beb7d7b15a2740deceefb8..8dc302bdfe026671e3eb14680346a8184aac3fc6 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -1707,8 +1707,7 @@ int do_batch(const char *name, bool force,
                }
        }
 
-       if (line)
-               free(line);
+       free(line);
 
        return ret;
 }

diff --git a/tc/m_ipt.c b/tc/m_ipt.c
index 465d1b8073d0806622eda9c9e13ecf74a2db9a71..3fe70faf2ec6decfac17585e940d1670edc7b80b 100644 (file)
--- a/tc/m_ipt.c
+++ b/tc/m_ipt.c
@@ -412,8 +412,7 @@ static int parse_ipt(struct action_util *a, int *argc_p,
         m->tflags = 0;
         m->used = 0;
        /* Free allocated memory */
-       if (m->t)
-           free(m->t);
+       free(m->t);
 
 
        return 0;

diff --git a/tc/m_xt.c b/tc/m_xt.c
index 8a6fd3ce0ffcb919186b1ce43d50e20d93852325..658084378124b3728e546af1e7b784394b638591 100644 (file)
--- a/tc/m_xt.c
+++ b/tc/m_xt.c
@@ -299,8 +299,7 @@ static int parse_ipt(struct action_util *a, int *argc_p,
                m->tflags = 0;
                m->used = 0;
                /* Free allocated memory */
-               if (m->t)
-                       free(m->t);
+               free(m->t);
        }
 
        return 0;

diff --git a/tc/m_xt_old.c b/tc/m_xt_old.c
index efa084c5441b163018b5b056cb0fb6ef545557a1..7c6b79b99af5bcc3b175d5688c3c6d0fdf4e23c9 100644 (file)
--- a/tc/m_xt_old.c
+++ b/tc/m_xt_old.c
@@ -337,8 +337,7 @@ static int parse_ipt(struct action_util *a, int *argc_p,
         m->tflags = 0;
         m->used = 0;
        /* Free allocated memory */
-       if (m->t)
-           free(m->t);
+       free(m->t);
 
 
        return 0;

diff --git a/tc/tc_qdisc.c b/tc/tc_qdisc.c
index 92ceb4c2f9801bfa5e244ebba661bdca9c152a25..129ad9d96f8d27736a98bab253aeb5e84fc8d504 100644 (file)
--- a/tc/tc_qdisc.c
+++ b/tc/tc_qdisc.c
@@ -187,8 +187,7 @@ static int tc_qdisc_modify(int cmd, unsigned int flags, int argc, char **argv)
                        addattr_l(&req.n, sizeof(req), TCA_STAB_DATA, stab.data,
                                  stab.szopts.tsize * sizeof(__u16));
                addattr_nest_end(&req.n, tail);
-               if (stab.data)
-                       free(stab.data);
+               free(stab.data);
        }
 
        if (d[0])  {