From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.120]) by mx.groups.io with SMTP id smtpd.web09.6860.1581039642378359387 for ; Thu, 06 Feb 2020 17:40:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=X1HqDW59; spf=pass (domain: redhat.com, ip: 207.211.31.120, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581039641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m2nbHkND41Svx0kNVgGevBmzsztaj/NEUVvdwdCg4lE=; b=X1HqDW59uQmIHocCAzxJW8aW6T8Wap5701vqS18ip64b8jN5QQXGfV2MWdr4fCYPLgm0w1 74H+DkvVYTUoz/D55DpG+vm8/skZ/vtA4ejuZ4x7gzRyYjjG0UqHEI6DvbagJ7VnsCOFQ7 Kj08XOghS0n2mgCOJfZT4is271M0B7k= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-143-IiIdzHuLNQGFOfSOTrCtNw-1; Thu, 06 Feb 2020 20:40:37 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 22AA9DB22; Fri, 7 Feb 2020 01:40:36 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-120.brq.redhat.com [10.40.204.120]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 147A25C241; Fri, 7 Feb 2020 01:40:34 +0000 (UTC) From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= To: devel@edk2.groups.io Cc: Laszlo Ersek , Eric Dong Subject: [PATCH v3 44/78] NetworkPkg/Mtftp4Dxe: Fix various typos Date: Fri, 7 Feb 2020 02:07:57 +0100 Message-Id: <20200207010831.9046-45-philmd@redhat.com> In-Reply-To: <20200207010831.9046-1-philmd@redhat.com> References: <20200207010831.9046-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: IiIdzHuLNQGFOfSOTrCtNw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Antoine Coeur Fix various typos in documentation, comments and debug strings. Cc: Jiaxin Wu Cc: Siyuan Fu Cc: Maciej Rabeda Signed-off-by: Antoine Coeur Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Maciej Rabeda Signed-off-by: Philippe Mathieu-Daude --- NetworkPkg/Mtftp4Dxe/Mtftp4Driver.h | 2 +- NetworkPkg/Mtftp4Dxe/Mtftp4Impl.h | 2 +- NetworkPkg/Mtftp4Dxe/Mtftp4Option.h | 2 +- NetworkPkg/Mtftp4Dxe/Mtftp4Support.h | 2 +- NetworkPkg/Mtftp4Dxe/Mtftp4Driver.c | 4 ++-- NetworkPkg/Mtftp4Dxe/Mtftp4Impl.c | 10 +++++----- NetworkPkg/Mtftp4Dxe/Mtftp4Option.c | 14 +++++++------- NetworkPkg/Mtftp4Dxe/Mtftp4Rrq.c | 8 ++++---- NetworkPkg/Mtftp4Dxe/Mtftp4Support.c | 6 +++--- NetworkPkg/Mtftp4Dxe/Mtftp4Wrq.c | 6 +++--- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NetworkPkg/Mtftp4Dxe/Mtftp4Driver.h b/NetworkPkg/Mtftp4Dxe/Mtf= tp4Driver.h index c90e69018629..6637c5a93ee5 100644 --- a/NetworkPkg/Mtftp4Dxe/Mtftp4Driver.h +++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Driver.h @@ -113,7 +113,7 @@ Mtftp4ServiceBindingCreateChild ( @param This The service binding instance @param ChildHandle The child handle to destroy =20 - @retval EFI_INVALID_PARAMETER The parameter is invaid. + @retval EFI_INVALID_PARAMETER The parameter is invalid. @retval EFI_UNSUPPORTED The child may have already been destroyed= . @retval EFI_SUCCESS The child is destroyed and removed from t= he parent's child list. diff --git a/NetworkPkg/Mtftp4Dxe/Mtftp4Impl.h b/NetworkPkg/Mtftp4Dxe/Mtftp= 4Impl.h index 33393d42472c..b16ac0a4a483 100644 --- a/NetworkPkg/Mtftp4Dxe/Mtftp4Impl.h +++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Impl.h @@ -201,7 +201,7 @@ Mtftp4WrqStart ( Start the MTFTP session to download. =20 It will first initialize some of the internal states then build and send= a RRQ - reqeuest packet, at last, it will start receive for the downloading. + request packet, at last, it will start receive for the downloading. =20 @param Instance The Mtftp session @param Operation The MTFTP opcode, it may be a EFI_MTFTP4_O= PCODE_RRQ diff --git a/NetworkPkg/Mtftp4Dxe/Mtftp4Option.h b/NetworkPkg/Mtftp4Dxe/Mtf= tp4Option.h index 7bfe706f88c6..5f37b0f7b9e6 100644 --- a/NetworkPkg/Mtftp4Dxe/Mtftp4Option.h +++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Option.h @@ -45,7 +45,7 @@ typedef struct { @param OptionList The point to get the option array. =20 @retval EFI_INVALID_PARAMETER The parametera are invalid or packet isn'= t a - well-formated OACK packet. + well-formatted OACK packet. @retval EFI_SUCCESS The option array is build @retval EFI_OUT_OF_RESOURCES Failed to allocate memory for the array =20 diff --git a/NetworkPkg/Mtftp4Dxe/Mtftp4Support.h b/NetworkPkg/Mtftp4Dxe/Mt= ftp4Support.h index cfa7582faa4b..95e9bad43ef1 100644 --- a/NetworkPkg/Mtftp4Dxe/Mtftp4Support.h +++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Support.h @@ -28,7 +28,7 @@ typedef struct { =20 RRQ and WRQ have different requirements for Start and End. For example, during start up, WRQ initializes its whole valid block rang= e - to [0, 0xffff]. This is bacause the server will send us a ACK0 to inform= us + to [0, 0xffff]. This is because the server will send us a ACK0 to inform= us to start the upload. When the client received ACK0, it will remove 0 fro= m the range, get the next block number, which is 1, then upload the BLOCK1. Fo= r RRQ without option negotiation, the server will directly send us the BLOCK1 = in diff --git a/NetworkPkg/Mtftp4Dxe/Mtftp4Driver.c b/NetworkPkg/Mtftp4Dxe/Mtf= tp4Driver.c index 06c4e202d3ef..a795d262473e 100644 --- a/NetworkPkg/Mtftp4Dxe/Mtftp4Driver.c +++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Driver.c @@ -30,7 +30,7 @@ EFI_SERVICE_BINDING_PROTOCOL gMtftp4ServiceBindingTemple= te =3D { @param SystemTable The system table. =20 @retval EFI_SUCCESS The handles are successfully installed on the image= . - @retval others some EFI_ERROR occured. + @retval others some EFI_ERROR occurred. =20 **/ EFI_STATUS @@ -632,7 +632,7 @@ Mtftp4ServiceBindingCreateChild ( @param This The service binding instance @param ChildHandle The child handle to destroy =20 - @retval EFI_INVALID_PARAMETER The parameter is invaid. + @retval EFI_INVALID_PARAMETER The parameter is invalid. @retval EFI_UNSUPPORTED The child may have already been destroyed= . @retval EFI_SUCCESS The child is destroyed and removed from t= he parent's child list. diff --git a/NetworkPkg/Mtftp4Dxe/Mtftp4Impl.c b/NetworkPkg/Mtftp4Dxe/Mtftp= 4Impl.c index 70bd693e4e3a..990a9ef03027 100644 --- a/NetworkPkg/Mtftp4Dxe/Mtftp4Impl.c +++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Impl.c @@ -226,7 +226,7 @@ Mtftp4OverrideValid ( @param UdpCfgData The UDP configure data to reconfigure the= UDP_IO =20 @retval TRUE The default address is retrieved and UDP = is reconfigured. - @retval FALSE Some error occured. + @retval FALSE Some error occurred. =20 **/ BOOLEAN @@ -342,7 +342,7 @@ Mtftp4ConfigUnicastPort ( write file, and read directory. =20 @param This The MTFTP session - @param Token The token than encapsues the user's reque= st. + @param Token The token than encapsules the user's requ= est. @param Operation The operation to do =20 @retval EFI_INVALID_PARAMETER Some of the parameters are invalid. @@ -601,9 +601,9 @@ EfiMtftp4GetModeData ( 2.MtftpConfigData.UseDefaultSetting is FA= LSE and MtftpConfigData.StationIp is not a vali= d IPv4 unicast address. - 3.MtftpCofigData.UseDefaultSetting is FAL= SE and + 3.MtftpConfigData.UseDefaultSetting is FA= LSE and MtftpConfigData.SubnetMask is invalid. - 4.MtftpCofigData.ServerIp is not a valid = IPv4 + 4.MtftpConfigData.ServerIp is not a valid= IPv4 unicast address. 5.MtftpConfigData.UseDefaultSetting is FA= LSE and MtftpConfigData.GatewayIp is not a vali= d IPv4 @@ -946,7 +946,7 @@ EfiMtftp4ReadDirectory ( or ICMP ERROR packet. Retries occur only if no response packets are rece= ived from the MTFTPv4 server before the timeout expires. It is implemented with EfiMtftp4ReadFile: build a token, then pass it to - EfiMtftp4ReadFile. In its check packet callback abort the opertions. + EfiMtftp4ReadFile. In its check packet callback abort the operations. =20 @param This Pointer to the EFI_MTFTP4_PROTOCOL instan= ce @param OverrideData Data that is used to override the existin= g diff --git a/NetworkPkg/Mtftp4Dxe/Mtftp4Option.c b/NetworkPkg/Mtftp4Dxe/Mtf= tp4Option.c index 013fe008eee8..21c1e421392b 100644 --- a/NetworkPkg/Mtftp4Dxe/Mtftp4Option.c +++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Option.c @@ -18,13 +18,13 @@ CHAR8 *mMtftp4SupportedOptions[MTFTP4_SUPPORTED_OPTIONS= ] =3D { =20 =20 /** - Check whether two ascii strings are equel, ignore the case. + Check whether two ascii strings are equal, ignore the case. =20 @param Str1 The first ascii string @param Str2 The second ascii string =20 @retval TRUE Two strings are equal when case is ignore= d. - @retval FALSE Two string are not equal. + @retval FALSE Two strings are not equal. =20 **/ BOOLEAN @@ -93,7 +93,7 @@ NetStringToU32 ( Convert a string of the format "192.168.0.1" to an IP address. =20 @param Str The string representation of IP - @param Ip The varible to get IP. + @param Ip The variable to get IP. =20 @retval EFI_INVALID_PARAMETER The IP string is invalid. @retval EFI_SUCCESS The IP is parsed into the Ip @@ -126,7 +126,7 @@ NetStringToIp ( Addr =3D (Addr << 8) | Byte; =20 // - // Skip all the digitals and check whether the sepeator is the dot + // Skip all the digitals and check whether the separator is the dot // while (NET_IS_DIGIT (*Str)) { Str++; @@ -230,7 +230,7 @@ Mtftp4FillOptions ( @param OptionList The point to get the option array. =20 @retval EFI_INVALID_PARAMETER The parametera are invalid or packet isn'= t a - well-formated OACK packet. + well-formatted OACK packet. @retval EFI_SUCCESS The option array is build @retval EFI_OUT_OF_RESOURCES Failed to allocate memory for the array =20 @@ -314,7 +314,7 @@ Mtftp4ExtractMcast ( UINT32 Num; =20 // - // The multicast option is formated like "204.0.0.1,1857,1" + // The multicast option is formatted like "204.0.0.1,1857,1" // The server can also omit the ip and port, use ",,1" // if (*Value =3D=3D ',') { @@ -461,7 +461,7 @@ Mtftp4ParseOption ( } else if (NetStringEqualNoCase (This->OptionStr, (UINT8 *) "multicast= ")) { // // Multicast option, if it is a request, the value must be a zero - // length string, otherwise, it is formated like "204.0.0.1,1857,1\0= " + // length string, otherwise, it is formatted like "204.0.0.1,1857,1\= 0" // if (Request) { if (*(This->ValueStr) !=3D '\0') { diff --git a/NetworkPkg/Mtftp4Dxe/Mtftp4Rrq.c b/NetworkPkg/Mtftp4Dxe/Mtftp4= Rrq.c index 8e1338221b12..f1d456a6122d 100644 --- a/NetworkPkg/Mtftp4Dxe/Mtftp4Rrq.c +++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Rrq.c @@ -34,7 +34,7 @@ Mtftp4RrqInput ( Start the MTFTP session to download. =20 It will first initialize some of the internal states then build and send= a RRQ - reqeuest packet, at last, it will start receive for the downloading. + request packet, at last, it will start receive for the downloading. =20 @param Instance The Mtftp session @param Operation The MTFTP opcode, it may be a EFI_MTFTP4_O= PCODE_RRQ @@ -55,7 +55,7 @@ Mtftp4RrqStart ( // // The valid block number range are [1, 0xffff]. For example: // the client sends an RRQ request to the server, the server - // transfers the DATA1 block. If option negoitation is ongoing, + // transfers the DATA1 block. If option negotiation is ongoing, // the server will send back an OACK, then client will send ACK0. // Status =3D Mtftp4InitBlockRange (&Instance->Blocks, 1, 0xffff); @@ -544,8 +544,8 @@ Mtftp4RrqHandleOack ( =20 // // Save the multicast info. Always update the Master, only update the - // multicast IP address, block size, window size, timeoute at the firs= t time. If IP - // address is updated, create a UDP child to receive the multicast. + // multicast IP address, block size, window size, timeout at the first= time. + // If IP address is updated, create a UDP child to receive the multica= st. // Instance->Master =3D Reply.Master; =20 diff --git a/NetworkPkg/Mtftp4Dxe/Mtftp4Support.c b/NetworkPkg/Mtftp4Dxe/Mt= ftp4Support.c index ad2ff7bf3a3f..6ca4842107df 100644 --- a/NetworkPkg/Mtftp4Dxe/Mtftp4Support.c +++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Support.c @@ -46,7 +46,7 @@ Mtftp4AllocateRange ( =20 RRQ and WRQ have different requirements for Start and End. For example, during start up, WRQ initializes its whole valid block rang= e - to [0, 0xffff]. This is bacause the server will send us a ACK0 to inform= us + to [0, 0xffff]. This is because the server will send us a ACK0 to inform= us to start the upload. When the client received ACK0, it will remove 0 fro= m the range, get the next block number, which is 1, then upload the BLOCK1. Fo= r RRQ without option negotiation, the server will directly send us the BLOCK1 = in @@ -197,7 +197,7 @@ Mtftp4RemoveBlockNum ( // 3. (Start < Num) && (End >=3D Num): // if End =3D=3D Num, only need to decrease the End by one because // we have (Start < Num) && (Num =3D=3D End), so (Start <=3D End - = 1). - // if (End > Num), the hold is splited into two holes, with + // if (End > Num), the hold is split into two holes, with // [Start, Num - 1] and [Num + 1, End]. // if (Range->Start > Num) { @@ -649,7 +649,7 @@ Mtftp4OnTimerTick ( } =20 // - // Retransmit the packet if haven't reach the maxmium retry count, + // Retransmit the packet if haven't reach the maximum retry count, // otherwise exit the transfer. // if (++Instance->CurRetry < Instance->MaxRetry) { diff --git a/NetworkPkg/Mtftp4Dxe/Mtftp4Wrq.c b/NetworkPkg/Mtftp4Dxe/Mtftp4= Wrq.c index bd13244b999b..5d479fad4e7c 100644 --- a/NetworkPkg/Mtftp4Dxe/Mtftp4Wrq.c +++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Wrq.c @@ -171,7 +171,7 @@ Mtftp4WrqHandleAck ( if (Expected < 0) { =20 // - // The block range is empty. It may either because the the last + // The block range is empty. It may either because the last // block has been ACKed, or the sequence number just looped back, // that is, there is more than 0xffff blocks. // @@ -245,11 +245,11 @@ Mtftp4WrqOackValid ( @param Instance The MTFTP session @param Packet The received OACK packet @param Len The length of the packet - @param Completed Whether the transmisson has completed. NOT= used by + @param Completed Whether the transmission has completed. NO= T used by this function. =20 @retval EFI_SUCCESS The OACK process is OK - @retval EFI_TFTP_ERROR Some error occured, and the session reset. + @retval EFI_TFTP_ERROR Some error occurred, and the session reset= . =20 **/ EFI_STATUS --=20 2.21.1