_FILE_ parameter is an ASCII string. Current implementation used
as unicode string instead of ascii string. This patch fixed this
issue.

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1081

Cc: Hao Wu <hao.a.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed_off_by: Eric Dong <eric.dong@intel.com>

---
 SecurityPkg/Include/Library/TcgStorageCoreLib.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SecurityPkg/Include/Library/TcgStorageCoreLib.h b/SecurityPkg/Include/Library/TcgStorageCoreLib.h
index b2a0ef8f0c..213140de32 100644
--- a/SecurityPkg/Include/Library/TcgStorageCoreLib.h
+++ b/SecurityPkg/Include/Library/TcgStorageCoreLib.h
@@ -26,21 +26,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   {                                                                              \
     TCG_RESULT ret = (arg);                                                      \
     if (ret != TcgResultSuccess) {                                               \
-      DEBUG ((DEBUG_INFO, "ERROR_CHECK failed at %s:%u\n", __FILE__, __LINE__)); \
+      DEBUG ((DEBUG_INFO, "ERROR_CHECK failed at %a:%u\n", __FILE__, __LINE__)); \
       return ret;                                                                \
     }                                                                            \
   }
 
 #define METHOD_STATUS_ERROR_CHECK(arg, failRet)                                                  \
   if ((arg) != TCG_METHOD_STATUS_CODE_SUCCESS) {                                                 \
-    DEBUG ((DEBUG_INFO, "Method Status error: 0x%02X (%s)\n", arg, TcgMethodStatusString(arg))); \
+    DEBUG ((DEBUG_INFO, "Method Status error: 0x%02X (%a)\n", arg, TcgMethodStatusString(arg))); \
     return (failRet);                                                                            \
   }
 
 #define NULL_CHECK(arg)                                                                   \
   do {                                                                                    \
     if ((arg) == NULL) {                                                                  \
-      DEBUG ((DEBUG_INFO, "NULL_CHECK(%s) failed at %s:%u\n", #arg, __FILE__, __LINE__)); \
+      DEBUG ((DEBUG_INFO, "NULL_CHECK(%a) failed at %a:%u\n", #arg, __FILE__, __LINE__)); \
       return TcgResultFailureNullPointer;                                                 \
     }                                                                                     \
   } while (0)
-- 
2.15.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reviewed-by: Hao Wu <hao.a.wu@intel.com>


Best Regards,
Hao Wu


> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Eric
> Dong
> Sent: Thursday, August 09, 2018 1:14 PM
> To: edk2-devel@lists.01.org
> Cc: Wu, Hao A
> Subject: [edk2] [Patch] SecurityPkg/TcgStorageCoreLib.h: Use ascii instead of
> unicode.
> 
> _FILE_ parameter is an ASCII string. Current implementation used
> as unicode string instead of ascii string. This patch fixed this
> issue.
> 
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1081
> 
> Cc: Hao Wu <hao.a.wu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed_off_by: Eric Dong <eric.dong@intel.com>
> 
> ---
>  SecurityPkg/Include/Library/TcgStorageCoreLib.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/SecurityPkg/Include/Library/TcgStorageCoreLib.h
> b/SecurityPkg/Include/Library/TcgStorageCoreLib.h
> index b2a0ef8f0c..213140de32 100644
> --- a/SecurityPkg/Include/Library/TcgStorageCoreLib.h
> +++ b/SecurityPkg/Include/Library/TcgStorageCoreLib.h
> @@ -26,21 +26,21 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY
> KIND, EITHER EXPRESS OR IMPLIED.
>    {                                                                              \
>      TCG_RESULT ret = (arg);                                                      \
>      if (ret != TcgResultSuccess) {                                               \
> -      DEBUG ((DEBUG_INFO, "ERROR_CHECK failed at %s:%u\n", __FILE__,
> __LINE__)); \
> +      DEBUG ((DEBUG_INFO, "ERROR_CHECK failed at %a:%u\n", __FILE__,
> __LINE__)); \
>        return ret;                                                                \
>      }                                                                            \
>    }
> 
>  #define METHOD_STATUS_ERROR_CHECK(arg, failRet)
> \
>    if ((arg) != TCG_METHOD_STATUS_CODE_SUCCESS)
> {                                                 \
> -    DEBUG ((DEBUG_INFO, "Method Status error: 0x%02X (%s)\n", arg,
> TcgMethodStatusString(arg))); \
> +    DEBUG ((DEBUG_INFO, "Method Status error: 0x%02X (%a)\n", arg,
> TcgMethodStatusString(arg))); \
>      return (failRet);                                                                            \
>    }
> 
>  #define NULL_CHECK(arg)                                                                   \
>    do {                                                                                    \
>      if ((arg) == NULL) {                                                                  \
> -      DEBUG ((DEBUG_INFO, "NULL_CHECK(%s) failed at %s:%u\n", #arg,
> __FILE__, __LINE__)); \
> +      DEBUG ((DEBUG_INFO, "NULL_CHECK(%a) failed at %a:%u\n", #arg,
> __FILE__, __LINE__)); \
>        return TcgResultFailureNullPointer;                                                 \
>      }                                                                                     \
>    } while (0)
> --
> 2.15.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel