[PATCH] CryptoPkg: Fix the build failure in CryptoPkg

[PATCH] CryptoPkg: Fix the build failure in CryptoPkg

[duntan]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3908

Fix the build failure in CryptoPkg caused by this commit:
fab6285a73("CryptoPkg/CrtLibSupport: fix strcpy")
Remove the 'restrict' keyword which starts in VS2019.

Signed-off-by: Dun Tan <dun.tan@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
Cc: Guomin Jiang <guomin.jiang@intel.com>
---
 CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c | 2 +-
 CryptoPkg/Library/Include/CrtLibSupport.h           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
index 6fcbe5885e..68e21e8fb6 100644
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
@@ -267,7 +267,7 @@ strcspn (
 
 char *
 strcpy (
-  char *restrict  strDest,
+  char            *strDest,
   const char      *strSource
   )
 {
diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h
index bdc2654b6e..bce38eaa1a 100644
--- a/CryptoPkg/Library/Include/CrtLibSupport.h
+++ b/CryptoPkg/Library/Include/CrtLibSupport.h
@@ -397,7 +397,7 @@ inet_pton   (
 
 char *
 strcpy (
-  char *restrict  strDest,
+  char            *strDest,
   const char      *strSource
   );
 
-- 
2.31.1.windows.1

Re: [PATCH] CryptoPkg: Fix the build failure in CryptoPkg

[Yao, Jiewen]

Hi
May I know if you have run EDKII CI for this patch? 

> -----Original Message-----
> From: Tan, Dun <dun.tan@intel.com>
> Sent: Wednesday, April 20, 2022 11:35 AM
> To: devel@edk2.groups.io
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Wang, Jian J <jian.j.wang@intel.com>;
> Lu, Xiaoyu1 <xiaoyu1.lu@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>
> Subject: [PATCH] CryptoPkg: Fix the build failure in CryptoPkg
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3908
> 
> Fix the build failure in CryptoPkg caused by this commit:
> fab6285a73("CryptoPkg/CrtLibSupport: fix strcpy")
> Remove the 'restrict' keyword which starts in VS2019.
> 
> Signed-off-by: Dun Tan <dun.tan@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
> Cc: Guomin Jiang <guomin.jiang@intel.com>
> ---
>  CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c | 2 +-
>  CryptoPkg/Library/Include/CrtLibSupport.h           | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> index 6fcbe5885e..68e21e8fb6 100644
> --- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> +++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> @@ -267,7 +267,7 @@ strcspn (
> 
>  char *
>  strcpy (
> -  char *restrict  strDest,
> +  char            *strDest,
>    const char      *strSource
>    )
>  {
> diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h
> b/CryptoPkg/Library/Include/CrtLibSupport.h
> index bdc2654b6e..bce38eaa1a 100644
> --- a/CryptoPkg/Library/Include/CrtLibSupport.h
> +++ b/CryptoPkg/Library/Include/CrtLibSupport.h
> @@ -397,7 +397,7 @@ inet_pton   (
> 
>  char *
>  strcpy (
> -  char *restrict  strDest,
> +  char            *strDest,
>    const char      *strSource
>    );
> 
> --
> 2.31.1.windows.1

Re: [PATCH] CryptoPkg: Fix the build failure in CryptoPkg

[duntan]

Hi,
I tested it locally. I just created a PR. Here is the link
https://github.com/tianocore/edk2/pull/2800

Thanks,
Dun
-----Original Message-----
From: Yao, Jiewen <jiewen.yao@intel.com> 
Sent: Wednesday, April 20, 2022 11:40 AM
To: Tan, Dun <dun.tan@intel.com>; devel@edk2.groups.io
Cc: Wang, Jian J <jian.j.wang@intel.com>; Lu, Xiaoyu1 <xiaoyu1.lu@intel.com>; Jiang, Guomin <guomin.jiang@intel.com>
Subject: RE: [PATCH] CryptoPkg: Fix the build failure in CryptoPkg

Hi
May I know if you have run EDKII CI for this patch? 

> -----Original Message-----
> From: Tan, Dun <dun.tan@intel.com>
> Sent: Wednesday, April 20, 2022 11:35 AM
> To: devel@edk2.groups.io
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Wang, Jian J 
> <jian.j.wang@intel.com>; Lu, Xiaoyu1 <xiaoyu1.lu@intel.com>; Jiang, 
> Guomin <guomin.jiang@intel.com>
> Subject: [PATCH] CryptoPkg: Fix the build failure in CryptoPkg
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3908
> 
> Fix the build failure in CryptoPkg caused by this commit:
> fab6285a73("CryptoPkg/CrtLibSupport: fix strcpy") Remove the 
> 'restrict' keyword which starts in VS2019.
> 
> Signed-off-by: Dun Tan <dun.tan@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Xiaoyu Lu <xiaoyu1.lu@intel.com>
> Cc: Guomin Jiang <guomin.jiang@intel.com>
> ---
>  CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c | 2 +-
>  CryptoPkg/Library/Include/CrtLibSupport.h           | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> index 6fcbe5885e..68e21e8fb6 100644
> --- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> +++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> @@ -267,7 +267,7 @@ strcspn (
> 
>  char *
>  strcpy (
> -  char *restrict  strDest,
> +  char            *strDest,
>    const char      *strSource
>    )
>  {
> diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h
> b/CryptoPkg/Library/Include/CrtLibSupport.h
> index bdc2654b6e..bce38eaa1a 100644
> --- a/CryptoPkg/Library/Include/CrtLibSupport.h
> +++ b/CryptoPkg/Library/Include/CrtLibSupport.h
> @@ -397,7 +397,7 @@ inet_pton   (
> 
>  char *
>  strcpy (
> -  char *restrict  strDest,
> +  char            *strDest,
>    const char      *strSource
>    );
> 
> --
> 2.31.1.windows.1