diff options
Diffstat (limited to 'lib/librte_member/rte_member.c')
| -rw-r--r-- | lib/librte_member/rte_member.c | 42 |
1 files changed, 7 insertions, 35 deletions
diff --git a/lib/librte_member/rte_member.c b/lib/librte_member/rte_member.c index cc9ea84a..e147dd1f 100644 --- a/lib/librte_member/rte_member.c +++ b/lib/librte_member/rte_member.c @@ -1,34 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2017 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2017 Intel Corporation */ #include <string.h> @@ -136,7 +107,7 @@ rte_member_create(const struct rte_member_parameters *params) rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK); TAILQ_FOREACH(te, member_list, next) { - setsum = (struct rte_member_setsum *) te->data; + setsum = te->data; if (strncmp(params->name, setsum->name, RTE_MEMBER_NAMESIZE) == 0) break; @@ -154,7 +125,7 @@ rte_member_create(const struct rte_member_parameters *params) } /* Create a new setsum structure */ - setsum = (struct rte_member_setsum *) rte_zmalloc_socket(params->name, + setsum = rte_zmalloc_socket(params->name, sizeof(struct rte_member_setsum), RTE_CACHE_LINE_SIZE, params->socket_id); if (setsum == NULL) { @@ -191,8 +162,9 @@ rte_member_create(const struct rte_member_parameters *params) return setsum; error_unlock_exit: + rte_free(te); + rte_free(setsum); rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); - rte_member_free(setsum); return NULL; } @@ -330,7 +302,7 @@ RTE_INIT(librte_member_init_log); static void librte_member_init_log(void) { - librte_member_logtype = rte_log_register("librte.member"); + librte_member_logtype = rte_log_register("lib.member"); if (librte_member_logtype >= 0) rte_log_set_level(librte_member_logtype, RTE_LOG_DEBUG); } |