tile: fix build

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

diff --git a/app/test/test_cmdline_num.c b/app/test/test_cmdline_num.c
index ce096ad..04263d3 100644 (file)
--- a/app/test/test_cmdline_num.c
+++ b/app/test/test_cmdline_num.c
@@ -1,13 +1,13 @@
 /*-
  *   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
  *   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
@@ -17,7 +17,7 @@
  *     * 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
@@ -31,6 +31,7 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
 
@@ -345,18 +346,18 @@ test_parse_num_invalid_param(void)
        token.num_data.type = UINT32;
 
        /* copy string to buffer */
-       rte_snprintf(buf, sizeof(buf), "%s",
+       snprintf(buf, sizeof(buf), "%s",
                        num_valid_positive_strs[0].str);
 
        /* try all null */
-       ret = cmdline_parse_num(NULL, NULL, NULL);
+       ret = cmdline_parse_num(NULL, NULL, NULL, 0);
        if (ret != -1) {
                printf("Error: parser accepted null parameters!\n");
                return -1;
        }
 
        /* try null token */
-       ret = cmdline_parse_num(NULL, buf, (void*)&result);
+       ret = cmdline_parse_num(NULL, buf, (void*)&result, sizeof(result));
        if (ret != -1) {
                printf("Error: parser accepted null token!\n");
                return -1;
@@ -364,14 +365,15 @@ test_parse_num_invalid_param(void)
 
        /* try null buf */
        ret = cmdline_parse_num((cmdline_parse_token_hdr_t*)&token, NULL,
-                       (void*)&result);
+               (void*)&result, sizeof(result));
        if (ret != -1) {
                printf("Error: parser accepted null string!\n");
                return -1;
        }
 
        /* try null result */
-       ret = cmdline_parse_num((cmdline_parse_token_hdr_t*)&token, buf, NULL);
+       ret = cmdline_parse_num((cmdline_parse_token_hdr_t*)&token, buf,
+               NULL, 0);
        if (ret == -1) {
                printf("Error: parser rejected null result!\n");
                return -1;
@@ -394,13 +396,6 @@ test_parse_num_invalid_param(void)
                return -1;
        }
 
-       /* try null buf */
-       ret = cmdline_get_help_num((cmdline_parse_token_hdr_t*)&token, NULL, sizeof(buf));
-       if (ret != -1) {
-               printf("Error: help function accepted null buffer!\n");
-               return -1;
-       }
-
        /* coverage! */
        ret = cmdline_get_help_num((cmdline_parse_token_hdr_t*)&token, buf, sizeof(buf));
        if (ret < 0) {
@@ -432,7 +427,7 @@ test_parse_num_invalid_data(void)
                        memset(&buf, 0, sizeof(buf));
 
                        ret = cmdline_parse_num((cmdline_parse_token_hdr_t*)&token,
-                                       num_invalid_strs[i], (void*)&result);
+                               num_invalid_strs[i], (void*)&result, sizeof(result));
                        if (ret != -1) {
                                /* get some info about what we are trying to parse */
                                cmdline_get_help_num((cmdline_parse_token_hdr_t*)&token,
@@ -472,8 +467,9 @@ test_parse_num_valid(void)
                        cmdline_get_help_num((cmdline_parse_token_hdr_t*)&token,
                                        buf, sizeof(buf));
 
-                       ret = cmdline_parse_num((cmdline_parse_token_hdr_t*) &token, num_valid_positive_strs[i].str,
-                                       (void*)&result);
+                       ret = cmdline_parse_num((cmdline_parse_token_hdr_t*) &token,
+                               num_valid_positive_strs[i].str,
+                               (void*)&result, sizeof(result));
 
                        /* if it should have passed but didn't, or if it should have failed but didn't */
                        if ((ret < 0) == (can_parse_unsigned(num_valid_positive_strs[i].result, type) > 0)) {
@@ -499,8 +495,9 @@ test_parse_num_valid(void)
                        cmdline_get_help_num((cmdline_parse_token_hdr_t*)&token,
                                        buf, sizeof(buf));
 
-                       ret = cmdline_parse_num((cmdline_parse_token_hdr_t*) &token, num_valid_negative_strs[i].str,
-                                       (void*)&result);
+                       ret = cmdline_parse_num((cmdline_parse_token_hdr_t*) &token,
+                               num_valid_negative_strs[i].str,
+                               (void*)&result, sizeof(result));
 
                        /* if it should have passed but didn't, or if it should have failed but didn't */
                        if ((ret < 0) == (can_parse_signed(num_valid_negative_strs[i].result, type) > 0)) {
@@ -548,8 +545,9 @@ test_parse_num_valid(void)
                        cmdline_get_help_num((cmdline_parse_token_hdr_t*)&token,
                                        buf, sizeof(buf));
 
-                       ret = cmdline_parse_num((cmdline_parse_token_hdr_t*) &token, num_garbage_positive_strs[i].str,
-                                       (void*)&result);
+                       ret = cmdline_parse_num((cmdline_parse_token_hdr_t*) &token,
+                               num_garbage_positive_strs[i].str,
+                               (void*)&result, sizeof(result));
 
                        /* if it should have passed but didn't, or if it should have failed but didn't */
                        if ((ret < 0) == (can_parse_unsigned(num_garbage_positive_strs[i].result, type) > 0)) {
@@ -575,8 +573,9 @@ test_parse_num_valid(void)
                        cmdline_get_help_num((cmdline_parse_token_hdr_t*)&token,
                                        buf, sizeof(buf));
 
-                       ret = cmdline_parse_num((cmdline_parse_token_hdr_t*) &token, num_garbage_negative_strs[i].str,
-                                       (void*)&result);
+                       ret = cmdline_parse_num((cmdline_parse_token_hdr_t*) &token,
+                               num_garbage_negative_strs[i].str,
+                               (void*)&result, sizeof(result));
 
                        /* if it should have passed but didn't, or if it should have failed but didn't */
                        if ((ret < 0) == (can_parse_signed(num_garbage_negative_strs[i].result, type) > 0)) {