tile: fix build

[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 a436570..e4f4231 100644 (file)
--- a/app/test/test_cmdline_etheraddr.c
+++ b/app/test/test_cmdline_etheraddr.c
@@ -1,35 +1,34 @@
 /*-
  *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *
+ *   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 
+ *
+ *   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 
+ *
+ *     * 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 
+ *     * 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 
+ *     * 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 
+ *
+ *   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.
- * 
  */
 
 #include <stdio.h>
@@ -131,14 +130,15 @@ test_parse_etheraddr_invalid_param(void)
        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;
@@ -147,10 +147,10 @@ test_parse_etheraddr_invalid_param(void)
        /* try null result */
 
        /* copy string to buffer */
-       rte_snprintf(buf, sizeof(buf), "%s",
-                       ether_addr_valid_strs[0]);
+       snprintf(buf, sizeof(buf), "%s",
+                       ether_addr_valid_strs[0].str);
 
-       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;
@@ -162,13 +162,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) {
@@ -193,7 +186,7 @@ test_parse_etheraddr_invalid_data(void)
                memset(&result, 0, sizeof(struct 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]);
@@ -218,7 +211,7 @@ test_parse_etheraddr_valid(void)
                memset(&result, 0, sizeof(struct 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);
@@ -237,7 +230,7 @@ test_parse_etheraddr_valid(void)
                memset(&result, 0, sizeof(struct 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]);