net: add rte prefix to ether structures

[dpdk.git] / app / test / test_cmdline_etheraddr.c

diff --git a/app/test/test_cmdline_etheraddr.c b/app/test/test_cmdline_etheraddr.c
index c67a0a5..90943c2 100644 (file)
--- a/app/test/test_cmdline_etheraddr.c
+++ b/app/test/test_cmdline_etheraddr.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 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) 2010-2014 Intel Corporation
  */
 
 #include <stdio.h>
@@ -111,7 +82,7 @@ const char * ether_addr_invalid_strs[] = {
 
 
 static int
-is_addr_different(const struct ether_addr addr, uint64_t num)
+is_addr_different(const struct rte_ether_addr addr, uint64_t num)
 {
        int i;
        for (i = 0; i < ETHER_ADDR_LEN; i++, num >>= 8)
@@ -126,18 +97,19 @@ int
 test_parse_etheraddr_invalid_param(void)
 {
        char buf[CMDLINE_TEST_BUFSIZE];
-       struct ether_addr result;
+       struct rte_ether_addr result;
        int ret = 0;
 
        /* try all null */
-       ret = cmdline_parse_etheraddr(NULL, NULL, NULL);
+       ret = cmdline_parse_etheraddr(NULL, NULL, NULL, 0);
        if (ret != -1) {
                printf("Error: parser accepted null parameters!\n");
                return -1;
        }
 
        /* try null buf */
-       ret = cmdline_parse_etheraddr(NULL, NULL, (void*)&result);
+       ret = cmdline_parse_etheraddr(NULL, NULL, (void*)&result,
+               sizeof(result));
        if (ret != -1) {
                printf("Error: parser accepted null string!\n");
                return -1;
@@ -146,10 +118,9 @@ test_parse_etheraddr_invalid_param(void)
        /* try null result */
 
        /* copy string to buffer */
-       rte_snprintf(buf, sizeof(buf), "%s",
-                       ether_addr_valid_strs[0]);
+       strlcpy(buf, ether_addr_valid_strs[0].str, sizeof(buf));
 
-       ret = cmdline_parse_etheraddr(NULL, buf, NULL);
+       ret = cmdline_parse_etheraddr(NULL, buf, NULL, 0);
        if (ret == -1) {
                printf("Error: parser rejected null result!\n");
                return -1;
@@ -161,13 +132,6 @@ test_parse_etheraddr_invalid_param(void)
        /* test help function */
        memset(&buf, 0, sizeof(buf));
 
-       /* try null buf */
-       ret = cmdline_get_help_etheraddr(NULL, NULL, sizeof(buf));
-       if (ret != -1) {
-               printf("Error: help function accepted null buffer!\n");
-               return -1;
-       }
-
        /* coverage! */
        ret = cmdline_get_help_etheraddr(NULL, buf, sizeof(buf));
        if (ret < 0) {
@@ -184,15 +148,15 @@ test_parse_etheraddr_invalid_data(void)
 {
        int ret = 0;
        unsigned i;
-       struct ether_addr result;
+       struct rte_ether_addr result;
 
        /* test full strings */
        for (i = 0; i < ETHERADDR_INVALID_STRS_SIZE; i++) {
 
-               memset(&result, 0, sizeof(struct ether_addr));
+               memset(&result, 0, sizeof(struct rte_ether_addr));
 
                ret = cmdline_parse_etheraddr(NULL, ether_addr_invalid_strs[i],
-                               (void*)&result);
+                       (void*)&result, sizeof(result));
                if (ret != -1) {
                        printf("Error: parsing %s succeeded!\n",
                                        ether_addr_invalid_strs[i]);
@@ -209,15 +173,15 @@ test_parse_etheraddr_valid(void)
 {
        int ret = 0;
        unsigned i;
-       struct ether_addr result;
+       struct rte_ether_addr result;
 
        /* test full strings */
        for (i = 0; i < ETHERADDR_VALID_STRS_SIZE; i++) {
 
-               memset(&result, 0, sizeof(struct ether_addr));
+               memset(&result, 0, sizeof(struct rte_ether_addr));
 
                ret = cmdline_parse_etheraddr(NULL, ether_addr_valid_strs[i].str,
-                               (void*)&result);
+                       (void*)&result, sizeof(result));
                if (ret < 0) {
                        printf("Error: parsing %s failed!\n",
                                        ether_addr_valid_strs[i].str);
@@ -233,10 +197,10 @@ test_parse_etheraddr_valid(void)
        /* test garbage strings */
        for (i = 0; i < ETHERADDR_GARBAGE_STRS_SIZE; i++) {
 
-               memset(&result, 0, sizeof(struct ether_addr));
+               memset(&result, 0, sizeof(struct rte_ether_addr));
 
                ret = cmdline_parse_etheraddr(NULL, ether_addr_garbage_strs[i],
-                               (void*)&result);
+                       (void*)&result, sizeof(result));
                if (ret < 0) {
                        printf("Error: parsing %s failed!\n",
                                        ether_addr_garbage_strs[i]);