sync comments, fix function header, rename variable name to follow coding style.

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

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index 0f496a02c147f110916f35da15c05564eb5d5608..86e41ba1a1814342270bc6ebec2d31fc353012f6 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
@@ -42,7 +42,6 @@ LIST_ENTRY      mIScsiConfigFormList = {
   @retval None.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 IScsiIpToStr (\r
   IN  EFI_IPv4_ADDRESS  *Ip,\r
@@ -218,7 +217,6 @@ IScsiUpdateDeviceList (
   @retval The iSCSI configuration form entry found.\r
 \r
 **/\r
-STATIC\r
 ISCSI_CONFIG_FORM_ENTRY *\r
 IScsiGetConfigFormEntryByIndex (\r
   IN UINT32 Index\r
@@ -253,7 +251,6 @@ IScsiGetConfigFormEntryByIndex (
   @retval None.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 IScsiConvertDeviceConfigDataToIfrNvData (\r
   IN ISCSI_CONFIG_FORM_ENTRY  *ConfigFormEntry,\r
@@ -338,6 +335,10 @@ IScsiFormExtractConfig (
   ISCSI_FORM_CALLBACK_INFO         *Private;\r
   EFI_HII_CONFIG_ROUTING_PROTOCOL  *HiiConfigRouting;\r
 \r
+  if (Request == NULL) {\r
+    return EFI_NOT_FOUND;\r
+  }\r
+\r
   if (!mIScsiDeviceListUpdated) {\r
     //\r
     // Update the device list.\r
@@ -451,7 +452,7 @@ IScsiFormCallback (
   CHAR8                     Ip4String[IP4_STR_MAX_SIZE];\r
   CHAR8                     LunString[ISCSI_LUN_STR_MAX_LEN];\r
   UINT64                    Lun;\r
-  STRING_REF                DeviceFormTitleToken;\r
+  EFI_STRING_ID             DeviceFormTitleToken;\r
   ISCSI_CONFIG_IFR_NVDATA   *IfrNvData;\r
   ISCSI_CONFIG_FORM_ENTRY   *ConfigFormEntry;\r
   EFI_IP_ADDRESS            HostIp;\r
@@ -675,7 +676,7 @@ IScsiFormCallback (
       ASSERT (ConfigFormEntry != NULL);\r
 \r
       UnicodeSPrint (PortString, (UINTN) 128, L"Port %s", ConfigFormEntry->MacString);\r
-      DeviceFormTitleToken = (STRING_REF) STR_ISCSI_DEVICE_FORM_TITLE;\r
+      DeviceFormTitleToken = (EFI_STRING_ID) STR_ISCSI_DEVICE_FORM_TITLE;\r
       HiiLibSetString (Private->RegisteredHandle, DeviceFormTitleToken, PortString);\r
 \r
       IScsiConvertDeviceConfigDataToIfrNvData (ConfigFormEntry, IfrNvData);\r
@@ -800,13 +801,13 @@ IScsiConfigUpdateForm (
         ZeroMem (&ConfigFormEntry->AuthConfigData, sizeof (ConfigFormEntry->AuthConfigData));\r
       }\r
       //\r
-      // Compose the Port string and create a new STRING_REF.\r
+      // Compose the Port string and create a new EFI_STRING_ID.\r
       //\r
       UnicodeSPrint (PortString, 128, L"Port %s", ConfigFormEntry->MacString);\r
       HiiLibNewString (mCallbackInfo->RegisteredHandle, &ConfigFormEntry->PortTitleToken, PortString);\r
 \r
       //\r
-      // Compose the help string of this port and create a new STRING_REF.\r
+      // Compose the help string of this port and create a new EFI_STRING_ID.\r
       //\r
       UnicodeSPrint (PortString, 128, L"Set the iSCSI parameters on port %s", ConfigFormEntry->MacString);\r
       HiiLibNewString (mCallbackInfo->RegisteredHandle, &ConfigFormEntry->PortTitleHelpToken, PortString);\r