Clean up the code. Action statement should not have text two opcode.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16221 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
index afbbfdddf94b32f37c76be66f2ce5672e359e361..48cc33c3f6d1996af3ccafb2c4039dc436acd03c 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
@@ -82,7 +82,6 @@ formset
     text\r
          help   = STRING_TOKEN(STR_RESET),\r
          text   = STRING_TOKEN(STR_RESET),\r
     text\r
          help   = STRING_TOKEN(STR_RESET),\r
          text   = STRING_TOKEN(STR_RESET),\r

-         text   = STRING_TOKEN(STR_NULL_STRING),\r

          flags  = INTERACTIVE,\r
          key    = FORM_RESET;\r
 \r
          flags  = INTERACTIVE,\r
          key    = FORM_RESET;\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
index c4ccc578a76b6a3c8eedf7ea90902f6b61c4adb1..1531617dc5ed66c0af3edfad56647caa602b52ba 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FE.vfr
@@ -66,14 +66,12 @@ formset
        text\r
          help   = STRING_TOKEN(STR_SAVE_AND_EXIT),\r
          text   = STRING_TOKEN(STR_SAVE_AND_EXIT),\r
        text\r
          help   = STRING_TOKEN(STR_SAVE_AND_EXIT),\r
          text   = STRING_TOKEN(STR_SAVE_AND_EXIT),\r

-         text   = STRING_TOKEN(STR_NULL_STRING),\r

          flags  = INTERACTIVE,\r
          key    = KEY_VALUE_SAVE_AND_EXIT_BOOT;\r
 \r
        text\r
          help   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),\r
          text   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),\r
          flags  = INTERACTIVE,\r
          key    = KEY_VALUE_SAVE_AND_EXIT_BOOT;\r
 \r
        text\r
          help   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),\r
          text   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),\r

-         text   = STRING_TOKEN(STR_NULL_STRING),\r

          flags  = INTERACTIVE,\r
          key    = KEY_VALUE_NO_SAVE_AND_EXIT_BOOT;\r
 \r
          flags  = INTERACTIVE,\r
          key    = KEY_VALUE_NO_SAVE_AND_EXIT_BOOT;\r
 \r


@@ -117,14 +115,12 @@ formset
        text\r
          help   = STRING_TOKEN(STR_SAVE_AND_EXIT),\r
          text   = STRING_TOKEN(STR_SAVE_AND_EXIT),\r
        text\r
          help   = STRING_TOKEN(STR_SAVE_AND_EXIT),\r
          text   = STRING_TOKEN(STR_SAVE_AND_EXIT),\r

-         text   = STRING_TOKEN(STR_NULL_STRING),\r

          flags  = INTERACTIVE,\r
          key    = KEY_VALUE_SAVE_AND_EXIT_DRIVER;  //BUGBUB: allow duplicate key in one formset???\r
 \r
        text\r
          help   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),\r
          text   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),\r
          flags  = INTERACTIVE,\r
          key    = KEY_VALUE_SAVE_AND_EXIT_DRIVER;  //BUGBUB: allow duplicate key in one formset???\r
 \r
        text\r
          help   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),\r
          text   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),\r

-         text   = STRING_TOKEN(STR_NULL_STRING),\r

          flags  = INTERACTIVE,\r
          key    = KEY_VALUE_NO_SAVE_AND_EXIT_DRIVER;\r
 \r
          flags  = INTERACTIVE,\r
          key    = KEY_VALUE_NO_SAVE_AND_EXIT_DRIVER;\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
index 79ec796b64bfdd3fa28b08548ee0060cd7568dbc..d5fe4f4c480e4880ff713b3fab20f19f4cf08f68 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
@@ -106,7 +106,6 @@ formset
     text\r
       help    = STRING_TOKEN(STR_CONTINUE_HELP),\r
       text    = STRING_TOKEN(STR_CONTINUE_PROMPT),\r
     text\r
       help    = STRING_TOKEN(STR_CONTINUE_HELP),\r
       text    = STRING_TOKEN(STR_CONTINUE_PROMPT),\r

-      text    = STRING_TOKEN(STR_NULL_STRING),\r

       flags   = INTERACTIVE,\r
       key     = FRONT_PAGE_KEY_CONTINUE;\r
 \r
       flags   = INTERACTIVE,\r
       key     = FRONT_PAGE_KEY_CONTINUE;\r
 \r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
index 719353de2905ea3cf146aa6159d4bf0df17d8a29..018fe059880988440acf50f37fe7702bea1c1179 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
@@ -207,7 +207,6 @@ formset
     text\r
       help   = STRING_TOKEN (STR_SAVE_CHANGES),\r
       text   = STRING_TOKEN (STR_SAVE_CHANGES),\r
     text\r
       help   = STRING_TOKEN (STR_SAVE_CHANGES),\r
       text   = STRING_TOKEN (STR_SAVE_CHANGES),\r

-        text   = STRING_TOKEN (STR_SAVE_CHANGES),\r

       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_CHANGES;\r
       \r
       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_CHANGES;\r
       \r

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
index c5d74b06df727387251f6f63f8f9089e23f10b37..661f6262c97dbd15ce67d249ccd13a1d9d04ab2c 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
@@ -82,7 +82,6 @@ formset
     text\r
       help   = STRING_TOKEN(STR_SAVE_CHANGES),\r
       text   = STRING_TOKEN(STR_SAVE_CHANGES),\r
     text\r
       help   = STRING_TOKEN(STR_SAVE_CHANGES),\r
       text   = STRING_TOKEN(STR_SAVE_CHANGES),\r

-        text   = STRING_TOKEN(STR_SAVE_CHANGES),\r

       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_CHANGES;\r
       \r
       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_CHANGES;\r
       \r

diff --git a/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr b/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
index a4eede18d07c6552e7b882608950d917cadc974a..eb0e3dec557840c13454afbbfa3288614f34f3be 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/PlatformDriOverrideDxe/Vfr.vfr
@@ -42,7 +42,6 @@ formset
     text\r
       help   = STRING_TOKEN(STR_FIRST_REFRESH_HELP),\r
       text   = STRING_TOKEN(STR_FIRST_REFRESH),\r
     text\r
       help   = STRING_TOKEN(STR_FIRST_REFRESH_HELP),\r
       text   = STRING_TOKEN(STR_FIRST_REFRESH),\r

-      text   = STRING_TOKEN(STR_NULL_STRING),\r

       flags  = INTERACTIVE,\r
       key    = KEY_VALUE_DEVICE_REFRESH;\r
 \r
       flags  = INTERACTIVE,\r
       key    = KEY_VALUE_DEVICE_REFRESH;\r
 \r


@@ -102,7 +101,6 @@ formset
     text\r
       help   = STRING_TOKEN (STR_NULL_STRING),\r
       text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
     text\r
       help   = STRING_TOKEN (STR_NULL_STRING),\r
       text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r

-        text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r

       flags  = INTERACTIVE | RESET_REQUIRED,\r
       key    = KEY_VALUE_ORDER_SAVE_AND_EXIT;\r
   endform;\r
       flags  = INTERACTIVE | RESET_REQUIRED,\r
       key    = KEY_VALUE_ORDER_SAVE_AND_EXIT;\r
   endform;\r

diff --git a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
index 4a322cfd69f9387b4fc1f5b376dfd6627b9e7ceb..80e833f10f0d63fbe4bbb5ac1b51b2a569da5625 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
+++ b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
@@ -88,14 +88,12 @@ formset
     text\r
       help   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
       text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
     text\r
       help   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
       text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r

-        text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r

       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_ORDER_CHANGES;\r
 \r
     text\r
       help   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_ORDER_CHANGES;\r
 \r
     text\r
       help   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r

-        text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r

       flags  = INTERACTIVE,\r
       key    = KEY_IGNORE_ORDER_CHANGES;\r
   endform;\r
       flags  = INTERACTIVE,\r
       key    = KEY_IGNORE_ORDER_CHANGES;\r
   endform;\r


@@ -109,14 +107,12 @@ formset
     text\r
       help   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
       text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
     text\r
       help   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
       text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r

-        text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r

       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_DELETE_ATTEMPT;\r
 \r
     text\r
       help   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_DELETE_ATTEMPT;\r
 \r
     text\r
       help   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r

-        text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r

       flags  = INTERACTIVE,\r
       key    = KEY_IGNORE_DELETE_ATTEMPT;\r
   endform;    \r
       flags  = INTERACTIVE,\r
       key    = KEY_IGNORE_DELETE_ATTEMPT;\r
   endform;    \r


@@ -353,7 +349,6 @@ formset
     text\r
       help   = STRING_TOKEN (STR_SAVE_CHANGES_HELP),\r
       text   = STRING_TOKEN (STR_SAVE_CHANGES),\r
     text\r
       help   = STRING_TOKEN (STR_SAVE_CHANGES_HELP),\r
       text   = STRING_TOKEN (STR_SAVE_CHANGES),\r

-        text   = STRING_TOKEN (STR_SAVE_CHANGES),\r

       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_ATTEMPT_CONFIG;\r
       \r
       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_ATTEMPT_CONFIG;\r
       \r

diff --git a/NetworkPkg/Ip6Dxe/Ip6Config.vfr b/NetworkPkg/Ip6Dxe/Ip6Config.vfr
index de63f4dad31f9cf62966b5248163761156f0ebb7..0d62b0a16808139f5225d05a18b64f7914b70446 100644 (file)
--- a/NetworkPkg/Ip6Dxe/Ip6Config.vfr
+++ b/NetworkPkg/Ip6Dxe/Ip6Config.vfr
@@ -127,7 +127,6 @@ formset
     text\r
       help   = STRING_TOKEN (STR_SAVE_CHANGES_HELP),\r
       text   = STRING_TOKEN (STR_SAVE_CHANGES),\r
     text\r
       help   = STRING_TOKEN (STR_SAVE_CHANGES_HELP),\r
       text   = STRING_TOKEN (STR_SAVE_CHANGES),\r

-        text   = STRING_TOKEN (STR_NULL),\r

       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_CHANGES;\r
 \r
       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_CHANGES;\r
 \r


