[PATCH v2 0/3] Fix an incorrectly spelled Marco

[PATCH v2 0/3] Fix an incorrectly spelled Marco

[Shenglei Zhang]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=y, Size: 1144 bytes --]

EFI_RETURNING_FROM_EFI_APPLICATOIN is not spelled correctly and
change it to EFI_RETURNING_FROM_EFI_APPLICATION.

v2
In v1 EFI_RETURNING_FROM_EFI_APPLICATOIN is changed into
EFI_RETURNING_FROM_EFI_APPLICATION directly in one patch,
which may lead to unbisectability.
To solve this problem, the correct one is introduced in 1/3 and
remove the incorrect one in 3/3.

Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Shenglei Zhang (3):
  MdePkg/IndustryStandard: Introduce a correctly spelled Marco
  SecurityPkg/Tcg: Fix typos in TcgDxe.c and Tcg2Dxe.c
  MdePkg/IndustryStandard: Remove an incorrectly spelled Marco

 MdePkg/Include/IndustryStandard/UefiTcgPlatform.h | 2 +-
 SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c                 | 4 ++--
 SecurityPkg/Tcg/TcgDxe/TcgDxe.c                   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

-- 
2.18.0.windows.1

[PATCH v2 1/3] MdePkg/IndustryStandard: Introduce a correctly spelled Marco

[Shenglei Zhang]

EFI_RETURNING_FROM_EFI_APPLICATOIN is incorrect.
Before removing it, introduce the correctly spelled one,
EFI_RETURNING_FROM_EFI_APPLICATION.
https://bugzilla.tianocore.org/show_bug.cgi?id=1368

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 MdePkg/Include/IndustryStandard/UefiTcgPlatform.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h b/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
index 2d223f4ea7..ee517ddbda 100644
--- a/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
+++ b/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
@@ -58,6 +58,8 @@
   "Calling EFI Application from Boot Option"
 #define EFI_RETURNING_FROM_EFI_APPLICATOIN  \
   "Returning from EFI Application from Boot Option"
+#define EFI_RETURNING_FROM_EFI_APPLICATION  \
+  "Returning from EFI Application from Boot Option"
 #define EFI_EXIT_BOOT_SERVICES_INVOCATION   \
   "Exit Boot Services Invocation"
 #define EFI_EXIT_BOOT_SERVICES_FAILED       \
-- 
2.18.0.windows.1

[PATCH v2 2/3] SecurityPkg/Tcg: Fix typos in TcgDxe.c and Tcg2Dxe.c

[Shenglei Zhang]

Change EFI_RETURNING_FROM_EFI_APPLICATOIN to
EFI_RETURNING_FROM_EFI_APPLICATION.
https://bugzilla.tianocore.org/show_bug.cgi?id=1368

Cc: Chao Zhang <chao.b.zhang@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 4 ++--
 SecurityPkg/Tcg/TcgDxe/TcgDxe.c   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
index aa463b287e..662637f3e3 100644
--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c
@@ -2314,10 +2314,10 @@ OnReadyToBoot (
     //
     Status = TcgMeasureAction (
                4,
-               EFI_RETURNING_FROM_EFI_APPLICATOIN
+               EFI_RETURNING_FROM_EFI_APPLICATION
                );
     if (EFI_ERROR (Status)) {
-      DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_RETURNING_FROM_EFI_APPLICATOIN));
+      DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_RETURNING_FROM_EFI_APPLICATION));
     }
 
     //
diff --git a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
index 21837fe3d3..3889fb4a81 100644
--- a/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
+++ b/SecurityPkg/Tcg/TcgDxe/TcgDxe.c
@@ -1180,10 +1180,10 @@ OnReadyToBoot (
     // 6. Not first attempt, meaning a return from last attempt
     //
     Status = TcgMeasureAction (
-               EFI_RETURNING_FROM_EFI_APPLICATOIN
+               EFI_RETURNING_FROM_EFI_APPLICATION
                );
     if (EFI_ERROR (Status)) {
-      DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_RETURNING_FROM_EFI_APPLICATOIN));
+      DEBUG ((EFI_D_ERROR, "%a not Measured. Error!\n", EFI_RETURNING_FROM_EFI_APPLICATION));
     }
   }
 
