X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_cmdline_num.c;h=ec479cdb3a122897fd0d0ebafae244649cc2946d;hb=c2341bb6713dcaa43113db6f8ee3dd40ae57aba7;hp=04263d39e950757747073cfd35fa3198a68e42ce;hpb=aaa662e75c23c61a1d79bd4d1f9f35b4967c39db;p=dpdk.git diff --git a/app/test/test_cmdline_num.c b/app/test/test_cmdline_num.c index 04263d39e9..ec479cdb3a 100644 --- a/app/test/test_cmdline_num.c +++ b/app/test/test_cmdline_num.c @@ -1,34 +1,5 @@ -/*- - * BSD LICENSE - * - * 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 - * 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 - * 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 - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation */ #include @@ -245,48 +216,35 @@ const char * num_invalid_strs[] = { "\0", }; -#define NUM_POSITIVE_STRS_SIZE \ - (sizeof(num_valid_positive_strs) / sizeof(num_valid_positive_strs[0])) -#define NUM_NEGATIVE_STRS_SIZE \ - (sizeof(num_valid_negative_strs) / sizeof(num_valid_negative_strs[0])) -#define NUM_POSITIVE_GARBAGE_STRS_SIZE \ - (sizeof(num_garbage_positive_strs) / sizeof(num_garbage_positive_strs[0])) -#define NUM_NEGATIVE_GARBAGE_STRS_SIZE \ - (sizeof(num_garbage_negative_strs) / sizeof(num_garbage_negative_strs[0])) -#define NUM_INVALID_STRS_SIZE \ - (sizeof(num_invalid_strs) / sizeof(num_invalid_strs[0])) - - - 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; @@ -300,30 +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; - case INT8: + break; + 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; @@ -343,11 +302,10 @@ 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 */ - snprintf(buf, sizeof(buf), "%s", - num_valid_positive_strs[0].str); + strlcpy(buf, num_valid_positive_strs[0].str, sizeof(buf)); /* try all null */ ret = cmdline_parse_num(NULL, NULL, NULL, 0); @@ -417,11 +375,11 @@ 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 */ - for (i = 0; i < NUM_INVALID_STRS_SIZE; i++) { + for (i = 0; i < RTE_DIM(num_invalid_strs); i++) { memset(&result, 0, sizeof(uint64_t)); memset(&buf, 0, sizeof(buf)); @@ -456,11 +414,11 @@ 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 */ - for (i = 0; i < NUM_POSITIVE_STRS_SIZE; i++) { + for (i = 0; i < RTE_DIM(num_valid_positive_strs); i++) { result = 0; memset(&buf, 0, sizeof(buf)); @@ -488,7 +446,7 @@ test_parse_num_valid(void) } /* test negative strings */ - for (i = 0; i < NUM_NEGATIVE_STRS_SIZE; i++) { + for (i = 0; i < RTE_DIM(num_valid_negative_strs); i++) { result = 0; memset(&buf, 0, sizeof(buf)); @@ -510,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: @@ -534,11 +492,11 @@ 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 */ - for (i = 0; i < NUM_POSITIVE_GARBAGE_STRS_SIZE; i++) { + for (i = 0; i < RTE_DIM(num_garbage_positive_strs); i++) { result = 0; memset(&buf, 0, sizeof(buf)); @@ -566,7 +524,7 @@ test_parse_num_valid(void) } /* test negative strings */ - for (i = 0; i < NUM_NEGATIVE_GARBAGE_STRS_SIZE; i++) { + for (i = 0; i < RTE_DIM(num_garbage_negative_strs); i++) { result = 0; memset(&buf, 0, sizeof(buf)); @@ -588,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;