X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_cmdline_num.c;h=9276de59bdc252af5ffbc6ba3cc43750f5139acc;hb=6622d9c97e2fb7b3b2867749a8f6f4ca1373ee79;hp=a6ad955072d493eb7ac37af9f6e277375e502e76;hpb=71bdd8a1785d25f91de7908ff915e4db7871eb2b;p=dpdk.git

diff --git a/app/test/test_cmdline_num.c b/app/test/test_cmdline_num.c
index a6ad955072..9276de59bd 100644
--- a/app/test/test_cmdline_num.c
+++ b/app/test/test_cmdline_num.c
@@ -200,8 +200,8 @@ const char * num_invalid_strs[] = {
 		"-0x1234580A",
 		"-0b0111010101",
 		/* too long (128+ chars) */
-		"0b1111000011110000111100001111000011110000111100001111000011110000"
-		  "1111000011110000111100001111000011110000111100001111000011110000",
+		("0b1111000011110000111100001111000011110000111100001111000011110000"
+		  "1111000011110000111100001111000011110000111100001111000011110000"),
 		"1E3",
 		"0A",
 		"-B",
@@ -220,31 +220,31 @@ static int
 can_parse_unsigned(uint64_t expected_result, enum cmdline_numtype type)
 {
 	switch (type) {
-	case UINT8:
+	case RTE_UINT8:
 		if (expected_result > UINT8_MAX)
 			return 0;
 		break;
-	case UINT16:
+	case RTE_UINT16:
 		if (expected_result > UINT16_MAX)
 			return 0;
 		break;
-	case UINT32:
+	case RTE_UINT32:
 		if (expected_result > UINT32_MAX)
 			return 0;
 		break;
-	case INT8:
+	case RTE_INT8:
 		if (expected_result > INT8_MAX)
 			return 0;
 		break;
-	case INT16:
+	case RTE_INT16:
 		if (expected_result > INT16_MAX)
 			return 0;
 		break;
-	case INT32:
+	case RTE_INT32:
 		if (expected_result > INT32_MAX)
 			return 0;
 		break;
-	case INT64:
+	case RTE_INT64:
 		if (expected_result > INT64_MAX)
 			return 0;
 		break;
@@ -258,31 +258,31 @@ static int
 can_parse_signed(int64_t expected_result, enum cmdline_numtype type)
 {
 	switch (type) {
-	case UINT8:
+	case RTE_UINT8:
 		if (expected_result > UINT8_MAX || expected_result < 0)
 			return 0;
 		break;
-	case UINT16:
+	case RTE_UINT16:
 		if (expected_result > UINT16_MAX || expected_result < 0)
 			return 0;
 		break;
-	case UINT32:
+	case RTE_UINT32:
 		if (expected_result > UINT32_MAX || expected_result < 0)
 			return 0;
 		break;
-	case UINT64:
+	case RTE_UINT64:
 		if (expected_result < 0)
 			return 0;
 		break;
-	case INT8:
+	case RTE_INT8:
 		if (expected_result > INT8_MAX || expected_result < INT8_MIN)
 			return 0;
 		break;
-	case INT16:
+	case RTE_INT16:
 		if (expected_result > INT16_MAX || expected_result < INT16_MIN)
 			return 0;
 		break;
-	case INT32:
+	case RTE_INT32:
 		if (expected_result > INT32_MAX || expected_result < INT32_MIN)
 			return 0;
 		break;
@@ -302,7 +302,7 @@ test_parse_num_invalid_param(void)
 	int ret = 0;
 
 	/* set up a token */
-	token.num_data.type = UINT32;
+	token.num_data.type = RTE_UINT32;
 
 	/* copy string to buffer */
 	strlcpy(buf, num_valid_positive_strs[0].str, sizeof(buf));
@@ -375,7 +375,7 @@ test_parse_num_invalid_data(void)
 	cmdline_parse_token_num_t token;
 
 	/* cycle through all possible parsed types */
-	for (type = UINT8; type <= INT64; type++) {
+	for (type = RTE_UINT8; type <= RTE_INT64; type++) {
 		token.num_data.type = type;
 
 		/* test full strings */
@@ -414,7 +414,7 @@ test_parse_num_valid(void)
 	/** valid strings **/
 
 	/* cycle through all possible parsed types */
-	for (type = UINT8; type <= INT64; type++) {
+	for (type = RTE_UINT8; type <= RTE_INT64; type++) {
 		token.num_data.type = type;
 
 		/* test positive strings */
@@ -468,13 +468,13 @@ test_parse_num_valid(void)
 			if (ret > 0) {
 				/* detect negative */
 				switch (type) {
-				case INT8:
+				case RTE_INT8:
 					result = (int8_t) result;
 					break;
-				case INT16:
+				case RTE_INT16:
 					result = (int16_t) result;
 					break;
-				case INT32:
+				case RTE_INT32:
 					result = (int32_t) result;
 					break;
 				default:
@@ -492,7 +492,7 @@ test_parse_num_valid(void)
 	/** garbage strings **/
 
 	/* cycle through all possible parsed types */
-	for (type = UINT8; type <= INT64; type++) {
+	for (type = RTE_UINT8; type <= RTE_INT64; type++) {
 		token.num_data.type = type;
 
 		/* test positive garbage strings */
@@ -546,15 +546,15 @@ test_parse_num_valid(void)
 			if (ret > 0) {
 				/* detect negative */
 				switch (type) {
-				case INT8:
+				case RTE_INT8:
 					if (result & (INT8_MAX + 1))
 						result |= 0xFFFFFFFFFFFFFF00ULL;
 					break;
-				case INT16:
+				case RTE_INT16:
 					if (result & (INT16_MAX + 1))
 						result |= 0xFFFFFFFFFFFF0000ULL;
 					break;
-				case INT32:
+				case RTE_INT32:
 					if (result & (INT32_MAX + 1ULL))
 						result |= 0xFFFFFFFF00000000ULL;
 					break;