@@ -166,14 +165,12 @@ formset
     text\r
       help   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
       text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
     text\r
       help   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
       text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r

-        text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r

       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_CONFIG_CHANGES;\r
 \r
     text\r
       help   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_CONFIG_CHANGES;\r
 \r
     text\r
       help   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r

-        text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r

       flags  = INTERACTIVE,\r
       key    = KEY_IGNORE_CONFIG_CHANGES;\r
 \r
       flags  = INTERACTIVE,\r
       key    = KEY_IGNORE_CONFIG_CHANGES;\r
 \r

diff --git a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr
index 69f4be8c23bd4c4eb53101b2503528521268be15..60972203b01372fcfb7e6dec2fd66dcbb3a5bd44 100644 (file)
--- a/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr
+++ b/SecurityPkg/UserIdentification/PwdCredentialProviderDxe/PwdCredentialProviderVfr.Vfr
@@ -24,9 +24,8 @@ formset
     title = STRING_TOKEN(STR_FORM_TITLE);\r
     \r
     text \r
     title = STRING_TOKEN(STR_FORM_TITLE);\r
     \r
     text \r

-       help   = STRING_TOKEN(STR_NULL_STRING),  \r
+      help   = STRING_TOKEN(STR_NULL_STRING),  \r

       text   = STRING_TOKEN(STR_INPUT_PASSWORD),\r
       text   = STRING_TOKEN(STR_INPUT_PASSWORD),\r

-      text   = STRING_TOKEN(STR_NULL_STRING),\r

       flags  = INTERACTIVE,\r
       key    = KEY_GET_PASSWORD;\r
 \r
       flags  = INTERACTIVE,\r
       key    = KEY_GET_PASSWORD;\r
 \r

diff --git a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr
index ebe8195c73d4ff260a17dfe5bf47bab710099794..306679776de434f5f16e8761274b4248ccee60b1 100644 (file)
--- a/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr
+++ b/SecurityPkg/UserIdentification/UserIdentifyManagerDxe/UserIdentifyManagerVfr.Vfr
@@ -27,7 +27,6 @@ formset
       text\r
         help   = STRING_TOKEN(STR_NULL_STRING),\r
         text   = STRING_TOKEN(STR_NULL_STRING),\r
       text\r
         help   = STRING_TOKEN(STR_NULL_STRING),\r
         text   = STRING_TOKEN(STR_NULL_STRING),\r

-          text   = STRING_TOKEN(STR_NULL_STRING),\r

         flags  = INTERACTIVE,\r
         key    = FORM_OPEN_QUESTION_ID;\r
     endif;\r
         flags  = INTERACTIVE,\r
         key    = FORM_OPEN_QUESTION_ID;\r
     endif;\r

diff --git a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
index fa6d9e4a8720b728ccdd286e9a69583ca7b79dad..59fb348651dbd81badc42a4b111db622f76f3205 100644 (file)
--- a/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
+++ b/SecurityPkg/UserIdentification/UserProfileManagerDxe/UserProfileManagerVfr.Vfr
@@ -35,7 +35,6 @@ formset
       text\r
         help   = STRING_TOKEN(STR_NULL_STRING),\r
         text   = STRING_TOKEN(STR_NULL_STRING),\r
       text\r
         help   = STRING_TOKEN(STR_NULL_STRING),\r
         text   = STRING_TOKEN(STR_NULL_STRING),\r

-          text   = STRING_TOKEN(STR_NULL_STRING),\r

         flags  = INTERACTIVE,\r
         key    = QUESTIONID_USER_MANAGE;\r
     endif;\r
         flags  = INTERACTIVE,\r
         key    = QUESTIONID_USER_MANAGE;\r
     endif;\r

diff --git a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr
index 9685a9e0c2a3c2b9a85fcc3eb7d932d3d3bd8637..aab321e402802d86f9a58b205cf8f040388fc684 100644 (file)
--- a/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr
+++ b/SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfig.vfr
@@ -495,14 +495,12 @@ formset
      text\r
        help   = STRING_TOKEN(STR_SAVE_AND_EXIT),\r
        text   = STRING_TOKEN(STR_SAVE_AND_EXIT),\r
      text\r
        help   = STRING_TOKEN(STR_SAVE_AND_EXIT),\r
        text   = STRING_TOKEN(STR_SAVE_AND_EXIT),\r

-       text   = STRING_TOKEN(STR_NULL),\r

        flags  = INTERACTIVE,\r
        key    = KEY_VALUE_SAVE_AND_EXIT_PK;\r
 \r
      text\r
        help   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),\r
        text   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),\r
        flags  = INTERACTIVE,\r
        key    = KEY_VALUE_SAVE_AND_EXIT_PK;\r
 \r
      text\r
        help   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),\r
        text   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),\r

-       text   = STRING_TOKEN(STR_NULL),\r

        flags  = INTERACTIVE,\r
        key    = KEY_VALUE_NO_SAVE_AND_EXIT_PK;\r
 \r
        flags  = INTERACTIVE,\r
        key    = KEY_VALUE_NO_SAVE_AND_EXIT_PK;\r
 \r