From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com [40.107.92.69]) by mx.groups.io with SMTP id smtpd.web10.13735.1683101392054557674 for ; Wed, 03 May 2023 01:09:52 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@amd.com header.s=selector1 header.b=cOn9WgvT; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.92.69, mailfrom: abner.chang@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gTbITb3nbLg+n1vHx07Te8N5cr4ObmXgfsoRiL2Kyco89MarDzGOT6GVAqIHsr2pyOmpbJrTxu21GaGgHhfrWRUPPNM+eHRWuhu5jxuhcpnb5Z5In9bpWW3KxdHRS+dqg8AX1LCTnX5qJDJp2VqwHA5MRzQ6wbHJ18AJzhrMYMSlESw7PwjMP87yWhnUa1ygusBFXIhqlV9e6MpQyHR4096cZ3wt0iGeMzbEMR6C05lLucBSbZClCexsWMwQgYAH1zcNLAQEbKIgvWNc2x26m/nX4iaX5OQdyi94gPyk24S9QJ7PluRSZCLENGsSHrOtWC9zP+goXn7eZEaqnsdfDg== 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=6bAAUuZrlPG7Q5heBKt9a2gZCBbCgHJwgxrOCbBtpNk=; b=UY8LMCFBZ/in7T9uu6Upa3xJBgykrdpV6EEfe/5rvcJumwwvmNXyfsWrt6FRHcyT1naBDKGPJMT5d/JyGv3QB9jUqQj3Np81U4KsgP4V8u25kPzdL3nUtKBopohv2Sg1jYBuxZmucOaK46X9fTElydwlw8siY+wpEThVNhOpOkB8pkQ8ixxSD2tPWMw/z82eiu8dqU9tiyNjOgiftAgXlBAb1qxrQNrzy5ZLaJYKeK9m3RevK/JUilBocpMBfpOKgN9hty+Lm84Cr7zrBsEgm4o2kFmGJCTOOBAzoOU22BudA3Z9HNsC9xeSfkDUFngeD600y2MVSp5fzwiMke6mSw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6bAAUuZrlPG7Q5heBKt9a2gZCBbCgHJwgxrOCbBtpNk=; b=cOn9WgvTPUlyzL6pmWinpXGGjtLF/P3ldWiqunq33tChkRALFtZ5FZWVSNPAuiW6XhvckNRGrmhQ4RTXlfJV0NiPiUIgY+Uz+PkepMDs+6YvMmxb+OhVha8XZI30chdMGKCWBf0YPXPiLPUX0TtNjCVBCaFElWS3kKDqldJiwQQ= Received: from MW4PR04CA0116.namprd04.prod.outlook.com (2603:10b6:303:83::31) by PH0PR12MB8151.namprd12.prod.outlook.com (2603:10b6:510:299::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.30; Wed, 3 May 2023 08:09:48 +0000 Received: from CO1NAM11FT049.eop-nam11.prod.protection.outlook.com (2603:10b6:303:83:cafe::d0) by MW4PR04CA0116.outlook.office365.com (2603:10b6:303:83::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.20 via Frontend Transport; Wed, 3 May 2023 08:09:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT049.mail.protection.outlook.com (10.13.175.50) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6363.22 via Frontend Transport; Wed, 3 May 2023 08:09:48 +0000 Received: from TPE-L1-ABNCHANG.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 3 May 2023 03:09:46 -0500 From: "Chang, Abner" To: CC: Nickle Wang , Igor Kulchytskyy Subject: [edk2-redfish-client][PATCH] RedfishClientPkg/PrivateInclude: Private header file of JsonLib Date: Wed, 3 May 2023 16:09:26 +0800 Message-ID: <20230503080926.2046-1-abner.chang@amd.com> X-Mailer: git-send-email 2.37.1.windows.1 MIME-Version: 1.0 Return-Path: Abner.Chang@amd.com X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT049:EE_|PH0PR12MB8151:EE_ X-MS-Office365-Filtering-Correlation-Id: e6e8fc1e-d31f-4e55-8ad5-08db4badc358 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O4MadYcDxCTPEr5ONWIrxkFT/HASUaV5X5nZwdc8wy2Oi7OwE4UfKcNl1Qu0W2KwgH314Vg7CYY6gygh299+CQNd9CTs8XPeFwhVSoU7Z3yHN4arUTnS5nPmOunSX7a9WNGhkhGvs09TPMPi1czuh9Pg++DCyvNd27ZDoZrTC/cP/ridJxyFQzQ4pKloaFKSy58REr64WwIrwFMQbb2XgmZ9i15abQ5TZbc1v35zF5RbGU+NJuyhdUIYMZ013PxuLy5jLNRMnOa0VvqLhoTfk+Y9MzFtBt8Gvu2WhUqoQsVOq3JNKU7dWll5Js3b8Kkyx/ihnOcR3Cm+eE5tcaH+umBcjrEefGn8n6hOLWqkgtHw4vRv6iX2m3peZaOK+Fyrx7fZenBsvCgM4U32KoX/A+tztL2R/Xsr4sca4oTQgeVXnLTcA7TTV/y/3jFcMyPm1aLswaSp7btKRND9pl7VDuzbKq8/pRvgH/lo40Nh3w16QYMdHz/T7P2wKfOicaci+NWkQ+igZr4JQPdrIrq0Y0vSzJkw82M5C8ZspHv3xOiuj11OLTUhPXkS9nJOZfV5v19k8u9jE2IiZ6oiyl0Eh/F+OaGn4kP6OTDVHY4208q1oVKcFKjddfNQg8CdJdOH+4W6U3Is6di0jJi+uQTYmP/uknIfi0sIATjVncDbVPMHt3jZtOuVaYIDm5l457EFxG+xx4NOAqS9HtYExMoF908JXpKH0Wtaxm/Hsi/Xz9g= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(346002)(39860400002)(396003)(376002)(136003)(451199021)(40470700004)(36840700001)(46966006)(2906002)(478600001)(47076005)(70206006)(70586007)(5660300002)(8676002)(8936002)(426003)(336012)(2876002)(41300700001)(82740400003)(81166007)(356005)(54906003)(6916009)(316002)(4326008)(6666004)(40460700003)(36860700001)(2616005)(16526019)(1076003)(26005)(36756003)(186003)(86362001)(7696005)(82310400005)(40480700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2023 08:09:48.0280 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e6e8fc1e-d31f-4e55-8ad5-08db4badc358 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT049.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB8151 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain From: Abner Chang Private header file for using JsonLib. - Add missing definition in jansson.h due to build error in RedfishLib - Remove duplicated defines. Signed-off-by: Abner Chang Cc: Nickle Wang Cc: Igor Kulchytskyy --- RedfishClientPkg/RedfishClientPkg.dec | 1 + RedfishClientPkg/PrivateInclude/jansson.h | 71 +++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 RedfishClientPkg/PrivateInclude/jansson.h diff --git a/RedfishClientPkg/RedfishClientPkg.dec b/RedfishClientPkg/Redfi= shClientPkg.dec index 832cdc6154..8fa92d5b1e 100644 --- a/RedfishClientPkg/RedfishClientPkg.dec +++ b/RedfishClientPkg/RedfishClientPkg.dec @@ -16,6 +16,7 @@ Include =20 [Includes.Common.Private] + PrivateInclude # Private header files PrivateInclude/Crt # Private header files for C RTL. =20 [Protocols] diff --git a/RedfishClientPkg/PrivateInclude/jansson.h b/RedfishClientPkg/P= rivateInclude/jansson.h new file mode 100644 index 0000000000..900c7e39c6 --- /dev/null +++ b/RedfishClientPkg/PrivateInclude/jansson.h @@ -0,0 +1,71 @@ +/* + This is the wrapper of open source jansson header file for + using JsonLib library under RedfishPkg. + + (C) Copyright 2021 Hewlett Packard Enterprise Development LP
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + */ + +#ifndef REDFISH_CLIENT_JANSSON_H_ +#define REDFISH_CLIENT_JANSSON_H_ + +#include +#include + +typedef EDKII_JSON_VALUE json_t; +typedef EDKII_JSON_INT_T json_int_t; +typedef EDKII_JSON_TYPE json_type; + +#define JSON_INDENT(n) EDKII_JSON_INDENT(n) +#define JSON_ENSURE_ASCII EDKII_JSON_ENSURE_ASCII +#define JSON_OBJECT EdkiiJsonTypeObject +#define JSON_ARRAY EdkiiJsonTypeArray +#define JSON_STRING EdkiiJsonTypeString +#define JSON_INTEGER EdkiiJsonTypeInteger +#define JSON_REAL EdkiiJsonTypeReal +#define JSON_TRUE EdkiiJsonTypeTrue +#define JSON_FALSE EdkiiJsonTypeFalse +#define JSON_NULL EdkiiJsonTypeNull + +#define json_object_foreach_safe(object, n, key, value) EDKII_JSON_OBJECT= _FOREACH_SAFE(object, n, key, value) + +// +// Macros that directly map functions to JsonLib +// +#define json_object_get(json_t, key) JsonObjectGetValue(js= on_t, key) +#define json_object_size(json_t) JsonObjectSize(json_t= ) +#define json_array_get(json_t, index) JsonArrayGetValue(jso= n_t, index) +#define json_array_size(json_t) JsonArrayCount(json_t= ) +#define json_string_value(json_t) JsonValueGetAsciiStri= ng(json_t) +#define json_dumps(json_t, flags) JsonDumpString(json_t= , flags) +#define json_loads(string, flags, error) JsonLoadString(string= , flags, error) +#define json_loadb(buffer, buflen, flags, error) JsonLoadBuffer(buffer= , buflen, flags, error) +#define json_array_append_new(json_t_array, json_t) JsonArrayAppendValue(= json_t_array, json_t) +#define json_object_set_new(json_t, key, value) JsonObjectSetValue(js= on_t, key, value) +#define json_decref(json_t) JsonDecreaseReference= (json_t) +#define json_integer_value(json_t) JsonValueGetInteger(j= son_t) +#define json_is_object(json_t) JsonValueIsObject(jso= n_t) +#define json_is_array(json_t) JsonValueIsArray(json= _t) +#define json_is_string(json_t) JsonValueIsString(jso= n_t) +#define json_is_integer(json_t) JsonValueIsInteger(js= on_t) +#define json_is_number(json_t) JsonValueIsNumber(jso= n_t) +#define json_is_boolean(json_t) JsonValueIsBoolean(js= on_t) +#define json_is_true(json_t) JsonValueIsTrue(json_= t) +#define json_is_false(json_t) JsonValueIsFalse(json= _t) +#define json_is_null(json_t) JsonValueIsNull(json_= t) +#define json_incref(json_t) JsonIncreaseReference= (json_t) +#define json_object_set(json_t, key, value) JsonObjectSetValue(js= on_t, key, value) +#define json_array_append(json_t, value) JsonArrayAppendValue(= json_t, value) +#define json_object_iter(json_t) JsonObjectIterator(js= on_t) +#define json_object_iter_next(json_t, iter) JsonObjectIteratorNex= t(json_t, iter) +#define json_object_iter_value(iter) JsonObjectIteratorVal= ue(iter) +#define json_get_type(json_t) JsonGetType(json_t) + +#define json_object() JsonValueInitObject() +#define json_array() JsonValueInitArray() +#define json_string(string) JsonValueInitAsciiString(string) +#define json_integer(value) JsonValueInitInteger(value) +#define json_boolean(value) JsonValueInitBoolean(value) +#define json_null() JsonValueInitNull() +#endif --=20 2.37.1.windows.1