remove unneeded tests for NULL when freeing

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

diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c
index 3aace08..2bfe54a 100644 (file)
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -31,11 +31,15 @@
  */
 
 /* This file manages the list of devices and their arguments, as given
- * by the user at startup */
+ * by the user at startup
+ *
+ * Code here should not call rte_log since the EAL environment
+ * may not be initialized.
+ */
 
+#include <stdio.h>
 #include <string.h>
 
-#include <rte_log.h>
 #include <rte_pci.h>
 #include <rte_devargs.h>
 #include "eal_private.h"
@@ -44,59 +48,70 @@
 struct rte_devargs_list devargs_list =
        TAILQ_HEAD_INITIALIZER(devargs_list);
 
+int
+rte_eal_parse_devargs_str(const char *devargs_str,
+                       char **drvname, char **drvargs)
+{
+       char *sep;
+
+       if ((devargs_str) == NULL || (drvname) == NULL || (drvargs == NULL))
+               return -1;
+
+       *drvname = strdup(devargs_str);
+       if (drvname == NULL)
+               return -1;
+
+       /* set the first ',' to '\0' to split name and arguments */
+       sep = strchr(*drvname, ',');
+       if (sep != NULL) {
+               sep[0] = '\0';
+               *drvargs = strdup(sep + 1);
+       } else {
+               *drvargs = strdup("");
+       }
+
+       if (*drvargs == NULL) {
+               free(*drvname);
+               return -1;
+       }
+       return 0;
+}
+
 /* store a whitelist parameter for later parsing */
 int
 rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
 {
        struct rte_devargs *devargs = NULL;
        char *buf = NULL;
-       char *sep;
        int ret;
 
        /* use malloc instead of rte_malloc as it's called early at init */
        devargs = malloc(sizeof(*devargs));
-       if (devargs == NULL) {
-               RTE_LOG(ERR, EAL, "cannot allocate devargs\n");
+       if (devargs == NULL)
                goto fail;
-       }
+
        memset(devargs, 0, sizeof(*devargs));
        devargs->type = devtype;
 
-       buf = strdup(devargs_str);
-       if (buf == NULL) {
-               RTE_LOG(ERR, EAL, "cannot allocate temp memory for devargs\n");
+       if (rte_eal_parse_devargs_str(devargs_str, &buf, &devargs->args))
                goto fail;
-       }
-
-       /* set the first ',' to '\0' to split name and arguments */
-       sep = strchr(buf, ',');
-       if (sep != NULL) {
-               sep[0] = '\0';
-               devargs->args = strdup(sep + 1);
-               if (devargs->args == NULL) {
-                       RTE_LOG(ERR, EAL, "cannot allocate for devargs args\n");
-                       goto fail;
-               }
-       }
 
        switch (devargs->type) {
        case RTE_DEVTYPE_WHITELISTED_PCI:
        case RTE_DEVTYPE_BLACKLISTED_PCI:
                /* try to parse pci identifier */
                if (eal_parse_pci_BDF(buf, &devargs->pci.addr) != 0 &&
-                   eal_parse_pci_DomBDF(buf, &devargs->pci.addr) != 0) {
-                       RTE_LOG(ERR, EAL, "invalid PCI identifier <%s>\n", buf);
+                   eal_parse_pci_DomBDF(buf, &devargs->pci.addr) != 0)
                        goto fail;
-               }
+
                break;
        case RTE_DEVTYPE_VIRTUAL:
                /* save driver name */
-               ret = snprintf(devargs->virtual.drv_name,
-                              sizeof(devargs->virtual.drv_name), "%s", buf);
-               if (ret < 0 || ret >= (int)sizeof(devargs->virtual.drv_name)) {
-                       RTE_LOG(ERR, EAL, "driver name too large: <%s>\n", buf);
+               ret = snprintf(devargs->virt.drv_name,
+                              sizeof(devargs->virt.drv_name), "%s", buf);
+               if (ret < 0 || ret >= (int)sizeof(devargs->virt.drv_name))
                        goto fail;
-               }
+
                break;
        }
 
@@ -105,12 +120,12 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
        return 0;
 
 fail:
-       if (devargs->args)
+       free(buf);
+       if (devargs) {
                free(devargs->args);
-       if (buf)
-               free(buf);
-       if (devargs)
                free(devargs);
+       }
+
        return -1;
 }
 
@@ -153,7 +168,7 @@ rte_eal_devargs_dump(FILE *f)
                               devargs->args);
                else if (devargs->type == RTE_DEVTYPE_VIRTUAL)
                        fprintf(f, "  VIRTUAL %s %s\n",
-                              devargs->virtual.drv_name,
+                              devargs->virt.drv_name,
                               devargs->args);
                else
                        fprintf(f, "  UNKNOWN %s\n", devargs->args);