From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=jiaxin.wu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 829DB222CB332 for ; Mon, 25 Dec 2017 22:30:28 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Dec 2017 22:35:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,458,1508828400"; d="scan'208";a="190005813" Received: from jiaxinwu-mobl2.ccr.corp.intel.com ([10.239.196.165]) by fmsmga006.fm.intel.com with ESMTP; 25 Dec 2017 22:35:21 -0800 From: Jiaxin Wu To: edk2-devel@lists.01.org Cc: Wang Fan , Ye Ting , Fu Siyuan , Wu Jiaxin Date: Tue, 26 Dec 2017 14:35:14 +0800 Message-Id: <1514270114-5776-3-git-send-email-jiaxin.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1514270114-5776-1-git-send-email-jiaxin.wu@intel.com> References: <1514270114-5776-1-git-send-email-jiaxin.wu@intel.com> Subject: [Patch 2/2] NetworkPkg/HttpDxe: Remove the unnecessary ASSERT. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Dec 2017 06:30:28 -0000 Cc: Wang Fan Cc: Ye Ting Cc: Fu Siyuan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Wu Jiaxin --- NetworkPkg/HttpDxe/HttpImpl.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/NetworkPkg/HttpDxe/HttpImpl.c b/NetworkPkg/HttpDxe/HttpImpl.c index fe1c3b7..b3a64cf 100644 --- a/NetworkPkg/HttpDxe/HttpImpl.c +++ b/NetworkPkg/HttpDxe/HttpImpl.c @@ -63,11 +63,10 @@ EfiHttpGetModeData ( if ((This == NULL) || (HttpConfigData == NULL)) { return EFI_INVALID_PARAMETER; } HttpInstance = HTTP_INSTANCE_FROM_PROTOCOL (This); - ASSERT (HttpInstance != NULL); if ((HttpConfigData->AccessPoint.IPv6Node == NULL) || (HttpConfigData->AccessPoint.IPv4Node == NULL)) { return EFI_INVALID_PARAMETER; } @@ -147,11 +146,11 @@ EfiHttpConfigure ( (!HttpConfigData->LocalAddressIsIPv6 && HttpConfigData->AccessPoint.IPv4Node == NULL)))) { return EFI_INVALID_PARAMETER; } HttpInstance = HTTP_INSTANCE_FROM_PROTOCOL (This); - ASSERT (HttpInstance != NULL && HttpInstance->Service != NULL); + ASSERT (HttpInstance->Service != NULL); if (HttpConfigData != NULL) { if (HttpConfigData->HttpVersion >= HttpVersionUnsupported) { return EFI_UNSUPPORTED; @@ -289,11 +288,10 @@ EfiHttpRequest ( (Request->Method != HttpMethodPost) && (Request->Method != HttpMethodPatch)) { return EFI_UNSUPPORTED; } HttpInstance = HTTP_INSTANCE_FROM_PROTOCOL (This); - ASSERT (HttpInstance != NULL); // // Capture the method into HttpInstance. // if (Request != NULL) { @@ -623,12 +621,10 @@ EfiHttpRequest ( if (EFI_ERROR (Status) || NULL == RequestMsg) { goto Error3; } - ASSERT (RequestMsg != NULL); - // // Every request we insert a TxToken and a response call would remove the TxToken. // In cases of PUT/POST/PATCH, after an initial request-response pair, we would do a // continuous request without a response call. So, in such cases, where Request // structure is NULL, we would not insert a TxToken. @@ -885,11 +881,10 @@ EfiHttpCancel ( if (This == NULL) { return EFI_INVALID_PARAMETER; } HttpInstance = HTTP_INSTANCE_FROM_PROTOCOL (This); - ASSERT (HttpInstance != NULL); if (HttpInstance->State != HTTP_STATE_TCP_CONNECTED) { return EFI_NOT_STARTED; } @@ -1543,11 +1538,10 @@ EfiHttpResponse ( if (HttpMsg == NULL) { return EFI_INVALID_PARAMETER; } HttpInstance = HTTP_INSTANCE_FROM_PROTOCOL (This); - ASSERT (HttpInstance != NULL); if (HttpInstance->State != HTTP_STATE_TCP_CONNECTED) { return EFI_NOT_STARTED; } @@ -1639,11 +1633,10 @@ EfiHttpPoll ( if (This == NULL) { return EFI_INVALID_PARAMETER; } HttpInstance = HTTP_INSTANCE_FROM_PROTOCOL (This); - ASSERT (HttpInstance != NULL); if (HttpInstance->State != HTTP_STATE_TCP_CONNECTED) { return EFI_NOT_STARTED; } -- 1.9.5.msysgit.1