From d65b183f92446a3a2855c1c7dd4a7a1b760af381 Mon Sep 17 00:00:00 2001 From: Nickle Wang Date: Fri, 12 Jan 2024 23:35:09 +0800 Subject: RedfishPkg/RedfishCrtLib: handle floating point number in JSON When the value type is defined as number in Redfish schema, floating point number is allowed. RedfishCrtLib raises assert without handling this case now. Follow the way in EDK2 to call AsciiStrDecimalToUintnS and handle the floating point number. Only the integer value is returned. Signed-off-by: Nickle Wang Cc: Abner Chang Cc: Igor Kulchytskyy Cc: Nick Ramirez Reviewed-by: Abner Chang --- .../PrivateLibrary/RedfishCrtLib/RedfishCrtLib.c | 32 ++++++++++++++++++---- 1 file changed, 27 insertions(+), 5 deletions(-) (limited to 'RedfishPkg/PrivateLibrary') diff --git a/RedfishPkg/PrivateLibrary/RedfishCrtLib/RedfishCrtLib.c b/RedfishPkg/PrivateLibrary/RedfishCrtLib/RedfishCrtLib.c index 57a997f351..902dd0b3a0 100644 --- a/RedfishPkg/PrivateLibrary/RedfishCrtLib/RedfishCrtLib.c +++ b/RedfishPkg/PrivateLibrary/RedfishCrtLib/RedfishCrtLib.c @@ -4,6 +4,7 @@ Copyright (c) 2019, Intel Corporation. All rights reserved.
(C) Copyright 2020 Hewlett Packard Enterprise Development LP
+ Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent @@ -519,7 +520,7 @@ strtoull ( } /** - edk2 Jansson port does not support doubles, simply return 0. + edk2 Jansson port does not support doubles, simply return integer part. These conversion functions convert the initial portion of the string pointed to by nptr to double, float, and long double representation, @@ -540,7 +541,7 @@ strtoull ( the return value), and ERANGE is stored in errno. If the correct value would cause underflow, zero is returned and ERANGE is stored in errno. - @return Return 0. + @return Integer part of decimal number. **/ double strtod ( @@ -548,9 +549,30 @@ strtod ( char **__restrict endptr ) { - DEBUG ((DEBUG_ERROR, "We don't supprot double type on edk2 yet!")); - ASSERT (FALSE); - return (double)0; + UINTN Data; + UINTN StrLen; + + Data = 0; + StrLen = 0; + + if (nptr == NULL) { + return (double)0; + } + + AsciiStrDecimalToUintnS (nptr, NULL, &Data); + DEBUG ((DEBUG_WARN, "%a: \"%a\" We don't support double type on edk2 yet. Only integer part is returned: %d\n", __func__, nptr, Data)); + + // + // Force endptr to the last position of nptr because caller may + // check endptr and raise assertion. We don't support floating + // number in edk2 so this prevents unecessary assertion from happening. + // + if (endptr != NULL) { + StrLen = AsciiStrLen (nptr); + *endptr = (char *__restrict)nptr + StrLen; + } + + return (double)Data; } static UINT8 BitMask[] = { -- cgit v1.2.3