import 15.2.0 Octopus source

[ceph.git] / ceph / src / spdk / dpdk / lib / librte_ring / rte_ring.c

diff --git a/ceph/src/spdk/dpdk/lib/librte_ring/rte_ring.c b/ceph/src/spdk/dpdk/lib/librte_ring/rte_ring.c
index d215aceccf465ad29e31289d0146603eaf47a4b5..b89ecf99997bd25dc398df860de4c9465bc783cb 100644 (file)
--- a/ceph/src/spdk/dpdk/lib/librte_ring/rte_ring.c
+++ b/ceph/src/spdk/dpdk/lib/librte_ring/rte_ring.c
@@ -78,7 +78,7 @@ rte_ring_init(struct rte_ring *r, const char *name, unsigned count,
 
        /* init the ring structure */
        memset(r, 0, sizeof(*r));
-       ret = snprintf(r->name, sizeof(r->name), "%s", name);
+       ret = strlcpy(r->name, name, sizeof(r->name));
        if (ret < 0 || ret >= (int)sizeof(r->name))
                return -ENAMETOOLONG;
        r->flags = flags;
@@ -189,7 +189,8 @@ rte_ring_free(struct rte_ring *r)
         * therefore, there is no memzone to free.
         */
        if (r->memzone == NULL) {
-               RTE_LOG(ERR, RING, "Cannot free ring (not created with rte_ring_create()");
+               RTE_LOG(ERR, RING,
+                       "Cannot free ring, not created with rte_ring_create()\n");
                return;
        }