Re: [edk2-devel] [PATCH 1/1] CryptoPkg/Crt: fix strcpy build on older VS compilers

2022-04-20 Thread Yao, Jiewen 
Merged - https://github.com/tianocore/edk2/pull/2805

> -Original Message-
> From: devel@edk2.groups.io  On Behalf Of Yao, Jiewen
> Sent: Wednesday, April 20, 2022 3:01 PM
> To: Gerd Hoffmann ; devel@edk2.groups.io
> Cc: Lu, Xiaoyu1 ; Oliver Steffen ;
> Pawel Polawski ; Jiang, Guomin
> ; Wang, Jian J 
> Subject: Re: [edk2-devel] [PATCH 1/1] CryptoPkg/Crt: fix strcpy build on 
> older VS
> compilers
> 
> Reviewed-by: Jiewen Yao 
> 
> > -Original Message-
> > From: Gerd Hoffmann 
> > Sent: Wednesday, April 20, 2022 2:17 PM
> > To: devel@edk2.groups.io
> > Cc: Lu, Xiaoyu1 ; Oliver Steffen
> ;
> > Pawel Polawski ; Yao, Jiewen
> ;
> > Jiang, Guomin ; Wang, Jian J
> > ; Gerd Hoffmann 
> > Subject: [PATCH 1/1] CryptoPkg/Crt: fix strcpy build on older VS compilers
> >
> > Drop 'restrict' keyword which older visual studio compiler
> > versions complain about.
> >
> > Fixes: fab6285a73c4 ("CryptoPkg/CrtLibSupport: fix strcpy")
> > Signed-off-by: Gerd Hoffmann 
> > ---
> >  CryptoPkg/Library/Include/CrtLibSupport.h   | 4 ++--
> >  CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c | 4 ++--
> >  2 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h
> > b/CryptoPkg/Library/Include/CrtLibSupport.h
> > index bdc2654b6eef..e49060124ff6 100644
> > --- a/CryptoPkg/Library/Include/CrtLibSupport.h
> > +++ b/CryptoPkg/Library/Include/CrtLibSupport.h
> > @@ -397,8 +397,8 @@ inet_pton   (
> >
> >  char *
> >  strcpy (
> > -  char *restrict  strDest,
> > -  const char  *strSource
> > +  char*strDest,
> > +  const char  *strSource
> >);
> >
> >  //
> > diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> > b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> > index 6fcbe5885e7b..c1fc33538f9b 100644
> > --- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> > +++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> > @@ -267,8 +267,8 @@ strcspn (
> >
> >  char *
> >  strcpy (
> > -  char *restrict  strDest,
> > -  const char  *strSource
> > +  char*strDest,
> > +  const char  *strSource
> >)
> >  {
> >AsciiStrCpyS (strDest, MAX_STRING_SIZE, strSource);
> > --
> > 2.35.1
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#89138): https://edk2.groups.io/g/devel/message/89138
Mute This Topic: https://groups.io/mt/90579023/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH 1/1] CryptoPkg/Crt: fix strcpy build on older VS compilers

2022-04-20 Thread Yao, Jiewen 
Reviewed-by: Jiewen Yao 

> -Original Message-
> From: Gerd Hoffmann 
> Sent: Wednesday, April 20, 2022 2:17 PM
> To: devel@edk2.groups.io
> Cc: Lu, Xiaoyu1 ; Oliver Steffen ;
> Pawel Polawski ; Yao, Jiewen ;
> Jiang, Guomin ; Wang, Jian J
> ; Gerd Hoffmann 
> Subject: [PATCH 1/1] CryptoPkg/Crt: fix strcpy build on older VS compilers
> 
> Drop 'restrict' keyword which older visual studio compiler
> versions complain about.
> 
> Fixes: fab6285a73c4 ("CryptoPkg/CrtLibSupport: fix strcpy")
> Signed-off-by: Gerd Hoffmann 
> ---
>  CryptoPkg/Library/Include/CrtLibSupport.h   | 4 ++--
>  CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h
> b/CryptoPkg/Library/Include/CrtLibSupport.h
> index bdc2654b6eef..e49060124ff6 100644
> --- a/CryptoPkg/Library/Include/CrtLibSupport.h
> +++ b/CryptoPkg/Library/Include/CrtLibSupport.h
> @@ -397,8 +397,8 @@ inet_pton   (
> 
>  char *
>  strcpy (
> -  char *restrict  strDest,
> -  const char  *strSource
> +  char*strDest,
> +  const char  *strSource
>);
> 
>  //
> diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> index 6fcbe5885e7b..c1fc33538f9b 100644
> --- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> +++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
> @@ -267,8 +267,8 @@ strcspn (
> 
>  char *
>  strcpy (
> -  char *restrict  strDest,
> -  const char  *strSource
> +  char*strDest,
> +  const char  *strSource
>)
>  {
>AsciiStrCpyS (strDest, MAX_STRING_SIZE, strSource);
> --
> 2.35.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#89115): https://edk2.groups.io/g/devel/message/89115
Mute This Topic: https://groups.io/mt/90579023/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [PATCH 1/1] CryptoPkg/Crt: fix strcpy build on older VS compilers

2022-04-20 Thread Gerd Hoffmann 
Drop 'restrict' keyword which older visual studio compiler
versions complain about.

Fixes: fab6285a73c4 ("CryptoPkg/CrtLibSupport: fix strcpy")
Signed-off-by: Gerd Hoffmann 
---
 CryptoPkg/Library/Include/CrtLibSupport.h   | 4 ++--
 CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h 
b/CryptoPkg/Library/Include/CrtLibSupport.h
index bdc2654b6eef..e49060124ff6 100644
--- a/CryptoPkg/Library/Include/CrtLibSupport.h
+++ b/CryptoPkg/Library/Include/CrtLibSupport.h
@@ -397,8 +397,8 @@ inet_pton   (
 
 char *
 strcpy (
-  char *restrict  strDest,
-  const char  *strSource
+  char*strDest,
+  const char  *strSource
   );
 
 //
diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c 
b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
index 6fcbe5885e7b..c1fc33538f9b 100644
--- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c
@@ -267,8 +267,8 @@ strcspn (
 
 char *
 strcpy (
-  char *restrict  strDest,
-  const char  *strSource
+  char*strDest,
+  const char  *strSource
   )
 {
   AsciiStrCpyS (strDest, MAX_STRING_SIZE, strSource);
-- 
2.35.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#89109): https://edk2.groups.io/g/devel/message/89109
Mute This Topic: https://groups.io/mt/90579023/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-