service: allow to disable core check

[dpdk.git] / lib / librte_eal / common / eal_common_dev.c

diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c
index f98302d..e251275 100644 (file)
--- a/lib/librte_eal/common/eal_common_dev.c
+++ b/lib/librte_eal/common/eal_common_dev.c
@@ -133,16 +133,13 @@ full_dev_name(const char *bus, const char *dev, const char *args)
        char *name;
        size_t len;
 
-       len = strlen(bus) + 1 +
-             strlen(dev) + 1 +
-             strlen(args) + 1;
+       len = snprintf(NULL, 0, "%s:%s,%s", bus, dev, args) + 1;
        name = calloc(1, len);
        if (name == NULL) {
                RTE_LOG(ERR, EAL, "Could not allocate full device name\n");
                return NULL;
        }
-       snprintf(name, len, "%s:%s,%s", bus, dev,
-                args ? args : "");
+       snprintf(name, len, "%s:%s,%s", bus, dev, args);
        return name;
 }
 
@@ -207,7 +204,10 @@ int rte_eal_hotplug_add(const char *busname, const char *devname,
        return 0;
 
 err_devarg:
-       rte_eal_devargs_remove(busname, devname);
+       if (rte_eal_devargs_remove(busname, devname)) {
+               free(da->args);
+               free(da);
+       }
 err_name:
        free(name);
        return ret;