From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (NAM11-DM6-obe.outbound.protection.outlook.com [40.107.223.53]) by mx.groups.io with SMTP id smtpd.web10.8220.1685973021688866124 for ; Mon, 05 Jun 2023 06:50:21 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@nvidia.com header.s=selector2 header.b=kVlSmlbn; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: nvidia.com, ip: 40.107.223.53, mailfrom: nicklew@nvidia.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NyyySIaPalBgwTbxTn/WSfTv9Bj5lJ6oHgodbB2gyZe1CzTJL5dkCM6DpjcfA8VFs2yy9HBh4351WLusDEusfD7HzwY4zoVlgr8m2jWNgN1YFRLv5BCOwJDxarY1bLGyH749m1+sYl+c2bBt8citFK3YmyUbAApk5x1V/VH8cZKMBC033cFmHILxhwMJx2b0xI4rnSY2MpFl4SWTpZKJ03I0Gmdu7NUvGc5GAAe6bdncNhh3qH2Y5gCGM/Na3qsDArx6mX4/5NLvtyKUCtqqC4sJ7Q7TleBO+QgL2+y1EvvIU9evBlKoZAkfLOf4s6wWXpltm9SJDGwKqaMiilb86Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LAqeRCwaCXDcpLpy2Gy/MtQeiHIXZWOO9ovqMeZvJ2g=; b=LfG8xHvHSHlnDqhC+zpwV+uU8FwNzYfFBTKR+yoNVQ5o+o9FBh+UzDHZf92eyqGFjcV5//4qdzIElx/rhfpvR91FuVwoe6cihVw5eQgiYjqigN156BwAe/s5jex8kMJC06tdXXKdpS1fTXqhn6EPM1KbI+Zh1NgOm4xlgdVw/p+DHRo+IYWytOi1KjxhbuYLRa9i+dtEaWaZXDv2iBClRphubpnt81QNQq7MJv6Z91qdBFRsU7o3e+9x7YuuZhHFF0S+iVOlIf3J6FLCkgd4VK8DU8Ez0Xa/GmfFQgDurnqXhMZllMUqlJKOwbDiVejoVpZwFBXNWGT8BXAUyEFGSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LAqeRCwaCXDcpLpy2Gy/MtQeiHIXZWOO9ovqMeZvJ2g=; b=kVlSmlbnT51B20Tvuf6JtHAW8sJVN7ItMS8VqwXpvHW9wL0krkcKrlI9Bcct1MOAh3ttJDeUIquCF3XZ64TVCkFYDpLtTuVVPfKJBthKX8SOE/hdITuna88Z/kpk8VFI2cNYG7zVrDebD7zH1x41cyncv+3L1hDk1aLIM1r6CU+8agl80DTlbPvN9Ag2xSOIS9yKspIv30ewpYheAQ0hCp3At3ogDBCM7J+lOxs9RaMAOCrocfpBfXRnjndQJ+9zbCDNXsLqEn/g0dcrUmO68VJHVXFXHnd6alO5mBJMDf9TZC7cwzmWQIGzdt/LA8Jv7y27aumAXCd2xUjM3SccdA== Received: from BN9PR03CA0919.namprd03.prod.outlook.com (2603:10b6:408:107::24) by MN2PR12MB4358.namprd12.prod.outlook.com (2603:10b6:208:24f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.33; Mon, 5 Jun 2023 13:50:18 +0000 Received: from BN8NAM11FT105.eop-nam11.prod.protection.outlook.com (2603:10b6:408:107:cafe::dd) by BN9PR03CA0919.outlook.office365.com (2603:10b6:408:107::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.33 via Frontend Transport; Mon, 5 Jun 2023 13:50:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BN8NAM11FT105.mail.protection.outlook.com (10.13.176.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.32 via Frontend Transport; Mon, 5 Jun 2023 13:50:18 +0000 Received: from rnnvmail203.nvidia.com (10.129.68.9) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Mon, 5 Jun 2023 06:50:06 -0700 Received: from rnnvmail202.nvidia.com (10.129.68.7) by rnnvmail203.nvidia.com (10.129.68.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Mon, 5 Jun 2023 06:50:06 -0700 Received: from NV-CL38DL3.nvidia.com (10.127.8.13) by mail.nvidia.com (10.129.68.7) with Microsoft SMTP Server id 15.2.986.37 via Frontend Transport; Mon, 5 Jun 2023 06:50:05 -0700 From: "Nickle Wang" To: CC: Abner Chang , Igor Kulchytskyy Subject: [edk2-redfish-client][PATCH 4/9] RedfishClientPkg/RedfishFeatureUtilityLib: Fix build error Date: Mon, 5 Jun 2023 21:50:04 +0800 Message-ID: <20230605135004.25498-1-nicklew@nvidia.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Return-Path: nicklew@nvidia.com X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT105:EE_|MN2PR12MB4358:EE_ X-MS-Office365-Filtering-Correlation-Id: bc4aada0-54bc-4e1d-3f3c-08db65cbcc83 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lcBTfN2sMsEqy1ejAssAhA56YfqkcuXR3lL4cqQEY5Q3RgXGLJgal13S5wptbkvVC8bD/wR3q3fZct3QB6H/SEJwJLbUMUkWuwTMWODmqptGg4kh2ZHea5PAyqNxaO5hOsF7eTSo8e31TJ/QYHf4ejgA7jke0tDEbw/y20Do15odatZEDrSq9oaOQSB84rjHLjWZdqzAu6q0K70VT8meAUxovnKcs3hkwVHCHm/FItn6dDBtYORn0nAuXI9hhhkNT3s2VOEGpYFo5ay7KtqwX+hFbx7TnyW2Hjj0NPoaPreyKNYn/fh9fpwIa+hihVoBVbrokg0WdIIRW8kWRAHma91Smw/k0zskdd3k3MIUp6D3+MVIU8b3eEWInh22HrqjSjVXDMsAq+JzfMPb4gH41hqwPGi6G5D8XG0ouI6mE2a/Odv8Lfif9C/M5n2ApdTE9nAkP1O+qz4w+bUUfUTPeUrKkzH1Y0Ofab161ypgfUelC/9xNVmnnMZCTWAVo6ew5tqQUejKGibJUY2UCWtBT0qr4K/klXLwqgaAsrpMF+NWc1JV1m8Rx5YN+85kx7HHEyXioIWRlY3QGRJ7tqcegIR1p1fZc8lYCWZQuo2JNble9VWbldpR2EqtdBeNH5Ps9Qi+vJ9Y1r+42LNYJkAc1i/daj1udx3ALNrWnZ5bw5q/SFXQcJ422z+YaVnANBS+uieKDl6cfUu0ljqo5Bm5SvXdKuaQe+IjEzAG5Xh9a8ODNz/i2hguQRWFr0oa7wAC X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230028)(4636009)(346002)(396003)(376002)(136003)(39860400002)(451199021)(40470700004)(36840700001)(46966006)(54906003)(40460700003)(478600001)(5660300002)(8936002)(8676002)(36756003)(2906002)(86362001)(82310400005)(4326008)(6916009)(70206006)(70586007)(316002)(82740400003)(40480700001)(7636003)(356005)(41300700001)(83380400001)(47076005)(1076003)(2616005)(26005)(186003)(336012)(426003)(36860700001)(7696005);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2023 13:50:18.4945 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bc4aada0-54bc-4e1d-3f3c-08db65cbcc83 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT105.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4358 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain Follow latest definition of EDKII_REDFISH_VALUE_TYPES and rename all corresponding variable in RedfishFeatureUtilityLib. Signed-off-by: Nickle Wang Cc: Abner Chang Cc: Igor Kulchytskyy --- .../RedfishFeatureUtilityLib.c | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/RedfishClientPkg/Library/RedfishFeatureUtilityLib/RedfishFeatu= reUtilityLib.c b/RedfishClientPkg/Library/RedfishFeatureUtilityLib/RedfishF= eatureUtilityLib.c index ab0b650c..1e5c3f11 100644 --- a/RedfishClientPkg/Library/RedfishFeatureUtilityLib/RedfishFeatureUtili= tyLib.c +++ b/RedfishClientPkg/Library/RedfishFeatureUtilityLib/RedfishFeatureUtili= tyLib.c @@ -308,7 +308,7 @@ ApplyFeatureSettingsStringType ( if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s failed: %r\n", __func__, Schema, Ve= rsion, ConfigureLang, Status)); } else { - if (RedfishValue.Type !=3D REDFISH_VALUE_TYPE_STRING) { + if (RedfishValue.Type !=3D RedfishValueTypeString) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s value is not string type\n", __fu= nc__, Schema, Version, ConfigureLang)); return EFI_DEVICE_ERROR; } @@ -374,7 +374,7 @@ ApplyFeatureSettingsNumericType ( if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s failed: %r\n", __func__, Schema, Ve= rsion, ConfigureLang, Status)); } else { - if (RedfishValue.Type !=3D REDFISH_VALUE_TYPE_INTEGER) { + if (RedfishValue.Type !=3D RedfishValueTypeInteger) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s value is not numeric type\n", __f= unc__, Schema, Version, ConfigureLang)); return EFI_DEVICE_ERROR; } @@ -439,7 +439,7 @@ ApplyFeatureSettingsBooleanType ( if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s failed: %r\n", __func__, Schema, Ve= rsion, ConfigureLang, Status)); } else { - if (RedfishValue.Type !=3D REDFISH_VALUE_TYPE_BOOLEAN) { + if (RedfishValue.Type !=3D RedfishValueTypeBoolean) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s value is not boolean type\n", __f= unc__, Schema, Version, ConfigureLang)); return EFI_DEVICE_ERROR; } @@ -542,11 +542,11 @@ ApplyFeatureSettingsVagueType ( // Initial property data type and value. // if (CurrentVagueValuePtr->Value->DataType =3D=3D RedfishCS_Vague_DataT= ype_String) { - PropertyDatatype =3D REDFISH_VALUE_TYPE_STRING; + PropertyDatatype =3D RedfishValueTypeString; } else if (CurrentVagueValuePtr->Value->DataType =3D=3D RedfishCS_Vagu= e_DataType_Bool) { - PropertyDatatype =3D REDFISH_VALUE_TYPE_BOOLEAN; + PropertyDatatype =3D RedfishValueTypeBoolean; } else if (CurrentVagueValuePtr->Value->DataType =3D=3D RedfishCS_Vagu= e_DataType_Int64) { - PropertyDatatype =3D REDFISH_VALUE_TYPE_INTEGER; + PropertyDatatype =3D RedfishValueTypeInteger; } else { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s Unsupported Redfish property data= type\n", __func__, Schema, Version, ConfigureLang)); goto ErrorContinue; @@ -564,7 +564,7 @@ ApplyFeatureSettingsVagueType ( goto ErrorContinue; } =20 - if (PropertyDatatype =3D=3D REDFISH_VALUE_TYPE_STRING) { + if (PropertyDatatype =3D=3D RedfishValueTypeString) { // // This is a string property. // @@ -587,7 +587,7 @@ ApplyFeatureSettingsVagueType ( } else { DEBUG ((DEBUG_MANAGEABILITY, "%a, %a.%a %s value is: %a\n", __fu= nc__, Schema, Version, ConfigureKeyLang, RedfishValue.Value.Buffer, Status)= ); } - } else if (PropertyDatatype =3D=3D REDFISH_VALUE_TYPE_BOOLEAN) { + } else if (PropertyDatatype =3D=3D RedfishValueTypeBoolean) { // // This is a boolean property. // @@ -619,7 +619,7 @@ ApplyFeatureSettingsVagueType ( } else { DEBUG ((DEBUG_MANAGEABILITY, "%a, %a.%a %s value is: %a\n", __fu= nc__, Schema, Version, ConfigureKeyLang, (RedfishValue.Value.Boolean ? "Tru= e" : "False"), Status)); } - } else if (PropertyDatatype =3D=3D REDFISH_VALUE_TYPE_INTEGER) { + } else if (PropertyDatatype =3D=3D RedfishValueTypeInteger) { // // This is a integer property. // @@ -695,12 +695,12 @@ FreeArrayTypeRedfishValue ( return; } =20 - if ((RedfishValue->Type !=3D REDFISH_VALUE_TYPE_INTEGER_ARRAY) && (Redfi= shValue->Type !=3D REDFISH_VALUE_TYPE_STRING_ARRAY)) { + if ((RedfishValue->Type !=3D RedfishValueTypeIntegerArray) && (RedfishVa= lue->Type !=3D RedfishValueTypeStringArray)) { return; } =20 switch (RedfishValue->Type) { - case REDFISH_VALUE_TYPE_STRING_ARRAY: + case RedfishValueTypeStringArray: for (Index =3D 0; Index < RedfishValue->ArrayCount; Index++) { FreePool (RedfishValue->Value.StringArray[Index]); } @@ -709,12 +709,12 @@ FreeArrayTypeRedfishValue ( RedfishValue->Value.StringArray =3D NULL; break; =20 - case REDFISH_VALUE_TYPE_INTEGER_ARRAY: + case RedfishValueTypeIntegerArray: FreePool (RedfishValue->Value.IntegerArray); RedfishValue->Value.IntegerArray =3D NULL; break; =20 - case REDFISH_VALUE_TYPE_BOOLEAN_ARRAY: + case RedfishValueTypeBooleanArray: FreePool (RedfishValue->Value.BooleanArray); RedfishValue->Value.BooleanArray =3D NULL; break; @@ -763,7 +763,7 @@ ApplyFeatureSettingsStringArrayType ( if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s failed: %r\n", __func__, Schema, Ve= rsion, ConfigureLang, Status)); } else { - if (RedfishValue.Type !=3D REDFISH_VALUE_TYPE_STRING_ARRAY) { + if (RedfishValue.Type !=3D RedfishValueTypeStringArray) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s value is not string array type\n"= , __func__, Schema, Version, ConfigureLang)); return EFI_DEVICE_ERROR; } @@ -866,7 +866,7 @@ ApplyFeatureSettingsNumericArrayType ( if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s failed: %r\n", __func__, Schema, Ve= rsion, ConfigureLang, Status)); } else { - if (RedfishValue.Type !=3D REDFISH_VALUE_TYPE_INTEGER_ARRAY) { + if (RedfishValue.Type !=3D RedfishValueTypeIntegerArray) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s value is not string array type\n"= , __func__, Schema, Version, ConfigureLang)); return EFI_DEVICE_ERROR; } @@ -964,7 +964,7 @@ ApplyFeatureSettingsBooleanArrayType ( if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s failed: %r\n", __func__, Schema, Ve= rsion, ConfigureLang, Status)); } else { - if (RedfishValue.Type !=3D REDFISH_VALUE_TYPE_BOOLEAN_ARRAY) { + if (RedfishValue.Type !=3D RedfishValueTypeBooleanArray) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s value is not string array type\n"= , __func__, Schema, Version, ConfigureLang)); return EFI_DEVICE_ERROR; } @@ -2299,7 +2299,7 @@ GetPropertyStringValue ( return NULL; } =20 - if (RedfishValue.Type !=3D REDFISH_VALUE_TYPE_STRING) { + if (RedfishValue.Type !=3D RedfishValueTypeString) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s value is not string type\n", __func= __, Schema, Version, ConfigureLang)); return NULL; } @@ -2357,7 +2357,7 @@ GetPropertyNumericValue ( return NULL; } =20 - if (RedfishValue.Type !=3D REDFISH_VALUE_TYPE_INTEGER) { + if (RedfishValue.Type !=3D RedfishValueTypeInteger) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s value is not numeric type\n", __fun= c__, Schema, Version, ConfigureLang)); return NULL; } @@ -2419,7 +2419,7 @@ GetPropertyBooleanValue ( return NULL; } =20 - if (RedfishValue.Type !=3D REDFISH_VALUE_TYPE_BOOLEAN) { + if (RedfishValue.Type !=3D RedfishValueTypeBoolean) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s value is not boolean type\n", __fun= c__, Schema, Version, ConfigureLang)); return NULL; } @@ -2520,7 +2520,7 @@ GetPropertyStringArrayValue ( return NULL; } =20 - if (RedfishValue.Type !=3D REDFISH_VALUE_TYPE_STRING_ARRAY) { + if (RedfishValue.Type !=3D RedfishValueTypeStringArray) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s value is not string array type\n", = __func__, Schema, Version, ConfigureLang)); return NULL; } @@ -2591,7 +2591,7 @@ GetPropertyNumericArrayValue ( return NULL; } =20 - if (RedfishValue.Type !=3D REDFISH_VALUE_TYPE_INTEGER_ARRAY) { + if (RedfishValue.Type !=3D RedfishValueTypeIntegerArray) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s value is not string array type\n", = __func__, Schema, Version, ConfigureLang)); return NULL; } @@ -2662,7 +2662,7 @@ GetPropertyBooleanArrayValue ( return NULL; } =20 - if (RedfishValue.Type !=3D REDFISH_VALUE_TYPE_BOOLEAN_ARRAY) { + if (RedfishValue.Type !=3D RedfishValueTypeBooleanArray) { DEBUG ((DEBUG_ERROR, "%a, %a.%a %s value is not string array type\n", = __func__, Schema, Version, ConfigureLang)); return NULL; } @@ -2757,7 +2757,7 @@ NewEmptyPropKeyValueFromRedfishValue ( return NULL; } =20 - if (RedfishValue->Type =3D=3D REDFISH_VALUE_TYPE_BOOLEAN) { + if (RedfishValue->Type =3D=3D RedfishValueTypeBoolean) { VagueValue->DataType =3D RedfishCS_Vague_DataType_Bool; DataSize =3D sizeof (BOOLEAN); // @@ -2766,11 +2766,11 @@ NewEmptyPropKeyValueFromRedfishValue ( // Bool32 =3D (INT32)RedfishValue->Value.Boolean; Data =3D (VOID *)&Bool32; - } else if (RedfishValue->Type =3D=3D REDFISH_VALUE_TYPE_INTEGER) { + } else if (RedfishValue->Type =3D=3D RedfishValueTypeInteger) { VagueValue->DataType =3D RedfishCS_Vague_DataType_Int64; DataSize =3D sizeof (INT64); Data =3D (VOID *)&RedfishValue->Value.Integer; - } else if (RedfishValue->Type =3D=3D REDFISH_VALUE_TYPE_STRING) { + } else if (RedfishValue->Type =3D=3D RedfishValueTypeString) { VagueValue->DataType =3D RedfishCS_Vague_DataType_String; DataSize =3D AsciiStrSize (RedfishValue->Value.Buffer); Data =3D (VOID *)RedfishValue->Value.Buffer; --=20 2.17.1