hash: fallback to software CRC32 implementation

[dpdk.git] / lib / librte_eal / linuxapp / eal / eal_lcore.c

diff --git a/lib/librte_eal/linuxapp/eal/eal_lcore.c b/lib/librte_eal/linuxapp/eal/eal_lcore.c
index cc9b900..c67e0e6 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_lcore.c
+++ b/lib/librte_eal/linuxapp/eal/eal_lcore.c
@@ -55,7 +55,7 @@ static int
 cpu_detected(unsigned lcore_id)
 {
        char path[PATH_MAX];
-       int len = rte_snprintf(path, sizeof(path), SYS_CPU_DIR
+       int len = snprintf(path, sizeof(path), SYS_CPU_DIR
                "/"CORE_ID_FILE, lcore_id);
        if (len <= 0 || (unsigned)len >= sizeof(path))
                return 0;
@@ -77,12 +77,12 @@ cpu_socket_id(unsigned lcore_id)
        const char node_prefix[] = "node";
        const size_t prefix_len = sizeof(node_prefix) - 1;
        char path[PATH_MAX];
-       DIR *d;
+       DIR *d = NULL;
        unsigned long id = 0;
        struct dirent *e;
        char *endptr = NULL;
 
-       int len = rte_snprintf(path, sizeof(path),
+       int len = snprintf(path, sizeof(path),
                               SYS_CPU_DIR, lcore_id);
        if (len <= 0 || (unsigned)len >= sizeof(path))
                goto err;
@@ -97,22 +97,24 @@ cpu_socket_id(unsigned lcore_id)
                        break;
                }
        }
-       closedir(d);
        if (endptr == NULL || *endptr!='\0' || endptr == e->d_name+prefix_len) {
                RTE_LOG(WARNING, EAL, "Cannot read numa node link "
                                "for lcore %u - using physical package id instead\n",
                                lcore_id);
 
-               len = rte_snprintf(path, sizeof(path), SYS_CPU_DIR "/%s",
+               len = snprintf(path, sizeof(path), SYS_CPU_DIR "/%s",
                                lcore_id, PHYS_PKG_FILE);
                if (len <= 0 || (unsigned)len >= sizeof(path))
                        goto err;
                if (eal_parse_sysfs_value(path, &id) != 0)
                        goto err;
        }
+       closedir(d);
        return (unsigned)id;
 
 err:
+       if (d)
+               closedir(d);
        RTE_LOG(ERR, EAL, "Error getting NUMA socket information from %s "
                        "for lcore %u - assuming NUMA socket 0\n", SYS_CPU_DIR, lcore_id);
        return 0;
@@ -125,7 +127,7 @@ cpu_core_id(unsigned lcore_id)
        char path[PATH_MAX];
        unsigned long id;
 
-       int len = rte_snprintf(path, sizeof(path), SYS_CPU_DIR "/%s", lcore_id, CORE_ID_FILE);
+       int len = snprintf(path, sizeof(path), SYS_CPU_DIR "/%s", lcore_id, CORE_ID_FILE);
        if (len <= 0 || (unsigned)len >= sizeof(path))
                goto err;
        if (eal_parse_sysfs_value(path, &id) != 0)