mbuf: fix performance with 128-byte cache line

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

diff --git a/app/test/test_cmdline_string.c b/app/test/test_cmdline_string.c
index 7b358cf..915a7d7 100644 (file)
--- a/app/test/test_cmdline_string.c
+++ b/app/test/test_cmdline_string.c
@@ -1,35 +1,34 @@
 /*-
  *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2013 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>
@@ -162,7 +161,7 @@ test_parse_string_invalid_param(void)
 
        memset(&token, 0, sizeof(token));
 
-       rte_snprintf(buf, sizeof(buf), "buffer");
+       snprintf(buf, sizeof(buf), "buffer");
 
        /* test null token */
        if (cmdline_get_help_string(
@@ -179,7 +178,7 @@ test_parse_string_invalid_param(void)
                printf("Error: function accepted null token!\n");
                return -1;
        }
-       if (cmdline_parse_string(NULL, buf, NULL) != -1) {
+       if (cmdline_parse_string(NULL, buf, NULL, 0) != -1) {
                printf("Error: function accepted null token!\n");
                return -1;
        }
@@ -190,7 +189,8 @@ test_parse_string_invalid_param(void)
                return -1;
        }
        if (cmdline_parse_string(
-                       (cmdline_parse_token_hdr_t*)&token, NULL, (void*)&result) != -1) {
+                       (cmdline_parse_token_hdr_t*)&token, NULL,
+                       (void*)&result, sizeof(result)) != -1) {
                printf("Error: function accepted null buffer!\n");
                return -1;
        }
@@ -201,7 +201,7 @@ test_parse_string_invalid_param(void)
        }
        /* test null result */
        if (cmdline_parse_string(
-                       (cmdline_parse_token_hdr_t*)&token, buf, NULL) == -1) {
+                       (cmdline_parse_token_hdr_t*)&token, buf, NULL, 0) == -1) {
                printf("Error: function rejected null result!\n");
                return -1;
        }
@@ -234,7 +234,8 @@ test_parse_string_invalid_data(void)
                token.string_data.str = string_invalid_strs[i].fixed_str;
 
                if (cmdline_parse_string((cmdline_parse_token_hdr_t*)&token,
-                               string_invalid_strs[i].str, (void*)buf) != -1) {
+                               string_invalid_strs[i].str, (void*)buf,
+                               sizeof(buf)) != -1) {
                        memset(help_str, 0, sizeof(help_str));
                        memset(&help_token, 0, sizeof(help_token));
 
@@ -331,7 +332,8 @@ test_parse_string_valid(void)
                token.string_data.str = string_parse_strs[i].fixed_str;
 
                if (cmdline_parse_string((cmdline_parse_token_hdr_t*)&token,
-                               string_parse_strs[i].str, (void*)buf) < 0) {
+                               string_parse_strs[i].str, (void*)buf,
+                               sizeof(buf)) < 0) {
 
                        /* clean help data */
                        memset(&help_token, 0, sizeof(help_token));
@@ -383,7 +385,7 @@ test_parse_string_valid(void)
                        return -1;
                }
                if (strncmp(buf, string_elt_strs[i].result,
-                               sizeof(string_elt_strs[i].result)) != 0) {
+                               sizeof(buf)) != 0) {
                        printf("Error: result mismatch!\n");
                        return -1;
                }