From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A5E6FA00BE; Tue, 28 Apr 2020 11:14:32 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 354A01D5C9; Tue, 28 Apr 2020 11:14:27 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id DEDAC1D5C4 for ; Tue, 28 Apr 2020 11:14:23 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from talshn@mellanox.com) with ESMTPS (AES256-SHA encrypted); 28 Apr 2020 12:14:21 +0300 Received: from l-wincomp04-vm.labs.mlnx (l-wincomp04-vm.mtl.labs.mlnx [10.237.1.5]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 03S9ELqu017200; Tue, 28 Apr 2020 12:14:21 +0300 From: talshn@mellanox.com To: dev@dpdk.org Cc: thomas@monjalon.net, pallavi.kadam@intel.com, dmitry.kozliuk@gmail.com, david.marchand@redhat.com, grive@u256.net, ranjit.menon@intel.com, navasile@linux.microsoft.com, Tal Shnaiderman Date: Tue, 28 Apr 2020 12:11:07 +0300 Message-Id: <20200428091111.13416-4-talshn@mellanox.com> X-Mailer: git-send-email 2.16.1.windows.4 In-Reply-To: <20200428091111.13416-1-talshn@mellanox.com> References: <20200428091111.13416-1-talshn@mellanox.com> Subject: [dpdk-dev] [PATCH v2 3/7] eal: add function finding integer in a string X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Tal Shnaiderman Addition of a function to skip leading chars which are not part of the numeric base and return the number in the needed base. This is needed to call strtoul correctly and will be used by bus/PCI to get the BDF from a PCI output. Signed-off-by: Tal Shnaiderman --- lib/librte_eal/common/eal_common_string_fns.c | 29 +++++++++++++++++++++++++++ lib/librte_eal/include/rte_string_fns.h | 17 ++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/lib/librte_eal/common/eal_common_string_fns.c b/lib/librte_eal/common/eal_common_string_fns.c index 60c5dd66f..29d1539da 100644 --- a/lib/librte_eal/common/eal_common_string_fns.c +++ b/lib/librte_eal/common/eal_common_string_fns.c @@ -8,6 +8,7 @@ #include #include +#include /* split string into tokens */ int @@ -64,3 +65,31 @@ rte_strscpy(char *dst, const char *src, size_t dsize) dst[res - 1] = '\0'; return -E2BIG; } + +/* Skip leading chars to return the number in the needed base + * + * Return 0 and rte_errno if no number found, + * Otherwise return the number in the needed base + */ +unsigned long +rte_find_numerical_value(char *str, int base) +{ + unsigned int num = 0; + uint8_t i = 0; + + if (str == NULL) + goto einval_error; + + while (str[i]) { + if ((base == 10 && isdigit(str[i])) || + (base == 16 && isxdigit(str[i]))) { + num = strtoul(&str[i], NULL, base); + goto end; + } + i++; + } +einval_error: + rte_errno = EINVAL; +end: + return num; +} diff --git a/lib/librte_eal/include/rte_string_fns.h b/lib/librte_eal/include/rte_string_fns.h index 8bac8243c..df6e07dd3 100644 --- a/lib/librte_eal/include/rte_string_fns.h +++ b/lib/librte_eal/include/rte_string_fns.h @@ -50,6 +50,23 @@ int rte_strsplit(char *string, int stringlen, char **tokens, int maxtokens, char delim); +/** + * Skips leading characters to return a number in the needed base + * + * @param str + * The input string to search upon + * + * @param base + * The base of the needed number. + * (currently supports bases 10 and 16) + * + * @return + * - the number in the correct base if found + * - zero and rte_errno = EINVAL if no number was found + */ +unsigned long +rte_find_numerical_value(char *str, int base); + /** * @internal * DPDK-specific version of strlcpy for systems without -- 2.16.1.windows.4