ShellPkg: Apply uncrustify changes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the ShellPkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>

4 files changed, 424 insertions, 411 deletions

diff --git a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c
index 55b4dc6..7c80bba 100644
--- a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c
+++ b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ifconfig6.c
@@ -10,14 +10,14 @@
 #include "UefiShellNetwork2CommandsLib.h"

 

 enum {

-  IfConfig6OpList     = 1,

-  IfConfig6OpSet      = 2,

-  IfConfig6OpClear    = 3

+  IfConfig6OpList  = 1,

+  IfConfig6OpSet   = 2,

+  IfConfig6OpClear = 3

 };

 

 typedef enum {

-  VarCheckReserved      = -1,

-  VarCheckOk            = 0,

+  VarCheckReserved = -1,

+  VarCheckOk       = 0,

   VarCheckDuplicate,

   VarCheckConflict,

   VarCheckUnknown,

@@ -26,14 +26,14 @@ typedef enum {
 } VAR_CHECK_CODE;

 

 typedef enum {

-  FlagTypeSingle         = 0,

+  FlagTypeSingle = 0,

   FlagTypeNeedVar,

   FlagTypeNeedSet,

   FlagTypeSkipUnknown

 } VAR_CHECK_FLAG_TYPE;

 

-#define MACADDRMAXSIZE    32

-#define PREFIXMAXLEN      16

+#define MACADDRMAXSIZE  32

+#define PREFIXMAXLEN    16

 

 typedef struct _IFCONFIG6_INTERFACE_CB {

   EFI_HANDLE                                  NicHandle;

@@ -55,23 +55,22 @@ struct _ARG_LIST {
 };

 

 typedef struct _IFCONFIG6_PRIVATE_DATA {

-  EFI_HANDLE  ImageHandle;

-  LIST_ENTRY  IfList;

+  EFI_HANDLE    ImageHandle;

+  LIST_ENTRY    IfList;

 

-  UINT32      OpCode;

-  CHAR16      *IfName;

-  ARG_LIST    *VarArg;

+  UINT32        OpCode;

+  CHAR16        *IfName;

+  ARG_LIST      *VarArg;

 } IFCONFIG6_PRIVATE_DATA;

 

-typedef struct _VAR_CHECK_ITEM{

+typedef struct _VAR_CHECK_ITEM {

   CHAR16                 *FlagStr;

   UINT32                 FlagID;

   UINT32                 ConflictMask;

   VAR_CHECK_FLAG_TYPE    FlagType;

 } VAR_CHECK_ITEM;

 

-

-SHELL_PARAM_ITEM    mIfConfig6CheckList[] = {

+SHELL_PARAM_ITEM  mIfConfig6CheckList[] = {

   {

     L"-b",

     TypeFlag

@@ -100,7 +99,7 @@ SHELL_PARAM_ITEM    mIfConfig6CheckList[] = {
 

 VAR_CHECK_ITEM  mIfConfig6SetCheckList[] = {

   {

-   L"auto",

+    L"auto",

     0x00000001,

     0x00000001,

     FlagTypeSingle

@@ -156,10 +155,11 @@ VAR_CHECK_ITEM  mIfConfig6SetCheckList[] = {
 **/

 VOID

 IfConfig6FreeArgList (

-  ARG_LIST       *List

-)

+  ARG_LIST  *List

+  )

 {

-  ARG_LIST       *Next;

+  ARG_LIST  *Next;

+

   while (List->Next != NULL) {

     Next = List->Next;

     FreePool (List);

@@ -180,16 +180,16 @@ IfConfig6FreeArgList (
 **/

 ARG_LIST *

 IfConfig6SplitStrToList (

-  IN CONST CHAR16    *String,

-  IN CHAR16          Separator

+  IN CONST CHAR16  *String,

+  IN CHAR16        Separator

   )

 {

-  CHAR16      *Str;

-  CHAR16      *ArgStr;

-  ARG_LIST    *ArgList;

-  ARG_LIST    *ArgNode;

+  CHAR16    *Str;

+  CHAR16    *ArgStr;

+  ARG_LIST  *ArgList;

+  ARG_LIST  *ArgNode;

 

-  if (String == NULL || *String == L'\0') {

+  if ((String == NULL) || (*String == L'\0')) {

     return NULL;

   }

 

@@ -200,15 +200,17 @@ IfConfig6SplitStrToList (
   if (Str == NULL) {

     return NULL;

   }

-  ArgStr  = Str;

+

+  ArgStr = Str;

 

   //

   // init a node for the list head.

   //

-  ArgNode = (ARG_LIST *) AllocateZeroPool (sizeof (ARG_LIST));

+  ArgNode = (ARG_LIST *)AllocateZeroPool (sizeof (ARG_LIST));

   if (ArgNode == NULL) {

     return NULL;

   }

+

   ArgList = ArgNode;

 

   //

@@ -219,7 +221,7 @@ IfConfig6SplitStrToList (
       *Str          = L'\0';

       ArgNode->Arg  = ArgStr;

       ArgStr        = Str + 1;

-      ArgNode->Next = (ARG_LIST *) AllocateZeroPool (sizeof (ARG_LIST));

+      ArgNode->Next = (ARG_LIST *)AllocateZeroPool (sizeof (ARG_LIST));

       if (ArgNode->Next == NULL) {

         //

         // Free the local copy of string stored in the first node

@@ -228,6 +230,7 @@ IfConfig6SplitStrToList (
         IfConfig6FreeArgList (ArgList);

         return NULL;

       }

+

       ArgNode = ArgNode->Next;

     }

 

@@ -251,17 +254,17 @@ IfConfig6SplitStrToList (
 

 **/

 VAR_CHECK_CODE

-IfConfig6RetriveCheckListByName(

-  IN VAR_CHECK_ITEM    *CheckList,

-  IN CHAR16            *Name,

-  IN BOOLEAN           Init

-)

+IfConfig6RetriveCheckListByName (

+  IN VAR_CHECK_ITEM  *CheckList,

+  IN CHAR16          *Name,

+  IN BOOLEAN         Init

+  )

 {

-  STATIC UINT32     CheckDuplicate;

-  STATIC UINT32     CheckConflict;

-  VAR_CHECK_CODE    RtCode;

-  UINT32            Index;

-  VAR_CHECK_ITEM    Arg;

+  STATIC UINT32   CheckDuplicate;

+  STATIC UINT32   CheckConflict;

+  VAR_CHECK_CODE  RtCode;

+  UINT32          Index;

+  VAR_CHECK_ITEM  Arg;

 

   if (Init) {

     CheckDuplicate = 0;

@@ -269,16 +272,15 @@ IfConfig6RetriveCheckListByName(
     return VarCheckOk;

   }

 

-  RtCode  = VarCheckOk;

-  Index   = 0;

-  Arg     = CheckList[Index];

+  RtCode = VarCheckOk;

+  Index  = 0;

+  Arg    = CheckList[Index];

 

   //

   // Check the Duplicated/Conflicted/Unknown input Args.

   //

   while (Arg.FlagStr != NULL) {

     if (StrCmp (Arg.FlagStr, Name) == 0) {

-

       if (CheckDuplicate & Arg.FlagID) {

         RtCode = VarCheckDuplicate;

         break;

@@ -314,11 +316,11 @@ IfConfig6RetriveCheckListByName(
 VOID

 EFIAPI

 IfConfig6ManualAddressNotify (

-  IN EFI_EVENT    Event,

-  IN VOID         *Context

+  IN EFI_EVENT  Event,

+  IN VOID       *Context

   )

 {

-  *((BOOLEAN *) Context) = TRUE;

+  *((BOOLEAN *)Context) = TRUE;

 }

 

 /**

@@ -330,11 +332,11 @@ IfConfig6ManualAddressNotify (
 **/

 VOID

 IfConfig6PrintMacAddr (

-  IN UINT8     *Node,

-  IN UINT32    Size

+  IN UINT8   *Node,

+  IN UINT32  Size

   )

 {

-  UINTN    Index;

+  UINTN  Index;

 

   ASSERT (Size <= MACADDRMAXSIZE);

 

@@ -357,17 +359,16 @@ IfConfig6PrintMacAddr (
 **/

 VOID

 IfConfig6PrintIpAddr (

-  IN EFI_IPv6_ADDRESS    *Ip,

-  IN UINT8               *PrefixLen

+  IN EFI_IPv6_ADDRESS  *Ip,

+  IN UINT8             *PrefixLen

   )

 {

-  UINTN      Index;

-  BOOLEAN    Short;

+  UINTN    Index;

+  BOOLEAN  Short;

 

   Short = FALSE;

 

   for (Index = 0; Index < PREFIXMAXLEN; Index = Index + 2) {

-

     if (!Short && (Index + 1 < PREFIXMAXLEN) && (Index % 2 == 0) && (Ip->Addr[Index] == 0) && (Ip->Addr[Index + 1] == 0)) {

       //

       // Deal with the case of ::.

@@ -378,6 +379,7 @@ IfConfig6PrintIpAddr (
         //

         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_INFO_COLON), gShellNetwork2HiiHandle);

       }

+

       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_INFO_COLON), gShellNetwork2HiiHandle);

 

       while ((Ip->Addr[Index] == 0) && (Ip->Addr[Index + 1] == 0) && (Index < PREFIXMAXLEN)) {

@@ -425,17 +427,17 @@ IfConfig6PrintIpAddr (
 **/

 EFI_STATUS

 IfConfig6ParseManualAddressList (

-  IN OUT ARG_LIST                         **Arg,

-     OUT EFI_IP6_CONFIG_MANUAL_ADDRESS    **Buf,

-     OUT UINTN                            *BufSize

+  IN OUT ARG_LIST                    **Arg,

+  OUT EFI_IP6_CONFIG_MANUAL_ADDRESS  **Buf,

+  OUT UINTN                          *BufSize

   )

 {

-  EFI_STATUS                       Status;

-  EFI_IP6_CONFIG_MANUAL_ADDRESS    *AddrBuf;

-  ARG_LIST                         *VarArg;

-  EFI_IPv6_ADDRESS                 Address;

-  UINT8                            Prefix;

-  UINT8                            AddrCnt;

+  EFI_STATUS                     Status;

+  EFI_IP6_CONFIG_MANUAL_ADDRESS  *AddrBuf;

+  ARG_LIST                       *VarArg;

+  EFI_IPv6_ADDRESS               Address;

+  UINT8                          Prefix;

+  UINT8                          AddrCnt;

 

   Prefix   = 0;

   AddrCnt  = 0;

@@ -448,7 +450,6 @@ IfConfig6ParseManualAddressList (
   // Go through the list to check the correctness of input host ip6 address.

   //

   while ((!EFI_ERROR (Status)) && (VarArg != NULL)) {

-

     Status = NetLibStrToIp6andPrefix (VarArg->Arg, &Address, &Prefix);

 

     if (EFI_ERROR (Status)) {

@@ -477,7 +478,6 @@ IfConfig6ParseManualAddressList (
   // Go through the list to fill in the EFI_IP6_CONFIG_MANUAL_ADDRESS structure.

   //

   while ((!EFI_ERROR (Status)) && (VarArg != NULL)) {

-

     Status = NetLibStrToIp6andPrefix (VarArg->Arg, &Address, &Prefix);

 

     if (EFI_ERROR (Status)) {

@@ -491,6 +491,7 @@ IfConfig6ParseManualAddressList (
     if (Prefix == 0xFF) {

       Prefix = 0;

     }

+

     AddrBuf[AddrCnt].IsAnycast    = FALSE;

     AddrBuf[AddrCnt].PrefixLength = Prefix;

     IP6_COPY_ADDRESS (&AddrBuf[AddrCnt].Address, &Address);

@@ -528,17 +529,17 @@ ON_ERROR:
 **/

 EFI_STATUS

 IfConfig6ParseGwDnsAddressList (

-  IN OUT ARG_LIST            **Arg,

-     OUT EFI_IPv6_ADDRESS    **Buf,

-     OUT UINTN               *BufSize

+  IN OUT ARG_LIST       **Arg,

+  OUT EFI_IPv6_ADDRESS  **Buf,

+  OUT UINTN             *BufSize

   )

 {

-  EFI_STATUS          Status;

-  EFI_IPv6_ADDRESS    *AddrBuf;

-  ARG_LIST            *VarArg;

-  EFI_IPv6_ADDRESS    Address;

-  UINT8               Prefix;

-  UINT8               AddrCnt;

+  EFI_STATUS        Status;

+  EFI_IPv6_ADDRESS  *AddrBuf;

+  ARG_LIST          *VarArg;

+  EFI_IPv6_ADDRESS  Address;

+  UINT8             Prefix;

+  UINT8             AddrCnt;

 

   AddrCnt  = 0;

   *BufSize = 0;

@@ -550,7 +551,6 @@ IfConfig6ParseGwDnsAddressList (
   // Go through the list to check the correctness of input gw/dns address.

   //

   while ((!EFI_ERROR (Status)) && (VarArg != NULL)) {

-

     Status = NetLibStrToIp6andPrefix (VarArg->Arg, &Address, &Prefix);

 

     if (EFI_ERROR (Status)) {

@@ -579,7 +579,6 @@ IfConfig6ParseGwDnsAddressList (
   // Go through the list to fill in the EFI_IPv6_ADDRESS structure.

   //

   while ((!EFI_ERROR (Status)) && (VarArg != NULL)) {

-

     Status = NetLibStrToIp6andPrefix (VarArg->Arg, &Address, &Prefix);

 

     if (EFI_ERROR (Status)) {

@@ -595,7 +594,7 @@ IfConfig6ParseGwDnsAddressList (
   *Arg = VarArg;

 

   if (EFI_ERROR (Status) && (Status != EFI_INVALID_PARAMETER)) {

-   goto ON_ERROR;

+    goto ON_ERROR;

   }

 

   *Buf     = AddrBuf;

@@ -621,13 +620,13 @@ ON_ERROR:
 **/

 EFI_STATUS

 IfConfig6ParseInterfaceId (

-  IN OUT ARG_LIST                       **Arg,

-     OUT EFI_IP6_CONFIG_INTERFACE_ID    **IfId

+  IN OUT ARG_LIST                  **Arg,

+  OUT EFI_IP6_CONFIG_INTERFACE_ID  **IfId

   )

 {

-  UINT8     Index;

-  UINT8     NodeVal;

-  CHAR16    *IdStr;

+  UINT8   Index;

+  UINT8   NodeVal;

+  CHAR16  *IdStr;

 

   if (*Arg == NULL) {

     return EFI_INVALID_PARAMETER;

@@ -640,10 +639,8 @@ IfConfig6ParseInterfaceId (
   ASSERT (*IfId != NULL);

 

   while ((*IdStr != L'\0') && (Index < 8)) {

-

     NodeVal = 0;

     while ((*IdStr != L':') && (*IdStr != L'\0')) {

-

       if ((*IdStr <= L'F') && (*IdStr >= L'A')) {

         NodeVal = (UINT8)((NodeVal << 4) + *IdStr - L'A' + 10);

       } else if ((*IdStr <= L'f') && (*IdStr >= L'a')) {

@@ -681,11 +678,11 @@ IfConfig6ParseInterfaceId (
 **/

 EFI_STATUS

 IfConfig6ParseDadXmits (

-  IN OUT ARG_LIST    **Arg,

-     OUT UINT32      *Xmits

+  IN OUT ARG_LIST  **Arg,

+  OUT UINT32       *Xmits

   )

 {

-  CHAR16    *ValStr;

+  CHAR16  *ValStr;

 

   if (*Arg == NULL) {

     return EFI_INVALID_PARAMETER;

@@ -695,13 +692,9 @@ IfConfig6ParseDadXmits (
   *Xmits = 0;

 

   while (*ValStr != L'\0') {

-

     if ((*ValStr <= L'9') && (*ValStr >= L'0')) {

-

       *Xmits = (*Xmits * 10) + (*ValStr - L'0');

-

     } else {

-

       return EFI_INVALID_PARAMETER;

     }

 

@@ -725,25 +718,25 @@ IfConfig6ParseDadXmits (
 **/

 EFI_STATUS

 IfConfig6GetInterfaceInfo (

-  IN EFI_HANDLE    ImageHandle,

-  IN CHAR16        *IfName,

-  IN LIST_ENTRY    *IfList

+  IN EFI_HANDLE  ImageHandle,

+  IN CHAR16      *IfName,

+  IN LIST_ENTRY  *IfList

   )

 {

-  EFI_STATUS                       Status;

-  UINTN                            HandleIndex;

-  UINTN                            HandleNum;

-  EFI_HANDLE                       *HandleBuffer;

-  EFI_IP6_CONFIG_PROTOCOL          *Ip6Cfg;

-  EFI_IP6_CONFIG_INTERFACE_INFO    *IfInfo;

-  IFCONFIG6_INTERFACE_CB           *IfCb;

-  UINTN                            DataSize;

+  EFI_STATUS                     Status;

+  UINTN                          HandleIndex;

+  UINTN                          HandleNum;

+  EFI_HANDLE                     *HandleBuffer;

+  EFI_IP6_CONFIG_PROTOCOL        *Ip6Cfg;

+  EFI_IP6_CONFIG_INTERFACE_INFO  *IfInfo;

+  IFCONFIG6_INTERFACE_CB         *IfCb;

+  UINTN                          DataSize;

 

   HandleBuffer = NULL;

   HandleNum    = 0;

 

-  IfInfo       = NULL;

-  IfCb         = NULL;

+  IfInfo = NULL;

+  IfCb   = NULL;

 

   //

   // Locate all the handles with ip6 service binding protocol.

@@ -754,7 +747,7 @@ IfConfig6GetInterfaceInfo (
                   NULL,

                   &HandleNum,

                   &HandleBuffer

-                 );

+                  );

   if (EFI_ERROR (Status) || (HandleNum == 0)) {

     return Status;

   }

@@ -763,9 +756,9 @@ IfConfig6GetInterfaceInfo (
   // Enumerate all handles that installed with ip6 service binding protocol.

   //

   for (HandleIndex = 0; HandleIndex < HandleNum; HandleIndex++) {

-    IfCb      = NULL;

-    IfInfo    = NULL;

-    DataSize  = 0;

+    IfCb     = NULL;

+    IfInfo   = NULL;

+    DataSize = 0;

 

     //

     // Ip6config protocol and ip6 service binding protocol are installed

@@ -775,12 +768,13 @@ IfConfig6GetInterfaceInfo (
     Status = gBS->HandleProtocol (

                     HandleBuffer[HandleIndex],

                     &gEfiIp6ConfigProtocolGuid,

-                    (VOID **) &Ip6Cfg

+                    (VOID **)&Ip6Cfg

                     );

 

     if (EFI_ERROR (Status)) {

       goto ON_ERROR;

     }

+

     //

     // Get the interface information size.

     //

@@ -802,6 +796,7 @@ IfConfig6GetInterfaceInfo (
       Status = EFI_OUT_OF_RESOURCES;

       goto ON_ERROR;

     }

+

     //

     // Get the interface info.

     //

@@ -816,6 +811,7 @@ IfConfig6GetInterfaceInfo (
       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_ERR_IP6CFG_GETDATA), gShellNetwork2HiiHandle, Status);

       goto ON_ERROR;

     }

+

     //

     // Check the interface name if required.

     //

@@ -850,13 +846,12 @@ IfConfig6GetInterfaceInfo (
     IfCb->NicHandle = HandleBuffer[HandleIndex];

     IfCb->IfInfo    = IfInfo;

     IfCb->IfCfg     = Ip6Cfg;

-    IfCb->DnsCnt    = (UINT32) (DataSize / sizeof (EFI_IPv6_ADDRESS));

+    IfCb->DnsCnt    = (UINT32)(DataSize / sizeof (EFI_IPv6_ADDRESS));

 

     //

     // Get the dns server list if has.

     //

     if (DataSize > 0) {

-

       Status = Ip6Cfg->GetData (

                          Ip6Cfg,

                          Ip6ConfigDataTypeDnsServer,

@@ -869,6 +864,7 @@ IfConfig6GetInterfaceInfo (
         goto ON_ERROR;

       }

     }

+

     //

     // Get the interface id if has.

     //

@@ -895,6 +891,7 @@ IfConfig6GetInterfaceInfo (
       FreePool (IfCb->IfId);

       IfCb->IfId = NULL;

     }

+

     //

     // Get the config policy.

     //

@@ -910,6 +907,7 @@ IfConfig6GetInterfaceInfo (
       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_ERR_IP6CFG_GETDATA), gShellNetwork2HiiHandle, Status);

       goto ON_ERROR;

     }

+

     //

     // Get the dad transmits.

     //

@@ -972,14 +970,14 @@ ON_ERROR:
 **/

 SHELL_STATUS

 IfConfig6ShowInterfaceInfo (

-  IN LIST_ENTRY    *IfList

+  IN LIST_ENTRY  *IfList

   )

 {

-  LIST_ENTRY                *Entry;

-  IFCONFIG6_INTERFACE_CB    *IfCb;

-  UINTN                     Index;

+  LIST_ENTRY              *Entry;

+  IFCONFIG6_INTERFACE_CB  *IfCb;

+  UINTN                   Index;

 

-  Entry  = IfList->ForwardLink;

+  Entry = IfList->ForwardLink;

 

   if (IsListEmpty (IfList)) {

     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_ERR_INVALID_INTERFACE), gShellNetwork2HiiHandle);

@@ -989,7 +987,6 @@ IfConfig6ShowInterfaceInfo (
   // Go through the interface list.

   //

   while (Entry != IfList) {

-

     IfCb = BASE_CR (Entry, IFCONFIG6_INTERFACE_CB, Link);

 

     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_INFO_BREAK), gShellNetwork2HiiHandle);

@@ -1024,6 +1021,7 @@ IfConfig6ShowInterfaceInfo (
         8

         );

     }

+

     //

     // Print mac address of the interface.

     //

@@ -1100,18 +1098,18 @@ IfConfig6ShowInterfaceInfo (
 **/

 SHELL_STATUS

 IfConfig6ClearInterfaceInfo (

-  IN LIST_ENTRY    *IfList,

-  IN CHAR16        *IfName

+  IN LIST_ENTRY  *IfList,

+  IN CHAR16      *IfName

   )

 {

-  EFI_STATUS                Status;

-  SHELL_STATUS              ShellStatus;

-  LIST_ENTRY                *Entry;

-  IFCONFIG6_INTERFACE_CB    *IfCb;

-  EFI_IP6_CONFIG_POLICY     Policy;

-

-  Entry  = IfList->ForwardLink;

-  Status = EFI_SUCCESS;

+  EFI_STATUS              Status;

+  SHELL_STATUS            ShellStatus;

+  LIST_ENTRY              *Entry;

+  IFCONFIG6_INTERFACE_CB  *IfCb;

+  EFI_IP6_CONFIG_POLICY   Policy;

+

+  Entry       = IfList->ForwardLink;

+  Status      = EFI_SUCCESS;

   ShellStatus = SHELL_SUCCESS;

 

   if (IsListEmpty (IfList)) {

@@ -1123,7 +1121,6 @@ IfConfig6ClearInterfaceInfo (
   // need to refresh the configuration.

   //

   while (Entry != IfList) {

-

     IfCb = BASE_CR (Entry, IFCONFIG6_INTERFACE_CB, Link);

 

     if ((IfName != NULL) && (StrCmp (IfName, IfCb->IfInfo->Name) == 0)) {

@@ -1157,7 +1154,7 @@ IfConfig6ClearInterfaceInfo (
       break;

     }

 

-    Entry  = Entry->ForwardLink;

+    Entry = Entry->ForwardLink;

   }

 

   return ShellStatus;

@@ -1175,32 +1172,32 @@ IfConfig6ClearInterfaceInfo (
 **/

 SHELL_STATUS

 IfConfig6SetInterfaceInfo (

-  IN LIST_ENTRY    *IfList,

-  IN ARG_LIST      *VarArg

+  IN LIST_ENTRY  *IfList,

+  IN ARG_LIST    *VarArg

   )

 {

-  EFI_STATUS                       Status;

-  SHELL_STATUS                     ShellStatus;

-  IFCONFIG6_INTERFACE_CB           *IfCb;

-  EFI_IP6_CONFIG_MANUAL_ADDRESS    *CfgManAddr;

-  EFI_IPv6_ADDRESS                 *CfgAddr;

-  UINTN                            AddrSize;

-  EFI_IP6_CONFIG_INTERFACE_ID      *InterfaceId;

-  UINT32                           DadXmits;

-  UINT32                           CurDadXmits;

-  UINTN                            CurDadXmitsLen;

-  EFI_IP6_CONFIG_POLICY            Policy;

-

-  VAR_CHECK_CODE                   CheckCode;

-  EFI_EVENT                        TimeOutEvt;

-  EFI_EVENT                        MappedEvt;

-  BOOLEAN                          IsAddressOk;

-

-  UINTN                            DataSize;

-  UINT32                           Index;

-  UINT32                           Index2;

-  BOOLEAN                          IsAddressSet;

-  EFI_IP6_CONFIG_INTERFACE_INFO    *IfInfo;

+  EFI_STATUS                     Status;

+  SHELL_STATUS                   ShellStatus;

+  IFCONFIG6_INTERFACE_CB         *IfCb;

+  EFI_IP6_CONFIG_MANUAL_ADDRESS  *CfgManAddr;

+  EFI_IPv6_ADDRESS               *CfgAddr;

+  UINTN                          AddrSize;

+  EFI_IP6_CONFIG_INTERFACE_ID    *InterfaceId;

+  UINT32                         DadXmits;

+  UINT32                         CurDadXmits;

+  UINTN                          CurDadXmitsLen;

+  EFI_IP6_CONFIG_POLICY          Policy;

+

+  VAR_CHECK_CODE  CheckCode;

+  EFI_EVENT       TimeOutEvt;

+  EFI_EVENT       MappedEvt;

+  BOOLEAN         IsAddressOk;

+

+  UINTN                          DataSize;

+  UINT32                         Index;

+  UINT32                         Index2;

+  BOOLEAN                        IsAddressSet;

+  EFI_IP6_CONFIG_INTERFACE_INFO  *IfInfo;

 

   CfgManAddr  = NULL;

   CfgAddr     = NULL;

@@ -1214,17 +1211,18 @@ IfConfig6SetInterfaceInfo (
     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_ERR_INVALID_INTERFACE), gShellNetwork2HiiHandle);

     return SHELL_INVALID_PARAMETER;

   }

+

   //

   // Make sure to set only one interface each time.

   //

-  IfCb   = BASE_CR (IfList->ForwardLink, IFCONFIG6_INTERFACE_CB, Link);

-  Status = EFI_SUCCESS;

+  IfCb        = BASE_CR (IfList->ForwardLink, IFCONFIG6_INTERFACE_CB, Link);

+  Status      = EFI_SUCCESS;

   ShellStatus = SHELL_SUCCESS;

 

   //

   // Initialize check list mechanism.

   //

-  CheckCode = IfConfig6RetriveCheckListByName(

+  CheckCode = IfConfig6RetriveCheckListByName (

                 NULL,

                 NULL,

                 TRUE

@@ -1256,14 +1254,15 @@ IfConfig6SetInterfaceInfo (
     ShellStatus = SHELL_ACCESS_DENIED;

     goto ON_EXIT;

   }

+

   //

   // Parse the setting variables.

   //

   while (VarArg != NULL) {

-     //

-     // Check invalid parameters (duplication & unknown & conflict).

-     //

-    CheckCode = IfConfig6RetriveCheckListByName(

+    //

+    // Check invalid parameters (duplication & unknown & conflict).

+    //

+    CheckCode = IfConfig6RetriveCheckListByName (

                   mIfConfig6SetCheckList,

                   VarArg->Arg,

                   FALSE

@@ -1290,10 +1289,11 @@ IfConfig6SetInterfaceInfo (
       VarArg = VarArg->Next;

       continue;

     }

+

     //

     // Process valid variables.

     //

-    if (StrCmp(VarArg->Arg, L"auto") == 0) {

+    if (StrCmp (VarArg->Arg, L"auto") == 0) {

       //

       // Set automaic config policy

       //

@@ -1305,12 +1305,12 @@ IfConfig6SetInterfaceInfo (
                               &Policy

                               );

 

-      if (EFI_ERROR(Status)) {

+      if (EFI_ERROR (Status)) {

         ShellStatus = SHELL_ACCESS_DENIED;

         goto ON_EXIT;

       }

 

-      VarArg= VarArg->Next;

+      VarArg = VarArg->Next;

 

       if (VarArg != NULL) {

         if (StrCmp (VarArg->Arg, L"host") == 0) {

@@ -1339,13 +1339,12 @@ IfConfig6SetInterfaceInfo (
                               &Policy

                               );

 

-      if (EFI_ERROR(Status)) {

+      if (EFI_ERROR (Status)) {

         ShellStatus = SHELL_ACCESS_DENIED;

         goto ON_EXIT;

       }

 

-      VarArg= VarArg->Next;

-

+      VarArg = VarArg->Next;

     } else if (StrCmp (VarArg->Arg, L"host") == 0) {

       //

       // Parse till the next tag or the end of command line.

@@ -1367,6 +1366,7 @@ IfConfig6SetInterfaceInfo (
           goto ON_EXIT;

         }

       }

+

       //

       // Set static host ip6 address list.

       //   This is a asynchronous process.

@@ -1462,7 +1462,7 @@ IfConfig6SetInterfaceInfo (
         goto ON_EXIT;

       }

 

-      for ( Index = 0; Index < (UINTN) (AddrSize / sizeof (EFI_IP6_CONFIG_MANUAL_ADDRESS)); Index++) {

+      for ( Index = 0; Index < (UINTN)(AddrSize / sizeof (EFI_IP6_CONFIG_MANUAL_ADDRESS)); Index++) {

         IsAddressSet = FALSE;

         //

         // By default, the prefix length 0 is regarded as 64.

@@ -1473,7 +1473,8 @@ IfConfig6SetInterfaceInfo (
 

         for (Index2 = 0; Index2 < IfInfo->AddressInfoCount; Index2++) {

           if (EFI_IP6_EQUAL (&IfInfo->AddressInfo[Index2].Address, &CfgManAddr[Index].Address) &&

-              (IfInfo->AddressInfo[Index2].PrefixLength == CfgManAddr[Index].PrefixLength)) {

+              (IfInfo->AddressInfo[Index2].PrefixLength == CfgManAddr[Index].PrefixLength))

+          {

             IsAddressSet = TRUE;

             break;

           }

@@ -1488,7 +1489,6 @@ IfConfig6SetInterfaceInfo (
           ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_INFO_NEWLINE), gShellNetwork2HiiHandle);

         }

       }

-

     } else if (StrCmp (VarArg->Arg, L"gw") == 0) {

       //

       // Parse till the next tag or the end of command line.

@@ -1510,6 +1510,7 @@ IfConfig6SetInterfaceInfo (
           goto ON_EXIT;

         }

       }

+

       //

       // Set static gateway ip6 address list.

       //

@@ -1525,7 +1526,6 @@ IfConfig6SetInterfaceInfo (
         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_ERR_MAN_GW), gShellNetwork2HiiHandle, Status);

         goto ON_EXIT;

       }

-

     } else if (StrCmp (VarArg->Arg, L"dns") == 0) {

       //

       // Parse till the next tag or the end of command line.

@@ -1547,6 +1547,7 @@ IfConfig6SetInterfaceInfo (
           goto ON_EXIT;

         }

       }

+

       //

       // Set static DNS server ip6 address list.

       //

@@ -1561,7 +1562,6 @@ IfConfig6SetInterfaceInfo (
         ShellStatus = SHELL_ACCESS_DENIED;

         goto ON_EXIT;

       }

-

     } else if (StrCmp (VarArg->Arg, L"id") == 0) {

       //

       // Parse till the next tag or the end of command line.

@@ -1573,6 +1573,7 @@ IfConfig6SetInterfaceInfo (
         ShellStatus = SHELL_INVALID_PARAMETER;

         goto ON_EXIT;

       }

+

       //

       // Set alternative interface id.

       //

@@ -1587,7 +1588,6 @@ IfConfig6SetInterfaceInfo (
         ShellStatus = SHELL_ACCESS_DENIED;

         goto ON_EXIT;

       }

-

     } else if (StrCmp (VarArg->Arg, L"dad") == 0) {

       //

       // Parse till the next tag or the end of command line.

@@ -1599,6 +1599,7 @@ IfConfig6SetInterfaceInfo (
         ShellStatus = SHELL_ACCESS_DENIED;

         goto ON_EXIT;

       }

+

       //

       // Set dad transmits count.

       //

@@ -1609,7 +1610,7 @@ IfConfig6SetInterfaceInfo (
                               &DadXmits

                               );

 

-      if (EFI_ERROR(Status)) {

+      if (EFI_ERROR (Status)) {

         ShellStatus = SHELL_ACCESS_DENIED;

         goto ON_EXIT;

       }

@@ -1639,7 +1640,6 @@ ON_EXIT:
   }

 

   return ShellStatus;

-

 }

 

 /**

@@ -1653,7 +1653,7 @@ ON_EXIT:
 **/

 SHELL_STATUS

 IfConfig6 (

-  IN IFCONFIG6_PRIVATE_DATA    *Private

+  IN IFCONFIG6_PRIVATE_DATA  *Private

   )

 {

   EFI_STATUS    Status;

@@ -1676,20 +1676,20 @@ IfConfig6 (
   }

 

   switch (Private->OpCode) {

-  case IfConfig6OpList:

-    ShellStatus = IfConfig6ShowInterfaceInfo (&Private->IfList);

-    break;

+    case IfConfig6OpList:

+      ShellStatus = IfConfig6ShowInterfaceInfo (&Private->IfList);

+      break;

 

-  case IfConfig6OpClear:

-    ShellStatus = IfConfig6ClearInterfaceInfo (&Private->IfList, Private->IfName);

-    break;

+    case IfConfig6OpClear:

+      ShellStatus = IfConfig6ClearInterfaceInfo (&Private->IfList, Private->IfName);

+      break;

 

-  case IfConfig6OpSet:

-    ShellStatus = IfConfig6SetInterfaceInfo (&Private->IfList, Private->VarArg);

-    break;

+    case IfConfig6OpSet:

+      ShellStatus = IfConfig6SetInterfaceInfo (&Private->IfList, Private->VarArg);

+      break;

 

-  default:

-    ShellStatus = SHELL_UNSUPPORTED;

+    default:

+      ShellStatus = SHELL_UNSUPPORTED;

   }

 

 ON_EXIT:

@@ -1705,12 +1705,12 @@ ON_EXIT:
 **/

 VOID

 IfConfig6Cleanup (

-  IN IFCONFIG6_PRIVATE_DATA    *Private

+  IN IFCONFIG6_PRIVATE_DATA  *Private

   )

 {

-  LIST_ENTRY                *Entry;

-  LIST_ENTRY                *NextEntry;

-  IFCONFIG6_INTERFACE_CB    *IfCb;

+  LIST_ENTRY              *Entry;

+  LIST_ENTRY              *NextEntry;

+  IFCONFIG6_INTERFACE_CB  *IfCb;

 

   ASSERT (Private != NULL);

 

@@ -1721,9 +1721,9 @@ IfConfig6Cleanup (
     IfConfig6FreeArgList (Private->VarArg);

   }

 

-  if (Private->IfName != NULL)

+  if (Private->IfName != NULL) {

     FreePool (Private->IfName);

-

+  }

 

   //

   // Clean the IFCONFIG6_INTERFACE_CB list.

@@ -1732,18 +1732,15 @@ IfConfig6Cleanup (
   NextEntry = Entry->ForwardLink;

 

   while (Entry != &Private->IfList) {

-

     IfCb = BASE_CR (Entry, IFCONFIG6_INTERFACE_CB, Link);

 

     RemoveEntryList (&IfCb->Link);

 

     if (IfCb->IfId != NULL) {

-

       FreePool (IfCb->IfId);

     }

 

     if (IfCb->IfInfo != NULL) {

-

       FreePool (IfCb->IfInfo);

     }

 

@@ -1773,17 +1770,17 @@ ShellCommandRunIfconfig6 (
   IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_STATUS                Status;

-  SHELL_STATUS              ShellStatus;

-  IFCONFIG6_PRIVATE_DATA    *Private;

-  LIST_ENTRY                *ParamPackage;

-  CONST CHAR16              *ValueStr;

-  ARG_LIST                  *ArgList;

-  CHAR16                    *ProblemParam;

-  CHAR16                    *Str;

-

-  Private = NULL;

-  Status = EFI_INVALID_PARAMETER;

+  EFI_STATUS              Status;

+  SHELL_STATUS            ShellStatus;

+  IFCONFIG6_PRIVATE_DATA  *Private;

+  LIST_ENTRY              *ParamPackage;

+  CONST CHAR16            *ValueStr;

+  ARG_LIST                *ArgList;

+  CHAR16                  *ProblemParam;

+  CHAR16                  *Str;

+

+  Private     = NULL;

+  Status      = EFI_INVALID_PARAMETER;

   ShellStatus = SHELL_SUCCESS;

 

   Status = ShellCommandLineParseEx (mIfConfig6CheckList, &ParamPackage, &ProblemParam, TRUE, FALSE);

@@ -1797,11 +1794,13 @@ ShellCommandRunIfconfig6 (
   // To handle no option.

   //

   if (!ShellCommandLineGetFlag (ParamPackage, L"-r") && !ShellCommandLineGetFlag (ParamPackage, L"-s") &&

-      !ShellCommandLineGetFlag (ParamPackage, L"-?") && !ShellCommandLineGetFlag (ParamPackage, L"-l")) {

+      !ShellCommandLineGetFlag (ParamPackage, L"-?") && !ShellCommandLineGetFlag (ParamPackage, L"-l"))

+  {

     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_LACK_OPTION), gShellNetwork2HiiHandle);

     ShellStatus = SHELL_INVALID_PARAMETER;

     goto ON_EXIT;

   }

+

   //

   // To handle conflict options.

   //

@@ -1810,7 +1809,8 @@ ShellCommandRunIfconfig6 (
       ((ShellCommandLineGetFlag (ParamPackage, L"-r")) && (ShellCommandLineGetFlag (ParamPackage, L"-?"))) ||

       ((ShellCommandLineGetFlag (ParamPackage, L"-s")) && (ShellCommandLineGetFlag (ParamPackage, L"-l"))) ||

       ((ShellCommandLineGetFlag (ParamPackage, L"-s")) && (ShellCommandLineGetFlag (ParamPackage, L"-?"))) ||

-      ((ShellCommandLineGetFlag (ParamPackage, L"-l")) && (ShellCommandLineGetFlag (ParamPackage, L"-?")))) {

+      ((ShellCommandLineGetFlag (ParamPackage, L"-l")) && (ShellCommandLineGetFlag (ParamPackage, L"-?"))))

+  {

     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_CONFLICT_OPTIONS), gShellNetwork2HiiHandle);

     ShellStatus = SHELL_INVALID_PARAMETER;

     goto ON_EXIT;

@@ -1830,7 +1830,7 @@ ShellCommandRunIfconfig6 (
   //

   if (ShellCommandLineGetFlag (ParamPackage, L"-l")) {

     Private->OpCode = IfConfig6OpList;

-    ValueStr = ShellCommandLineGetValue (ParamPackage, L"-l");

+    ValueStr        = ShellCommandLineGetValue (ParamPackage, L"-l");

     if (ValueStr != NULL) {

       Str = AllocateCopyPool (StrSize (ValueStr), ValueStr);

       if (Str == NULL) {

@@ -1838,15 +1838,17 @@ ShellCommandRunIfconfig6 (
         ShellStatus = SHELL_OUT_OF_RESOURCES;

         goto ON_EXIT;

       }

+

       Private->IfName = Str;

     }

   }

+

   //

   // To get interface name for the clear option.

   //

   if (ShellCommandLineGetFlag (ParamPackage, L"-r")) {

     Private->OpCode = IfConfig6OpClear;

-    ValueStr = ShellCommandLineGetValue (ParamPackage, L"-r");

+    ValueStr        = ShellCommandLineGetValue (ParamPackage, L"-r");

     if (ValueStr != NULL) {

       Str = AllocateCopyPool (StrSize (ValueStr), ValueStr);

       if (Str == NULL) {

@@ -1854,20 +1856,22 @@ ShellCommandRunIfconfig6 (
         ShellStatus = SHELL_OUT_OF_RESOURCES;

         goto ON_EXIT;

       }

+

       Private->IfName = Str;

     }

   }

+

   //

   // To get interface name and corresponding Args for the set option.

   //

   if (ShellCommandLineGetFlag (ParamPackage, L"-s")) {

-

     ValueStr = ShellCommandLineGetValue (ParamPackage, L"-s");

     if (ValueStr == NULL) {

       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_ERR_LACK_INTERFACE), gShellNetwork2HiiHandle);

       ShellStatus = SHELL_INVALID_PARAMETER;

       goto ON_EXIT;

     }

+

     //

     // To split the configuration into multi-section.

     //

@@ -1883,12 +1887,13 @@ ShellCommandRunIfconfig6 (
 

     Private->VarArg = ArgList->Next;

 

-    if (Private->IfName == NULL || Private->VarArg == NULL) {

+    if ((Private->IfName == NULL) || (Private->VarArg == NULL)) {

       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_IFCONFIG6_ERR_LACK_COMMAND), gShellNetwork2HiiHandle);

       ShellStatus = SHELL_INVALID_PARAMETER;

       goto ON_EXIT;

     }

   }

+

   //

   // Main process of ifconfig6.

   //

@@ -1900,7 +1905,6 @@ ON_EXIT:
   if (Private != NULL) {

     IfConfig6Cleanup (Private);

   }

-  return ShellStatus;

 

+  return ShellStatus;

 }

-

diff --git a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c
index f173b84..e0b58d4 100644
--- a/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c
+++ b/ShellPkg/Library/UefiShellNetwork2CommandsLib/Ping6.c
@@ -9,22 +9,22 @@
 

 #include "UefiShellNetwork2CommandsLib.h"

 

-#define PING6_DEFAULT_TIMEOUT      5000

-#define PING6_MAX_SEND_NUMBER      10000

-#define PING6_MAX_BUFFER_SIZE      32768

-#define PING6_ONE_SECOND           10000000

-#define STALL_1_MILLI_SECOND  1000

+#define PING6_DEFAULT_TIMEOUT  5000

+#define PING6_MAX_SEND_NUMBER  10000

+#define PING6_MAX_BUFFER_SIZE  32768

+#define PING6_ONE_SECOND       10000000

+#define STALL_1_MILLI_SECOND   1000

 

 #pragma pack(1)

 

 typedef struct _ICMP6_ECHO_REQUEST_REPLY {

-  UINT8                       Type;

-  UINT8                       Code;

-  UINT16                      Checksum;

-  UINT16                      Identifier;

-  UINT16                      SequenceNum;

-  UINT32                      TimeStamp;

-  UINT8                       Data[1];

+  UINT8     Type;

+  UINT8     Code;

+  UINT16    Checksum;

+  UINT16    Identifier;

+  UINT16    SequenceNum;

+  UINT32    TimeStamp;

+  UINT8     Data[1];

 } ICMP6_ECHO_REQUEST_REPLY;

 

 #pragma pack()

@@ -63,8 +63,7 @@ typedef struct _PING6_PRIVATE_DATA {
   UINT32                      BufferSize;

 } PING6_PRIVATE_DATA;

 

-

-SHELL_PARAM_ITEM    Ping6ParamList[] = {

+SHELL_PARAM_ITEM  Ping6ParamList[] = {

   {

     L"-l",

     TypeValue

@@ -90,9 +89,9 @@ SHELL_PARAM_ITEM    Ping6ParamList[] = {
 //

 // Global Variables in Ping6 application.

 //

-CONST CHAR16            *mIp6DstString;

-CONST CHAR16            *mIp6SrcString;

-EFI_CPU_ARCH_PROTOCOL   *Cpu = NULL;

+CONST CHAR16           *mIp6DstString;

+CONST CHAR16           *mIp6SrcString;

+EFI_CPU_ARCH_PROTOCOL  *Cpu = NULL;

 

 /**

   RTT timer tick routine.

@@ -104,13 +103,13 @@ EFI_CPU_ARCH_PROTOCOL   *Cpu = NULL;
 VOID

 EFIAPI

 Ping6RttTimerTickRoutine (

-  IN EFI_EVENT    Event,

-  IN VOID         *Context

+  IN EFI_EVENT  Event,

+  IN VOID       *Context

   )

 {

-  UINT32     *RttTimerTick;

+  UINT32  *RttTimerTick;

 

-  RttTimerTick = (UINT32*) Context;

+  RttTimerTick = (UINT32 *)Context;

   (*RttTimerTick)++;

 }

 

@@ -124,18 +123,18 @@ Ping6RttTimerTickRoutine (
 

 **/

 UINT32

-Ping6GetTimerPeriod(

+Ping6GetTimerPeriod (

   VOID

   )

 {

-  EFI_STATUS                 Status;

-  UINT32                     RttTimerTick;

-  EFI_EVENT                  TimerEvent;

-  UINT32                     StallCounter;

-  EFI_TPL                    OldTpl;

+  EFI_STATUS  Status;

+  UINT32      RttTimerTick;

+  EFI_EVENT   TimerEvent;

+  UINT32      StallCounter;

+  EFI_TPL     OldTpl;

 

   RttTimerTick = 0;

-  StallCounter   = 0;

+  StallCounter = 0;

 

   Status = gBS->CreateEvent (

                   EVT_TIMER | EVT_NOTIFY_SIGNAL,

@@ -172,7 +171,6 @@ Ping6GetTimerPeriod(
   return StallCounter / RttTimerTick;

 }

 

-

 /**

   Initialize the timer event for RTT (round trip time).

 

@@ -184,10 +182,10 @@ Ping6GetTimerPeriod(
 **/

 EFI_STATUS

 Ping6InitRttTimer (

-  IN  PING6_PRIVATE_DATA      *Private

+  IN  PING6_PRIVATE_DATA  *Private

   )

 {

-  EFI_STATUS                 Status;

+  EFI_STATUS  Status;

 

   Private->TimerPeriod = Ping6GetTimerPeriod ();

   if (Private->TimerPeriod == 0) {

@@ -195,13 +193,13 @@ Ping6InitRttTimer (
   }

 

   Private->RttTimerTick = 0;

-  Status = gBS->CreateEvent (

-                  EVT_TIMER | EVT_NOTIFY_SIGNAL,

-                  TPL_NOTIFY,

-                  Ping6RttTimerTickRoutine,

-                  &Private->RttTimerTick,

-                  &Private->RttTimer

-                  );

+  Status                = gBS->CreateEvent (

+                                 EVT_TIMER | EVT_NOTIFY_SIGNAL,

+                                 TPL_NOTIFY,

+                                 Ping6RttTimerTickRoutine,

+                                 &Private->RttTimerTick,

+                                 &Private->RttTimer

+                                 );

   if (EFI_ERROR (Status)) {

     return Status;

   }

@@ -217,7 +215,6 @@ Ping6InitRttTimer (
   }

 

   return EFI_SUCCESS;

-

 }

 

 /**

@@ -228,7 +225,7 @@ Ping6InitRttTimer (
 **/

 VOID

 Ping6FreeRttTimer (

-  IN  PING6_PRIVATE_DATA      *Private

+  IN  PING6_PRIVATE_DATA  *Private

   )

 {

   if (Private->RttTimer != NULL) {

@@ -246,7 +243,7 @@ Ping6FreeRttTimer (
 **/

 UINT32

 Ping6ReadTime (

-  IN  PING6_PRIVATE_DATA      *Private

+  IN  PING6_PRIVATE_DATA  *Private

   )

 {

   return Private->RttTimerTick;

@@ -264,9 +261,9 @@ Ping6ReadTime (
 **/

 UINT32

 Ping6CalculateTick (

-  IN PING6_PRIVATE_DATA      *Private,

-  IN UINT32    Begin,

-  IN UINT32    End

+  IN PING6_PRIVATE_DATA  *Private,

+  IN UINT32              Begin,

+  IN UINT32              End

   )

 {

   if (End < Begin) {

@@ -274,7 +271,6 @@ Ping6CalculateTick (
   }

 

   return (End - Begin) * Private->TimerPeriod;

-

 }

 

 /**

@@ -285,24 +281,22 @@ Ping6CalculateTick (
 **/

 VOID

 Ping6DestroyTxInfo (

-  IN PING6_ICMP6_TX_INFO    *TxInfo

+  IN PING6_ICMP6_TX_INFO  *TxInfo

   )

 {

-  EFI_IP6_TRANSMIT_DATA    *TxData;

-  EFI_IP6_FRAGMENT_DATA    *FragData;

-  UINTN                    Index;

+  EFI_IP6_TRANSMIT_DATA  *TxData;

+  EFI_IP6_FRAGMENT_DATA  *FragData;

+  UINTN                  Index;

 

   ASSERT (TxInfo != NULL);

 

   if (TxInfo->Token != NULL) {

-

     if (TxInfo->Token->Event != NULL) {

       gBS->CloseEvent (TxInfo->Token->Event);

     }

 

     TxData = TxInfo->Token->Packet.TxData;

     if (TxData != NULL) {

-

       if (TxData->OverrideData != NULL) {

         FreePool (TxData->OverrideData);

       }

@@ -337,13 +331,13 @@ Ping6DestroyTxInfo (
 **/

 EFI_STATUS

 Ping6OnMatchEchoReply (

-  IN PING6_PRIVATE_DATA          *Private,

-  IN ICMP6_ECHO_REQUEST_REPLY    *Packet

+  IN PING6_PRIVATE_DATA        *Private,

+  IN ICMP6_ECHO_REQUEST_REPLY  *Packet

   )

 {

-  PING6_ICMP6_TX_INFO    *TxInfo;

-  LIST_ENTRY             *Entry;

-  LIST_ENTRY             *NextEntry;

+  PING6_ICMP6_TX_INFO  *TxInfo;

+  LIST_ENTRY           *Entry;

+  LIST_ENTRY           *NextEntry;

 

   NET_LIST_FOR_EACH_SAFE (Entry, NextEntry, &Private->TxList) {

     TxInfo = BASE_CR (Entry, PING6_ICMP6_TX_INFO, Link);

@@ -372,8 +366,8 @@ Ping6OnMatchEchoReply (
 VOID

 EFIAPI

 Ping6OnEchoRequestSent6 (

-  IN EFI_EVENT    Event,

-  IN VOID         *Context

+  IN EFI_EVENT  Event,

+  IN VOID       *Context

   )

 {

 }

@@ -388,19 +382,19 @@ Ping6OnEchoRequestSent6 (
 VOID

 EFIAPI

 Ping6OnEchoReplyReceived6 (

-  IN EFI_EVENT    Event,

-  IN VOID         *Context

+  IN EFI_EVENT  Event,

+  IN VOID       *Context

   )

 {

-  EFI_STATUS                  Status;

-  PING6_PRIVATE_DATA          *Private;

-  EFI_IP6_COMPLETION_TOKEN    *RxToken;

-  EFI_IP6_RECEIVE_DATA        *RxData;

-  ICMP6_ECHO_REQUEST_REPLY    *Reply;

-  UINT32                      PayLoad;

-  UINT32                      Rtt;

+  EFI_STATUS                Status;

+  PING6_PRIVATE_DATA        *Private;

+  EFI_IP6_COMPLETION_TOKEN  *RxToken;

+  EFI_IP6_RECEIVE_DATA      *RxData;

+  ICMP6_ECHO_REQUEST_REPLY  *Reply;

+  UINT32                    PayLoad;

+  UINT32                    Rtt;

 

-  Private = (PING6_PRIVATE_DATA *) Context;

+  Private = (PING6_PRIVATE_DATA *)Context;

 

   if (Private->Status == EFI_ABORTED) {

     return;

@@ -416,7 +410,8 @@ Ping6OnEchoReplyReceived6 (
   }

 

   if (!IP6_IS_MULTICAST (&Private->DstAddress) &&

-      !EFI_IP6_EQUAL (&RxData->Header->SourceAddress, &Private->DstAddress)) {

+      !EFI_IP6_EQUAL (&RxData->Header->SourceAddress, &Private->DstAddress))

+  {

     goto ON_EXIT;

   }

 

@@ -427,17 +422,19 @@ Ping6OnEchoReplyReceived6 (
   if (PayLoad != Private->BufferSize) {

     goto ON_EXIT;

   }

+

   //

   // Check whether the reply matches the sent request before.

   //

   Status = Ping6OnMatchEchoReply (Private, Reply);

-  if (EFI_ERROR(Status)) {

+  if (EFI_ERROR (Status)) {

     goto ON_EXIT;

   }

+

   //

   // Display statistics on this icmp6 echo reply packet.

   //

-  Rtt  = Ping6CalculateTick (Private, Reply->TimeStamp, Ping6ReadTime (Private));

+  Rtt = Ping6CalculateTick (Private, Reply->TimeStamp, Ping6ReadTime (Private));

 

   Private->RttSum += Rtt;

   Private->RttMin  = Private->RttMin > Rtt ? Rtt : Private->RttMin;

@@ -477,6 +474,7 @@ ON_EXIT:
     //

     Private->Status = EFI_SUCCESS;

   }

+

   //

   // Singal to recycle the each rxdata here, not at the end of process.

   //

@@ -495,21 +493,22 @@ ON_EXIT:
 **/

 EFI_IP6_COMPLETION_TOKEN *

 Ping6GenerateToken (

-  IN PING6_PRIVATE_DATA    *Private,

-  IN UINT32                TimeStamp,

-  IN UINT16                SequenceNum

+  IN PING6_PRIVATE_DATA  *Private,

+  IN UINT32              TimeStamp,

+  IN UINT16              SequenceNum

   )

 {

-  EFI_STATUS                  Status;

-  EFI_IP6_COMPLETION_TOKEN    *Token;

-  EFI_IP6_TRANSMIT_DATA       *TxData;

-  ICMP6_ECHO_REQUEST_REPLY    *Request;

+  EFI_STATUS                Status;

+  EFI_IP6_COMPLETION_TOKEN  *Token;

+  EFI_IP6_TRANSMIT_DATA     *TxData;

+  ICMP6_ECHO_REQUEST_REPLY  *Request;

 

   Request = AllocateZeroPool (Private->BufferSize);

 

   if (Request == NULL) {

     return NULL;

   }

+

   //

   // Assembly icmp6 echo request packet.

   //

@@ -522,7 +521,7 @@ Ping6GenerateToken (
   // Leave check sum to ip6 layer, since it has no idea of source address

   // selection.

   //

-  Request->Checksum    = 0;

+  Request->Checksum = 0;

 

   TxData = AllocateZeroPool (sizeof (EFI_IP6_TRANSMIT_DATA));

 

@@ -530,15 +529,16 @@ Ping6GenerateToken (
     FreePool (Request);

     return NULL;

   }

+

   //

   // Assembly ipv6 token for transmit.

   //

-  TxData->OverrideData       = 0;

-  TxData->ExtHdrsLength      = 0;

-  TxData->ExtHdrs            = NULL;

-  TxData->DataLength         = Private->BufferSize;

-  TxData->FragmentCount      = 1;

-  TxData->FragmentTable[0].FragmentBuffer = (VOID *) Request;

+  TxData->OverrideData                    = 0;

+  TxData->ExtHdrsLength                   = 0;

+  TxData->ExtHdrs                         = NULL;

+  TxData->DataLength                      = Private->BufferSize;

+  TxData->FragmentCount                   = 1;

+  TxData->FragmentTable[0].FragmentBuffer = (VOID *)Request;

   TxData->FragmentTable[0].FragmentLength = Private->BufferSize;

 

   Token = AllocateZeroPool (sizeof (EFI_IP6_COMPLETION_TOKEN));

@@ -549,8 +549,8 @@ Ping6GenerateToken (
     return NULL;

   }

 

-  Token->Status         = EFI_ABORTED;

-  Token->Packet.TxData  = TxData;

+  Token->Status        = EFI_ABORTED;

+  Token->Packet.TxData = TxData;

 

   Status = gBS->CreateEvent (

                   EVT_NOTIFY_SIGNAL,

@@ -582,11 +582,11 @@ Ping6GenerateToken (
 **/

 EFI_STATUS

 Ping6SendEchoRequest (

-  IN PING6_PRIVATE_DATA    *Private

+  IN PING6_PRIVATE_DATA  *Private

   )

 {

-  EFI_STATUS             Status;

-  PING6_ICMP6_TX_INFO    *TxInfo;

+  EFI_STATUS           Status;

+  PING6_ICMP6_TX_INFO  *TxInfo;

 

   TxInfo = AllocateZeroPool (sizeof (PING6_ICMP6_TX_INFO));

 

@@ -595,13 +595,13 @@ Ping6SendEchoRequest (
   }

 

   TxInfo->TimeStamp   = Ping6ReadTime (Private);

-  TxInfo->SequenceNum = (UINT16) (Private->TxCount + 1);

+  TxInfo->SequenceNum = (UINT16)(Private->TxCount + 1);

 

-  TxInfo->Token       = Ping6GenerateToken (

-                          Private,

-                          TxInfo->TimeStamp,

-                          TxInfo->SequenceNum

-                          );

+  TxInfo->Token = Ping6GenerateToken (

+                    Private,

+                    TxInfo->TimeStamp,

+                    TxInfo->SequenceNum

+                    );

 

   if (TxInfo->Token == NULL) {

     Ping6DestroyTxInfo (TxInfo);

@@ -632,10 +632,10 @@ Ping6SendEchoRequest (
 **/

 EFI_STATUS

 Ping6OnReceiveEchoReply (

-  IN PING6_PRIVATE_DATA    *Private

+  IN PING6_PRIVATE_DATA  *Private

   )

 {

-  EFI_STATUS    Status;

+  EFI_STATUS  Status;

 

   ZeroMem (&Private->RxToken, sizeof (EFI_IP6_COMPLETION_TOKEN));

 

@@ -657,6 +657,7 @@ Ping6OnReceiveEchoReply (
   if (EFI_ERROR (Status)) {

     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING6_IP6_RECEIVE), gShellNetwork2HiiHandle, Status);

   }

+

   return Status;

 }

 

@@ -670,31 +671,31 @@ Ping6OnReceiveEchoReply (
 VOID

 EFIAPI

 Ping6OnTimerRoutine6 (

-  IN EFI_EVENT    Event,

-  IN VOID         *Context

+  IN EFI_EVENT  Event,

+  IN VOID       *Context

   )

 {

-  EFI_STATUS             Status;

-  PING6_PRIVATE_DATA     *Private;

-  PING6_ICMP6_TX_INFO    *TxInfo;

-  LIST_ENTRY             *Entry;

-  LIST_ENTRY             *NextEntry;

-  UINT64                 Time;

+  EFI_STATUS           Status;

+  PING6_PRIVATE_DATA   *Private;

+  PING6_ICMP6_TX_INFO  *TxInfo;

+  LIST_ENTRY           *Entry;

+  LIST_ENTRY           *NextEntry;

+  UINT64               Time;

 

-  Private = (PING6_PRIVATE_DATA *) Context;

+  Private = (PING6_PRIVATE_DATA *)Context;

 

   //

   // Retransmit icmp6 echo request packets per second in sendnumber times.

   //

   if (Private->TxCount < Private->SendNum) {

-

     Status = Ping6SendEchoRequest (Private);

-    if (Private->TxCount != 0){

+    if (Private->TxCount != 0) {

       if (EFI_ERROR (Status)) {

         ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING6_SEND_REQUEST), gShellNetwork2HiiHandle, Private->TxCount + 1);

       }

     }

   }

+

   //

   // Check whether any icmp6 echo request in the list timeout.

   //

@@ -706,10 +707,10 @@ Ping6OnTimerRoutine6 (
     // Remove the timeout echo request from txlist.

     //

     if (Time > PING6_DEFAULT_TIMEOUT) {

-

       if (EFI_ERROR (TxInfo->Token->Status)) {

         Private->Ip6->Cancel (Private->Ip6, TxInfo->Token);

       }

+

       //

       // Remove the timeout icmp6 echo request from list.

       //

@@ -741,29 +742,29 @@ Ping6OnTimerRoutine6 (
 **/

 EFI_STATUS

 Ping6CreateIpInstance (

-  IN  PING6_PRIVATE_DATA    *Private

+  IN  PING6_PRIVATE_DATA  *Private

   )

 {

-  EFI_STATUS                       Status;

-  UINTN                            HandleIndex;

-  UINTN                            HandleNum;

-  EFI_HANDLE                       *HandleBuffer;

-  BOOLEAN                          UnspecifiedSrc;

-  EFI_STATUS                       MediaStatus;

-  EFI_SERVICE_BINDING_PROTOCOL     *Ip6Sb;

-  EFI_IP6_CONFIG_PROTOCOL          *Ip6Cfg;

-  EFI_IP6_CONFIG_DATA              Ip6Config;

-  EFI_IP6_CONFIG_INTERFACE_INFO    *IfInfo;

-  UINTN                            IfInfoSize;

-  EFI_IPv6_ADDRESS                 *Addr;

-  UINTN                            AddrIndex;

-

-  HandleBuffer      = NULL;

-  UnspecifiedSrc    = FALSE;

-  MediaStatus       = EFI_SUCCESS;

-  Ip6Sb             = NULL;

-  IfInfo            = NULL;

-  IfInfoSize        = 0;

+  EFI_STATUS                     Status;

+  UINTN                          HandleIndex;

+  UINTN                          HandleNum;

+  EFI_HANDLE                     *HandleBuffer;

+  BOOLEAN                        UnspecifiedSrc;

+  EFI_STATUS                     MediaStatus;

+  EFI_SERVICE_BINDING_PROTOCOL   *Ip6Sb;

+  EFI_IP6_CONFIG_PROTOCOL        *Ip6Cfg;

+  EFI_IP6_CONFIG_DATA            Ip6Config;

+  EFI_IP6_CONFIG_INTERFACE_INFO  *IfInfo;

+  UINTN                          IfInfoSize;

+  EFI_IPv6_ADDRESS               *Addr;

+  UINTN                          AddrIndex;

+

+  HandleBuffer   = NULL;

+  UnspecifiedSrc = FALSE;

+  MediaStatus    = EFI_SUCCESS;

+  Ip6Sb          = NULL;

+  IfInfo         = NULL;

+  IfInfoSize     = 0;

 

   //

   // Locate all the handles with ip6 service binding protocol.

@@ -799,7 +800,6 @@ Ping6CreateIpInstance (
   // For each ip6 protocol, check interface addresses list.

   //

   for (HandleIndex = 0; HandleIndex < HandleNum; HandleIndex++) {

-

     Ip6Sb      = NULL;

     IfInfo     = NULL;

     IfInfoSize = 0;

@@ -820,7 +820,7 @@ Ping6CreateIpInstance (
     Status = gBS->HandleProtocol (

                     HandleBuffer[HandleIndex],

                     &gEfiIp6ServiceBindingProtocolGuid,

-                    (VOID **) &Ip6Sb

+                    (VOID **)&Ip6Sb

                     );

     if (EFI_ERROR (Status)) {

       goto ON_ERROR;

@@ -833,12 +833,13 @@ Ping6CreateIpInstance (
     Status = gBS->HandleProtocol (

                     HandleBuffer[HandleIndex],

                     &gEfiIp6ConfigProtocolGuid,

-                    (VOID **) &Ip6Cfg

+                    (VOID **)&Ip6Cfg

                     );

 

     if (EFI_ERROR (Status)) {

       goto ON_ERROR;

     }

+

     //

     // Get the interface information size.

     //

@@ -860,6 +861,7 @@ Ping6CreateIpInstance (
       Status = EFI_OUT_OF_RESOURCES;

       goto ON_ERROR;

     }

+

     //

     // Get the interface info.

     //

@@ -874,6 +876,7 @@ Ping6CreateIpInstance (
       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING6_IP6CFG_GETDATA), gShellNetwork2HiiHandle, Status);

       goto ON_ERROR;

     }

+

     //

     // Check whether the source address is one of the interface addresses.

     //

@@ -885,7 +888,7 @@ Ping6CreateIpInstance (
           //

           // Select the interface automatically.

           //

-          CopyMem(&Private->SrcAddress, Addr, sizeof(Private->SrcAddress));

+          CopyMem (&Private->SrcAddress, Addr, sizeof (Private->SrcAddress));

           break;

         }

       } else if (EFI_IP6_EQUAL (&Private->SrcAddress, Addr)) {

@@ -906,6 +909,7 @@ Ping6CreateIpInstance (
     FreePool (IfInfo);

     IfInfo = NULL;

   }

+

   //

   // No exact interface address matched.

   //

@@ -928,7 +932,7 @@ Ping6CreateIpInstance (
   Status = gBS->OpenProtocol (

                   Private->Ip6ChildHandle,

                   &gEfiIp6ProtocolGuid,

-                  (VOID **) &Private->Ip6,

+                  (VOID **)&Private->Ip6,

                   Private->ImageHandle,

                   Private->Ip6ChildHandle,

                   EFI_OPEN_PROTOCOL_GET_PROTOCOL

@@ -989,11 +993,11 @@ ON_ERROR:
 **/

 VOID

 Ping6DestroyIpInstance (

-  IN PING6_PRIVATE_DATA    *Private

+  IN PING6_PRIVATE_DATA  *Private

   )

 {

-  EFI_STATUS                      Status;

-  EFI_SERVICE_BINDING_PROTOCOL    *Ip6Sb;

+  EFI_STATUS                    Status;

+  EFI_SERVICE_BINDING_PROTOCOL  *Ip6Sb;

 

   gBS->CloseProtocol (

          Private->Ip6ChildHandle,

@@ -1005,10 +1009,10 @@ Ping6DestroyIpInstance (
   Status = gBS->HandleProtocol (

                   Private->NicHandle,

                   &gEfiIp6ServiceBindingProtocolGuid,

-                  (VOID **) &Ip6Sb

+                  (VOID **)&Ip6Sb

                   );

 

-  if (!EFI_ERROR(Status)) {

+  if (!EFI_ERROR (Status)) {

     Ip6Sb->DestroyChild (Ip6Sb, Private->Ip6ChildHandle);

   }

 }

@@ -1028,23 +1032,23 @@ Ping6DestroyIpInstance (
 **/

 SHELL_STATUS

 ShellPing6 (

-  IN EFI_HANDLE          ImageHandle,

-  IN UINT32              SendNumber,

-  IN UINT32              BufferSize,

-  IN EFI_IPv6_ADDRESS    *SrcAddress,

-  IN EFI_IPv6_ADDRESS    *DstAddress

+  IN EFI_HANDLE        ImageHandle,

+  IN UINT32            SendNumber,

+  IN UINT32            BufferSize,

+  IN EFI_IPv6_ADDRESS  *SrcAddress,

+  IN EFI_IPv6_ADDRESS  *DstAddress

   )

 {

-  EFI_STATUS             Status;

-  EFI_INPUT_KEY          Key;

-  PING6_PRIVATE_DATA     *Private;

-  PING6_ICMP6_TX_INFO    *TxInfo;

-  LIST_ENTRY             *Entry;

-  LIST_ENTRY             *NextEntry;

-  SHELL_STATUS           ShellStatus;

+  EFI_STATUS           Status;

+  EFI_INPUT_KEY        Key;

+  PING6_PRIVATE_DATA   *Private;

+  PING6_ICMP6_TX_INFO  *TxInfo;

+  LIST_ENTRY           *Entry;

+  LIST_ENTRY           *NextEntry;

+  SHELL_STATUS         ShellStatus;

 

   ShellStatus = SHELL_SUCCESS;

-  Private = AllocateZeroPool (sizeof (PING6_PRIVATE_DATA));

+  Private     = AllocateZeroPool (sizeof (PING6_PRIVATE_DATA));

 

   if (Private == NULL) {

     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_OUT_MEM), gShellNetwork2HiiHandle, L"Ping6");

@@ -1055,7 +1059,7 @@ ShellPing6 (
   Private->ImageHandle = ImageHandle;

   Private->SendNum     = SendNumber;

   Private->BufferSize  = BufferSize;

-  Private->RttMin      = ~((UINT64 )(0x0));

+  Private->RttMin      = ~((UINT64)(0x0));

   Private->Status      = EFI_NOT_READY;

 

   InitializeListHead (&Private->TxList);

@@ -1072,6 +1076,7 @@ ShellPing6 (
     ShellStatus = SHELL_ACCESS_DENIED;

     goto ON_EXIT;

   }

+

   //

   // Print the command line itself.

   //

@@ -1085,6 +1090,7 @@ ShellPing6 (
     ShellStatus = SHELL_ACCESS_DENIED;

     goto ON_EXIT;

   }

+

   //

   // Create and start timer to send icmp6 echo request packet per second.

   //

@@ -1119,7 +1125,7 @@ ShellPing6 (
   //

   if (EFI_ERROR (Status) && (Status != EFI_NOT_READY)) {

     ShellStatus = SHELL_ACCESS_DENIED;

-    if(Status == EFI_NOT_FOUND) {

+    if (Status == EFI_NOT_FOUND) {

       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING6_NOSOURCE_INDOMAIN), gShellNetwork2HiiHandle, mIp6DstString);

     }

 

@@ -1136,6 +1142,7 @@ ShellPing6 (
     ShellStatus = SHELL_ACCESS_DENIED;

     goto ON_EXIT;

   }

+

   //

   // Control the ping6 process by two factors:

   // 1. Hot key

@@ -1152,9 +1159,10 @@ ShellPing6 (
     //

     Status = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);

 

-    if (!EFI_ERROR(Status)) {

+    if (!EFI_ERROR (Status)) {

       if ((Key.UnicodeChar == 0x1b) || (Key.UnicodeChar == 0x03) ||

-         ((Key.UnicodeChar == 0) && (Key.ScanCode == SCAN_ESC))) {

+          ((Key.UnicodeChar == 0) && (Key.ScanCode == SCAN_ESC)))

+      {

         goto ON_STAT;

       }

     }

@@ -1251,23 +1259,23 @@ ShellCommandRunPing6 (
   IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_STATUS          Status;

-  SHELL_STATUS        ShellStatus;

-  EFI_IPv6_ADDRESS    DstAddress;

-  EFI_IPv6_ADDRESS    SrcAddress;

-  UINT64              BufferSize;

-  UINTN               SendNumber;

-  LIST_ENTRY          *ParamPackage;

-  CONST CHAR16        *ValueStr;

-  CONST CHAR16        *ValueStrPtr;

-  UINTN               NonOptionCount;

-  CHAR16              *ProblemParam;

+  EFI_STATUS        Status;

+  SHELL_STATUS      ShellStatus;

+  EFI_IPv6_ADDRESS  DstAddress;

+  EFI_IPv6_ADDRESS  SrcAddress;

+  UINT64            BufferSize;

+  UINTN             SendNumber;

+  LIST_ENTRY        *ParamPackage;

+  CONST CHAR16      *ValueStr;

+  CONST CHAR16      *ValueStrPtr;

+  UINTN             NonOptionCount;

+  CHAR16            *ProblemParam;

 

   ProblemParam = NULL;

-  ShellStatus = SHELL_SUCCESS;

+  ShellStatus  = SHELL_SUCCESS;

 

   Status = ShellCommandLineParseEx (Ping6ParamList, &ParamPackage, &ProblemParam, TRUE, FALSE);

-  if (EFI_ERROR(Status)) {

+  if (EFI_ERROR (Status)) {

     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING6_INVALID_INPUT), gShellNetwork2HiiHandle);

     ShellStatus = SHELL_INVALID_PARAMETER;

     goto ON_EXIT;

@@ -1279,7 +1287,7 @@ ShellCommandRunPing6 (
   //

   // Parse the parameter of count number.

   //

-  ValueStr = ShellCommandLineGetValue (ParamPackage, L"-n");

+  ValueStr    = ShellCommandLineGetValue (ParamPackage, L"-n");

   ValueStrPtr = ValueStr;

   if (ValueStr != NULL) {

     SendNumber = ShellStrToUintn (ValueStrPtr);

@@ -1293,10 +1301,11 @@ ShellCommandRunPing6 (
       goto ON_EXIT;

     }

   }

+

   //

   // Parse the parameter of buffer size.

   //

-  ValueStr = ShellCommandLineGetValue (ParamPackage, L"-l");

+  ValueStr    = ShellCommandLineGetValue (ParamPackage, L"-l");

   ValueStrPtr = ValueStr;

   if (ValueStr != NULL) {

     BufferSize = ShellStrToUintn (ValueStrPtr);

@@ -1317,31 +1326,33 @@ ShellCommandRunPing6 (
   //

   // Parse the parameter of source ip address.

   //

-  ValueStr = ShellCommandLineGetValue (ParamPackage, L"-s");

+  ValueStr    = ShellCommandLineGetValue (ParamPackage, L"-s");

   ValueStrPtr = ValueStr;

   if (ValueStr != NULL) {

     mIp6SrcString = ValueStr;

-    Status = NetLibStrToIp6 (ValueStrPtr, &SrcAddress);

+    Status        = NetLibStrToIp6 (ValueStrPtr, &SrcAddress);

     if (EFI_ERROR (Status)) {

       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING6_INVALID_IP), gShellNetwork2HiiHandle, ValueStr);

       ShellStatus = SHELL_INVALID_PARAMETER;

       goto ON_EXIT;

     }

   }

+

   //

   // Parse the parameter of destination ip address.

   //

-  NonOptionCount = ShellCommandLineGetCount(ParamPackage);

-  ValueStr = ShellCommandLineGetRawValue (ParamPackage, (UINT32)(NonOptionCount-1));

+  NonOptionCount = ShellCommandLineGetCount (ParamPackage);

+  ValueStr       = ShellCommandLineGetRawValue (ParamPackage, (UINT32)(NonOptionCount-1));

   if (NonOptionCount != 2) {

     ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING6_INVALID_INPUT), gShellNetwork2HiiHandle);

     ShellStatus = SHELL_INVALID_PARAMETER;

     goto ON_EXIT;

   }

+

   ValueStrPtr = ValueStr;

   if (ValueStr != NULL) {

     mIp6DstString = ValueStr;

-    Status = NetLibStrToIp6 (ValueStrPtr, &DstAddress);

+    Status        = NetLibStrToIp6 (ValueStrPtr, &DstAddress);

     if (EFI_ERROR (Status)) {

       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_PING6_INVALID_IP), gShellNetwork2HiiHandle, ValueStr);

       ShellStatus = SHELL_INVALID_PARAMETER;

@@ -1353,15 +1364,14 @@ ShellCommandRunPing6 (
   // Enter into ping6 process.

   //

   ShellStatus = ShellPing6 (

-              ImageHandle,

-              (UINT32)SendNumber,

-              (UINT32)BufferSize,

-              &SrcAddress,

-              &DstAddress

-              );

+                  ImageHandle,

+                  (UINT32)SendNumber,

+                  (UINT32)BufferSize,

+                  &SrcAddress,

+                  &DstAddress

+                  );

 

 ON_EXIT:

   ShellCommandLineFreeVarList (ParamPackage);

   return ShellStatus;

 }

-

diff --git a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.c b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.c
index 4aab429..29c8245 100644
--- a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.c
+++ b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.c
@@ -7,15 +7,15 @@
 **/

 #include "UefiShellNetwork2CommandsLib.h"

 

-CONST CHAR16 gShellNetwork2FileName[] = L"ShellCommands";

-EFI_HII_HANDLE gShellNetwork2HiiHandle = NULL;

+CONST CHAR16    gShellNetwork2FileName[] = L"ShellCommands";

+EFI_HII_HANDLE  gShellNetwork2HiiHandle  = NULL;

 

 /**

   return the file name of the help text file if not using HII.

 

   @return The string pointer to the file name.

 **/

-CONST CHAR16*

+CONST CHAR16 *

 EFIAPI

 ShellCommandGetManFileNameNetwork2 (

   VOID

@@ -47,7 +47,7 @@ ShellNetwork2CommandsLibConstructor (
   //

   // check our bit of the profiles mask

   //

-  if ((PcdGet8(PcdShellProfileMask) & BIT4) == 0) {

+  if ((PcdGet8 (PcdShellProfileMask) & BIT4) == 0) {

     return (EFI_SUCCESS);

   }

 

@@ -55,14 +55,14 @@ ShellNetwork2CommandsLibConstructor (
   if (gShellNetwork2HiiHandle == NULL) {

     return (EFI_DEVICE_ERROR);

   }

+

   //

   // install our shell command handlers

   //

-  ShellCommandRegisterCommandName(L"ping6",    ShellCommandRunPing6     , ShellCommandGetManFileNameNetwork2, 0, L"network2", TRUE , gShellNetwork2HiiHandle, STRING_TOKEN(STR_GET_HELP_PING6));

-  ShellCommandRegisterCommandName(L"ifconfig6",ShellCommandRunIfconfig6 , ShellCommandGetManFileNameNetwork2, 0, L"network2", TRUE , gShellNetwork2HiiHandle, STRING_TOKEN(STR_GET_HELP_IFCONFIG6));

+  ShellCommandRegisterCommandName (L"ping6", ShellCommandRunPing6, ShellCommandGetManFileNameNetwork2, 0, L"network2", TRUE, gShellNetwork2HiiHandle, STRING_TOKEN (STR_GET_HELP_PING6));

+  ShellCommandRegisterCommandName (L"ifconfig6", ShellCommandRunIfconfig6, ShellCommandGetManFileNameNetwork2, 0, L"network2", TRUE, gShellNetwork2HiiHandle, STRING_TOKEN (STR_GET_HELP_IFCONFIG6));

 

   return EFI_SUCCESS;

-

 }

 

 /**

@@ -79,8 +79,8 @@ ShellNetwork2CommandsLibDestructor (
   )

 {

   if (gShellNetwork2HiiHandle != NULL) {

-    HiiRemovePackages(gShellNetwork2HiiHandle);

+    HiiRemovePackages (gShellNetwork2HiiHandle);

   }

+

   return EFI_SUCCESS;

 }

-

diff --git a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.h b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.h
index 9ea42cf..9feab25 100644
--- a/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.h
+++ b/ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.h
@@ -27,7 +27,7 @@
 #include <Library/HiiLib.h>

 #include <Library/NetLib.h>

 

-extern EFI_HII_HANDLE gShellNetwork2HiiHandle;

+extern EFI_HII_HANDLE  gShellNetwork2HiiHandle;

 

 /**

   Function for 'ping6' command.

@@ -64,4 +64,3 @@ ShellCommandRunIfconfig6 (
   );

 

 #endif

-