-- 
2.18.0.windows.1

[PATCH v2 3/3] MdePkg/IndustryStandard: Remove an incorrectly spelled Marco

[Shenglei Zhang]

EFI_RETURNING_FROM_EFI_APPLICATOIN is not correctly spelled,
so now remove it.
https://bugzilla.tianocore.org/show_bug.cgi?id=1368

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
---
 MdePkg/Include/IndustryStandard/UefiTcgPlatform.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h b/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
index ee517ddbda..96784708ae 100644
--- a/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
+++ b/MdePkg/Include/IndustryStandard/UefiTcgPlatform.h
@@ -56,8 +56,6 @@
 
 #define EFI_CALLING_EFI_APPLICATION         \
   "Calling EFI Application from Boot Option"
-#define EFI_RETURNING_FROM_EFI_APPLICATOIN  \
-  "Returning from EFI Application from Boot Option"
 #define EFI_RETURNING_FROM_EFI_APPLICATION  \
   "Returning from EFI Application from Boot Option"
 #define EFI_EXIT_BOOT_SERVICES_INVOCATION   \
-- 
2.18.0.windows.1

Re: [PATCH v2 0/3] Fix an incorrectly spelled Marco

[Laszlo Ersek]

On 12/19/18 09:54, Shenglei Zhang wrote:
> EFI_RETURNING_FROM_EFI_APPLICATOIN is not spelled correctly and
> change it to EFI_RETURNING_FROM_EFI_APPLICATION.
> 
> v2
> In v1 EFI_RETURNING_FROM_EFI_APPLICATOIN is changed into
> EFI_RETURNING_FROM_EFI_APPLICATION directly in one patch,
> which may lead to unbisectability.
> To solve this problem, the correct one is introduced in 1/3 and
> remove the incorrect one in 3/3.
> 
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao Wu <hao.a.wu@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Philippe Mathieu-Daud� <philmd@redhat.com>
> Shenglei Zhang (3):
>   MdePkg/IndustryStandard: Introduce a correctly spelled Marco
>   SecurityPkg/Tcg: Fix typos in TcgDxe.c and Tcg2Dxe.c
>   MdePkg/IndustryStandard: Remove an incorrectly spelled Marco

The subject lines of patches #0, #1 and #3 say "Marco" rather than "macro".

Please don't CC me on the next version of this set (if there's going to
be any). I'll let others review this work.

Thanks
Laszlo

Re: [PATCH v2 0/3] Fix an incorrectly spelled Marco

[Gao, Liming]

Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: Zhang, Shenglei
> Sent: Wednesday, December 19, 2018 4:55 PM
> To: edk2-devel@lists.01.org
> Cc: Leif Lindholm <leif.lindholm@linaro.org>; Laszlo Ersek <lersek@redhat.com>; Kinney, Michael D <michael.d.kinney@intel.com>; Gao,
> Liming <liming.gao@intel.com>; Wang, Jian J <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Zeng, Star
> <star.zeng@intel.com>; Philippe Mathieu-Daud� <philmd@redhat.com>
> Subject: [PATCH v2 0/3] Fix an incorrectly spelled Marco
> 
> EFI_RETURNING_FROM_EFI_APPLICATOIN is not spelled correctly and
> change it to EFI_RETURNING_FROM_EFI_APPLICATION.
> 
> v2
> In v1 EFI_RETURNING_FROM_EFI_APPLICATOIN is changed into
> EFI_RETURNING_FROM_EFI_APPLICATION directly in one patch,
> which may lead to unbisectability.
> To solve this problem, the correct one is introduced in 1/3 and
> remove the incorrect one in 3/3.
> 
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao Wu <hao.a.wu@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Shenglei Zhang (3):
>   MdePkg/IndustryStandard: Introduce a correctly spelled Marco
>   SecurityPkg/Tcg: Fix typos in TcgDxe.c and Tcg2Dxe.c
>   MdePkg/IndustryStandard: Remove an incorrectly spelled Marco
> 
>  MdePkg/Include/IndustryStandard/UefiTcgPlatform.h | 2 +-
>  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c                 | 4 ++--
>  SecurityPkg/Tcg/TcgDxe/TcgDxe.c                   | 4 ++--
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 
> --
> 2.18.0.windows.1