[dpdk-dev] [PATCH v2 3/6] examples: get rid of unneeded null checks before rte_free

[Stephen Hemminger]

rte_free handles getting passed a NULL pointer.

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
---
 examples/vhost/main.c                       | 3 +--
 examples/vhost_xen/vhost_monitor.c          | 7 +++----
 examples/vm_power_manager/channel_manager.c | 6 ++----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index c3fcb80..ad10f82 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -2747,8 +2747,7 @@ new_device (struct virtio_net *dev)
                RTE_LOG(INFO, VHOST_DATA, "(%"PRIu64") Failed to add device to 
data core\n", dev->device_fh);
                vdev->ready = DEVICE_SAFE_REMOVE;
                destroy_device(dev);
-               if (vdev->regions_hpa)
-                       rte_free(vdev->regions_hpa);
+               rte_free(vdev->regions_hpa);
                rte_free(vdev);
                return -1;
        }
diff --git a/examples/vhost_xen/vhost_monitor.c 
b/examples/vhost_xen/vhost_monitor.c
index 9d99962..6455993 100644
--- a/examples/vhost_xen/vhost_monitor.c
+++ b/examples/vhost_xen/vhost_monitor.c
@@ -298,10 +298,9 @@ virtio_net_config_ll *new_device(unsigned int virtio_idx, 
struct xen_guest *gues
 err:
        if (new_ll_dev)
                free(new_ll_dev);
-       if (virtqueue_rx)
-               rte_free(virtqueue_rx);
-       if (virtqueue_tx)
-               rte_free(virtqueue_tx);
+       rte_free(virtqueue_rx);
+       rte_free(virtqueue_tx);
+
        return NULL;
 }

diff --git a/examples/vm_power_manager/channel_manager.c 
b/examples/vm_power_manager/channel_manager.c
index 04344ae..7d892e2 100644
--- a/examples/vm_power_manager/channel_manager.c
+++ b/examples/vm_power_manager/channel_manager.c
@@ -800,9 +800,7 @@ channel_manager_exit(void)
                rte_free(vm_info);
        }

-       if (global_cpumaps != NULL)
-               rte_free(global_cpumaps);
-       if (global_vircpuinfo != NULL)
-               rte_free(global_vircpuinfo);
+       rte_free(global_cpumaps);
+       rte_free(global_vircpuinfo);
        disconnect_hypervisor();
 }
-- 
2.1.4