1)update function header coding style issue

[mirror_edk2.git] / MdeModulePkg / Universal / Network / IScsiDxe / IScsiDhcp.c

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
index f02423475e6f2d22f52c4890aa468209a9d6ac1d..85b5dbf7450bc2490808545aa2adecaebda0ad03 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
@@ -96,24 +96,18 @@ IScsiDhcpExtractRootPath (
     goto ON_EXIT;\r
   }\r
   \r
-  for (FieldIndex = RP_FIELD_IDX_SERVERNAME; FieldIndex != RP_FIELD_IDX_TARGETNAME; FieldIndex = RP_FIELD_IDX_TARGETNAME) {\r
-    if (Fields[FieldIndex].Str == NULL) {\r
-      Status = EFI_INVALID_PARAMETER;\r
-      goto ON_EXIT;\r
-    }\r
-  }\r
-  \r
-  FieldIndex = RP_FIELD_IDX_PROTOCOL;\r
-  if (Fields[RP_FIELD_IDX_PROTOCOL].Len > 1) {\r
+    if ((Fields[RP_FIELD_IDX_SERVERNAME].Str == NULL) ||\r
+      (Fields[RP_FIELD_IDX_TARGETNAME].Str == NULL) ||\r
+      (Fields[RP_FIELD_IDX_PROTOCOL].Len > 1)\r
+      ) {\r
+\r
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
   }\r
-\r
   //\r
   // Get the IP address of the target.\r
   //\r
-  FieldIndex = RP_FIELD_IDX_SERVERNAME;\r
-  Field   = &Fields[FieldIndex];\r
+  Field   = &Fields[RP_FIELD_IDX_SERVERNAME];\r
   Status  = IScsiAsciiStrToIp (Field->Str, &ConfigNvData->TargetIp);\r
   if (EFI_ERROR (Status)) {\r
     goto ON_EXIT;\r
@@ -121,8 +115,7 @@ IScsiDhcpExtractRootPath (
   //\r
   // Check the protocol type.\r
   //\r
-  FieldIndex = RP_FIELD_IDX_PROTOCOL;\r
-  Field = &Fields[FieldIndex];\r
+  Field = &Fields[RP_FIELD_IDX_PROTOCOL];\r
   if ((Field->Str != NULL) && ((*(Field->Str) - '0') != EFI_IP_PROTO_TCP)) {\r
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
@@ -130,8 +123,7 @@ IScsiDhcpExtractRootPath (
   //\r
   // Get the port of the iSCSI target.\r
   //\r
-  FieldIndex = RP_FIELD_IDX_PORT;\r
-  Field = &Fields[FieldIndex];\r
+  Field = &Fields[RP_FIELD_IDX_PORT];\r
   if (Field->Str != NULL) {\r
     ConfigNvData->TargetPort = (UINT16) AsciiStrDecimalToUintn (Field->Str);\r
   } else {\r
@@ -140,8 +132,7 @@ IScsiDhcpExtractRootPath (
   //\r
   // Get the LUN.\r
   //\r
-  FieldIndex = RP_FIELD_IDX_LUN;\r
-  Field = &Fields[FieldIndex];\r
+  Field = &Fields[RP_FIELD_IDX_LUN];\r
   if (Field->Str != NULL) {\r
     Status = IScsiAsciiStrToLun (Field->Str, ConfigNvData->BootLun);\r
     if (EFI_ERROR (Status)) {\r
@@ -153,8 +144,8 @@ IScsiDhcpExtractRootPath (
   //\r
   // Get the target iSCSI Name.\r
   //\r
-  FieldIndex = RP_FIELD_IDX_TARGETNAME;  \r
-  Field = &Fields[FieldIndex];\r
+  Field = &Fields[RP_FIELD_IDX_TARGETNAME];\r
+\r
   if (AsciiStrLen (Field->Str) > ISCSI_NAME_MAX_SIZE - 1) {\r
     Status = EFI_INVALID_PARAMETER;\r
     goto ON_EXIT;\r
@@ -190,7 +181,7 @@ ON_EXIT:
   @retval EFI_SUCCESS      Either the DHCP OFFER is qualified or we're not intereseted\r
                            in the Dhcp4Event.\r
   @retval EFI_NOT_READY    The DHCP OFFER packet doesn't match our requirements.\r
-  @retval Others           Some unexpected error happened.\r
+  @retval Others           Other errors as indicated.\r
 **/\r
 EFI_STATUS\r
 IScsiDhcpSelectOffer (\r
@@ -261,7 +252,7 @@ IScsiDhcpSelectOffer (
   @retval EFI_SUCCESS           The DNS information is got from the DHCP ACK.\r
   @retval EFI_NO_MAPPING        DHCP failed to acquire address and other information.\r
   @retval EFI_INVALID_PARAMETER The DHCP ACK's DNS option is mal-formatted.\r
-  @retval EFI_DEVICE_ERROR      Some unexpected error happened.\r
+  @retval EFI_DEVICE_ERROR      Other errors as indicated.\r
 **/\r
 EFI_STATUS\r
 IScsiParseDhcpAck (\r
@@ -352,7 +343,7 @@ IScsiParseDhcpAck (
 \r
   @retval EFI_SUCCESS           The DNS information is got from the DHCP ACK.\r
   @retval EFI_OUT_OF_RESOURCES  Failed to allocate memory.\r
-  @retval Others                Some unexpected error happened.\r
+  @retval Others                Other errors as indicated.\r
 **/\r
 EFI_STATUS\r
 IScsiDoDhcp (\r