X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_cmdline_num.c;h=04263d39e950757747073cfd35fa3198a68e42ce;hb=43ea4004944404388c033055b130b53e8ba03806;hp=35f01a80579541f98823de039df40f52d28a1c2b;hpb=3031749c2df04a63cdcef186dcce3781e61436e8;p=dpdk.git

diff --git a/app/test/test_cmdline_num.c b/app/test/test_cmdline_num.c
index 35f01a8057..04263d39e9 100644
--- a/app/test/test_cmdline_num.c
+++ b/app/test/test_cmdline_num.c
@@ -346,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;
@@ -365,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;
@@ -395,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) {
@@ -433,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,
@@ -473,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)) {
@@ -500,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)) {
@@ -549,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)) {
@@ -576,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)) {