* [PATCH 1/1] CryptoPkg/Crt: fix strcpy build on older VS compilers
@ 2022-04-20 6:16 Gerd Hoffmann
2022-04-20 7:00 ` Yao, Jiewen
[not found] ` <16E788A8F8121061.23693@groups.io>
0 siblings, 2 replies; 3+ messages in thread
From: Gerd Hoffmann @ 2022-04-20 6:16 UTC (permalink / raw)
To: devel
Cc: Xiaoyu Lu, Oliver Steffen, Pawel Polawski, Jiewen Yao,
Guomin Jiang, Jian J Wang, Gerd Hoffmann
Drop 'restrict' keyword which older visual studio compiler
versions complain about.
Fixes: fab6285a73c4 ("CryptoPkg/CrtLibSupport: fix strcpy")
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] CryptoPkg/Crt: fix strcpy build on older VS compilers
2022-04-20 6:16 [PATCH 1/1] CryptoPkg/Crt: fix strcpy build on older VS compilers Gerd Hoffmann
@ 2022-04-20 7:00 ` Yao, Jiewen
[not found] ` <16E788A8F8121061.23693@groups.io>
1 sibling, 0 replies; 3+ messages in thread
From: Yao, Jiewen @ 2022-04-20 7:00 UTC (permalink / raw)
To: Gerd Hoffmann, devel@edk2.groups.io
Cc: Lu, Xiaoyu1, Oliver Steffen, Pawel Polawski, Jiang, Guomin,
Wang, Jian J
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
> -----Original Message-----
> From: Gerd Hoffmann <kraxel@redhat.com>
> Sent: Wednesday, April 20, 2022 2:17 PM
> To: devel@edk2.groups.io
> Cc: Lu, Xiaoyu1 <xiaoyu1.lu@intel.com>; Oliver Steffen <osteffen@redhat.com>;
> Pawel Polawski <ppolawsk@redhat.com>; Yao, Jiewen <jiewen.yao@intel.com>;
> Jiang, Guomin <guomin.jiang@intel.com>; Wang, Jian J
> <jian.j.wang@intel.com>; Gerd Hoffmann <kraxel@redhat.com>
> 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 <kraxel@redhat.com>
> ---
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [edk2-devel] [PATCH 1/1] CryptoPkg/Crt: fix strcpy build on older VS compilers
[not found] ` <16E788A8F8121061.23693@groups.io>
@ 2022-04-20 11:09 ` Yao, Jiewen
0 siblings, 0 replies; 3+ messages in thread
From: Yao, Jiewen @ 2022-04-20 11:09 UTC (permalink / raw)
To: devel@edk2.groups.io, Yao, Jiewen, Gerd Hoffmann
Cc: Lu, Xiaoyu1, Oliver Steffen, Pawel Polawski, Jiang, Guomin,
Wang, Jian J
Merged - https://github.com/tianocore/edk2/pull/2805
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yao, Jiewen
> Sent: Wednesday, April 20, 2022 3:01 PM
> To: Gerd Hoffmann <kraxel@redhat.com>; devel@edk2.groups.io
> Cc: Lu, Xiaoyu1 <xiaoyu1.lu@intel.com>; Oliver Steffen <osteffen@redhat.com>;
> Pawel Polawski <ppolawsk@redhat.com>; Jiang, Guomin
> <guomin.jiang@intel.com>; Wang, Jian J <jian.j.wang@intel.com>
> Subject: Re: [edk2-devel] [PATCH 1/1] CryptoPkg/Crt: fix strcpy build on older VS
> compilers
>
> Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
>
> > -----Original Message-----
> > From: Gerd Hoffmann <kraxel@redhat.com>
> > Sent: Wednesday, April 20, 2022 2:17 PM
> > To: devel@edk2.groups.io
> > Cc: Lu, Xiaoyu1 <xiaoyu1.lu@intel.com>; Oliver Steffen
> <osteffen@redhat.com>;
> > Pawel Polawski <ppolawsk@redhat.com>; Yao, Jiewen
> <jiewen.yao@intel.com>;
> > Jiang, Guomin <guomin.jiang@intel.com>; Wang, Jian J
> > <jian.j.wang@intel.com>; Gerd Hoffmann <kraxel@redhat.com>
> > 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 <kraxel@redhat.com>
> > ---
> > 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
>
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-20 11:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-20 6:16 [PATCH 1/1] CryptoPkg/Crt: fix strcpy build on older VS compilers Gerd Hoffmann
2022-04-20 7:00 ` Yao, Jiewen
[not found] ` <16E788A8F8121061.23693@groups.io>
2022-04-20 11:09 ` [edk2-devel] " Yao, Jiewen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox