remove unneeded tests for NULL when freeing

[dpdk.git] / examples / vhost_xen / xenstore_parse.c

diff --git a/examples/vhost_xen/xenstore_parse.c b/examples/vhost_xen/xenstore_parse.c
index fdd69b2..26d2432 100644 (file)
--- a/examples/vhost_xen/xenstore_parse.c
+++ b/examples/vhost_xen/xenstore_parse.c
@@ -49,7 +49,6 @@
 
 #include <rte_common.h>
 #include <rte_memory.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_malloc.h>
 #include <rte_string_fns.h>
@@ -77,7 +76,7 @@ struct grant_node_item {
 } __attribute__((packed));
 
 int cmdline_parse_etheraddr(void *tk, const char *srcbuf,
-                           void *res);
+       void *res, unsigned ressize);
 
 /* Map grant ref refid at addr_ori*/
 static void *
@@ -204,8 +203,7 @@ xen_free_gntnode(struct xen_gntnode *gntnode)
 {
        if (gntnode == NULL)
                return;
-       if (gntnode->gnt_info)
-               free(gntnode->gnt_info);
+       free(gntnode->gnt_info);
        free(gntnode);
 }
 
@@ -248,8 +246,8 @@ parse_gntnode(int dom_id, char *path)
                goto err;
        }
 
-       gntnode = (struct xen_gntnode *)calloc(1, sizeof(struct xen_gntnode));
-       gnt = (struct xen_gnt *)calloc(gref_num, sizeof(struct xen_gnt));
+       gntnode = calloc(1, sizeof(struct xen_gntnode));
+       gnt = calloc(gref_num, sizeof(struct xen_gnt));
        if (gnt == NULL || gntnode == NULL)
                goto err;
 
@@ -287,14 +285,10 @@ parse_gntnode(int dom_id, char *path)
        return gntnode;
 
 err:
-       if (gnt)
-               free(gnt);
-       if (gntnode)
-               free(gntnode);
-       if (gref_list)
-               free(gref_list);
-       if (buf)
-               free(buf);
+       free(gnt);
+       free(gntnode);
+       free(gref_list);
+       free(buf);
        return NULL;
 }
 
@@ -413,8 +407,7 @@ parse_mpool_va(struct xen_mempool *mempool)
        }
        ret = 0;
 out:
-       if (buf)
-               free(buf);
+       free(buf);
        return ret;
 }
 
@@ -461,8 +454,7 @@ cleanup_mempool(struct xen_mempool *mempool)
        }
        mempool->pindex = NULL;
 
-       if (mempool->mempfn_tbl)
-               free(mempool->mempfn_tbl);
+       free(mempool->mempfn_tbl);
        mempool->mempfn_tbl = NULL;
 }
 
@@ -560,8 +552,7 @@ xen_map_vringflag(struct xen_vring *vring)
        free(buf);
        return 0;
 err:
-       if (buf)
-               free(buf);
+       free(buf);
        if (vring->flag) {
                munmap(vring->flag, pg_sz);
                vring->flag = NULL;
@@ -623,8 +614,7 @@ cleanup_vring(struct xen_vring *vring)
        }
        vring->rx_pindex = NULL;
 
-       if (vring->rxpfn_tbl)
-               free(vring->rxpfn_tbl);
+       free(vring->rxpfn_tbl);
        vring->rxpfn_tbl = NULL;
 
        if (vring->txvring_addr) {
@@ -645,8 +635,7 @@ cleanup_vring(struct xen_vring *vring)
        }
        vring->tx_pindex = NULL;
 
-       if (vring->txpfn_tbl)
-               free(vring->txpfn_tbl);
+       free(vring->txpfn_tbl);
        vring->txpfn_tbl = NULL;
 
        if (vring->flag) {
@@ -676,12 +665,12 @@ xen_parse_etheraddr(struct xen_vring *vring)
        if ((buf = xen_read_node(path, &len)) == NULL)
                goto out;
 
-       if (cmdline_parse_etheraddr(NULL, buf, &vring->addr) < 0)
+       if (cmdline_parse_etheraddr(NULL, buf, &vring->addr,
+                       sizeof(vring->addr)) < 0)
                goto out;
        ret = 0;
 out:
-       if (buf)
-               free(buf);
+       free(buf);
        return ret;
 }