Changed the code style. it could pass EBC and ICC build.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3781 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 41 insertions, 46 deletions

diff --git a/MdeModulePkg/Include/Library/IpIoLib.h b/MdeModulePkg/Include/Library/IpIoLib.h
index e2c9f67559..682036f252 100644
--- a/MdeModulePkg/Include/Library/IpIoLib.h
+++ b/MdeModulePkg/Include/Library/IpIoLib.h
@@ -68,12 +68,10 @@ typedef enum {
 } ICMP_ERROR;

 

 typedef struct _ICMP_ERROR_INFO {

-  EFI_STATUS  Error;

   BOOLEAN     IsHard;

   BOOLEAN     Notify;

 } ICMP_ERROR_INFO;

 
-
 #define EFI_IP4_HEADER_LEN(HdrPtr) ((HdrPtr)->HeaderLength << 2)
 
 extern EFI_IP4_CONFIG_DATA  mIpIoDefaultIpConfigData;
diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
index cc869717dd..608bdd297e 100644
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
+++ b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
@@ -58,6 +58,19 @@ EFI_IP4_CONFIG_DATA  mIpIoDefaultIpConfigData = {
   0

 };

 

+STATIC ICMP_ERROR_INFO  mIcmpErrMap[10] = {

+  {FALSE, TRUE},

+  {FALSE, TRUE},

+  {TRUE, TRUE},

+  {TRUE, TRUE},

+  {TRUE, TRUE},

+  {FALSE, TRUE},

+  {FALSE, TRUE},

+  {FALSE, TRUE},

+  {FALSE, FALSE},

+  {FALSE, TRUE}

+};

+

 STATIC

 VOID

 EFIAPI

@@ -1271,58 +1284,42 @@ IpIoGetIcmpErrStatus (
   OUT BOOLEAN     *Notify OPTIONAL

   )

 {

-  ICMP_ERROR_INFO  IcmpErrMap[10];

-

-  IcmpErrMap[0].Error  = EFI_NETWORK_UNREACHABLE;

-  IcmpErrMap[0].IsHard = FALSE;

-  IcmpErrMap[0].Notify = TRUE;

-

-  IcmpErrMap[1].Error = EFI_HOST_UNREACHABLE;

-  IcmpErrMap[1].IsHard = FALSE;

-  IcmpErrMap[1].Notify = TRUE;

-

-  IcmpErrMap[2].Error = EFI_PROTOCOL_UNREACHABLE;

-  IcmpErrMap[2].IsHard = TRUE;

-  IcmpErrMap[2].Notify = TRUE;

-

-  IcmpErrMap[3].Error = EFI_PORT_UNREACHABLE;

-  IcmpErrMap[3].IsHard = TRUE;

-  IcmpErrMap[3].Notify = TRUE;

-

-  IcmpErrMap[4].Error = EFI_ICMP_ERROR;

-  IcmpErrMap[4].IsHard = TRUE;

-  IcmpErrMap[4].Notify = TRUE;

-

-  IcmpErrMap[5].Error = EFI_ICMP_ERROR;

-  IcmpErrMap[5].IsHard = FALSE;

-  IcmpErrMap[5].Notify = TRUE;

+  ASSERT ((IcmpError >= ICMP_ERR_UNREACH_NET) && (IcmpError <= ICMP_ERR_PARAMPROB));

 

-  IcmpErrMap[6].Error = EFI_HOST_UNREACHABLE;

-  IcmpErrMap[6].IsHard = FALSE;

-  IcmpErrMap[6].Notify = TRUE;

+  if (IsHard != NULL) {

+    *IsHard = mIcmpErrMap[IcmpError].IsHard;

+  }

 

-  IcmpErrMap[7].Error = EFI_HOST_UNREACHABLE;

-  IcmpErrMap[7].IsHard = FALSE;

-  IcmpErrMap[7].Notify = TRUE;

+  if (Notify != NULL) {

+    *Notify = mIcmpErrMap[IcmpError].Notify;

+  }

 

-  IcmpErrMap[8].Error = EFI_ICMP_ERROR;

-  IcmpErrMap[8].IsHard = FALSE;

-  IcmpErrMap[8].Notify = FALSE;

+  switch (IcmpError) {

+  case ICMP_ERR_UNREACH_NET:

+    return  EFI_NETWORK_UNREACHABLE;

 

-  IcmpErrMap[9].Error = EFI_ICMP_ERROR;

-  IcmpErrMap[9].IsHard = FALSE;

-  IcmpErrMap[9].Notify = TRUE;

+  case ICMP_ERR_TIMXCEED_INTRANS:

+  case ICMP_ERR_TIMXCEED_REASS:

+  case ICMP_ERR_UNREACH_HOST:

+    return  EFI_HOST_UNREACHABLE;

 

-  ASSERT ((IcmpError >= ICMP_ERR_UNREACH_NET) && (IcmpError <= ICMP_ERR_PARAMPROB));

+  case ICMP_ERR_UNREACH_PROTOCOL:

+    return  EFI_PROTOCOL_UNREACHABLE;

 

-  if (IsHard != NULL) {

-    *IsHard = IcmpErrMap[IcmpError].IsHard;

-  }

+  case ICMP_ERR_UNREACH_PORT:

+    return  EFI_PORT_UNREACHABLE;

 

-  if (Notify != NULL) {

-    *Notify = IcmpErrMap[IcmpError].Notify;

+  case ICMP_ERR_MSGSIZE:

+  case ICMP_ERR_UNREACH_SRCFAIL:

+  case ICMP_ERR_QUENCH:

+  case ICMP_ERR_PARAMPROB:

+    return  EFI_ICMP_ERROR;

   }

 

-  return IcmpErrMap[IcmpError].Error;

+  //

+  // will never run here!

+  //

+  ASSERT (FALSE);

+  return EFI_UNSUPPORTED;

 }