Ruiyu, Thanks for letting me know. I agree with below changes and they look good to me. Please go ahead and fix them. Hopefully I'll get a chance to review/test it.
Paulo -----Original Message----- From: Gao, Liming [mailto:[email protected]] Sent: Monday, October 30, 2017 3:27 AM To: Ni, Ruiyu <[email protected]>; Alcantara, Paulo <[email protected]>; Carsey, Jaben <[email protected]>; [email protected] Subject: RE: [PATCH] ShellPkg: Fix type mismatch with GCC That's good. >-----Original Message----- >From: Ni, Ruiyu >Sent: Monday, October 30, 2017 1:25 PM >To: Gao, Liming <[email protected]>; Alcantara, Paulo ><[email protected]>; Carsey, Jaben <[email protected]>; >[email protected] >Subject: RE: [PATCH] ShellPkg: Fix type mismatch with GCC > >I have a pending task to remove the dependency of InternalCharToUpper(). >Below two bugs require the same fix. >664 [Shell] UnicodeCollation->StriColl() should be used to replace StrinCmp >in >UefiShellLevel2CommandsLib >294 Strnicmp() should use UNICODE_COLLATION.StrUpr() instead of >converting char to upper case inself > >I think fixing them two is the right solution to go. > > >Thanks/Ray > >> -----Original Message----- >> From: Gao, Liming >> Sent: Monday, October 30, 2017 1:18 PM >> To: Alcantara, Paulo <[email protected]>; Carsey, Jaben >> <[email protected]>; [email protected] >> Cc: Ni, Ruiyu <[email protected]> >> Subject: RE: [PATCH] ShellPkg: Fix type mismatch with GCC >> >> I suggest to rename it and add its implementation in ShellPkg. We >> don't expect to use the internal function from another library or driver. >> >> Another way is to propose adding StrniCmp() API into BaseLib. >> >> Thanks >> Liming >> >-----Original Message----- >> >From: edk2-devel [mailto:[email protected]] On Behalf >> >Of Alcantara, Paulo >> >Sent: Saturday, October 28, 2017 2:51 AM >> >To: Carsey, Jaben <[email protected]>; [email protected] >> >Cc: Ni, Ruiyu <[email protected]> >> >Subject: Re: [edk2] [PATCH] ShellPkg: Fix type mismatch with GCC >> > >> >Hi Jaben, >> > >> >No, we can't. InternalCharToUpper() is declared internally in >> >BaseLib and unexported. >> > >> >The comment above the declaration in UefiShellLevel2CommandsLib.c >> >explains it: >> > >> >/** >> > Be lazy and borrow from baselib. >> > >> > @param[in] Char The character to convert to upper case. >> > >> > @return Char as an upper case character. >> >**/ >> > >> >Thanks, >> >Paulo >> > >> >________________________________________ >> >From: Carsey, Jaben <[email protected]> >> >Sent: Friday, October 27, 2017 4:33 PM >> >To: Alcantara, Paulo; [email protected] >> >Cc: Ni, Ruiyu >> >Subject: RE: [PATCH] ShellPkg: Fix type mismatch with GCC >> > >> >Are we redefining a function from BaseLib? Why not remove the >> >redundant definition instead of making it match? >> > >> >-Jaben >> > >> >> -----Original Message----- >> >> From: Paulo Alcantara [mailto:[email protected]] >> >> Sent: Friday, October 27, 2017 9:24 AM >> >> To: [email protected] >> >> Cc: Paulo Alcantara <[email protected]>; Carsey, Jaben >> >> <[email protected]>; Ni, Ruiyu <[email protected]> >> >> Subject: [PATCH] ShellPkg: Fix type mismatch with GCC >> >> Importance: High >> >> >> >> This patch fixes the following warning reported by GCC 6.3: >> >> >> >> >> >/home/pcacjr/src/edk2.git/ShellPkg/Library/UefiShellLevel2CommandsLi >> >b >/ >> U >> >> efiShellLevel2CommandsLib.c:271:1: >> >> warning: type of 'InternalCharToUpper' does not match original >> >> decl aration [-Wlto-type-mismatch] InternalCharToUpper ( ^ >> >> /home/pcacjr/src/edk2.git/MdePkg/Library/BaseLib/String.c:555:1: note: >> >> 'InternalCharToUpper' was previously declared here >> >> InternalCharToUpper ( ^ >> >> >> >> Cc: Jaben Carsey <[email protected]> >> >> Cc: Ruiyu Ni <[email protected]> >> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> >> Signed-off-by: Paulo Alcantara <[email protected]> >> >> --- >> >> >> >> >> >ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Commands >Li >> b >> >> .c | 1 + >> >> 1 file changed, 1 insertion(+) >> >> >> >> diff --git >> >> >> >a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Comman >d >> s >> >> Lib.c >> >> >> >b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Comman >d >> s >> >> Lib.c >> >> index 7948e53cfc..bab6631e15 100644 >> >> --- >> >> >> >a/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Comman >d >> s >> >> Lib.c >> >> +++ >> >> >> >b/ShellPkg/Library/UefiShellLevel2CommandsLib/UefiShellLevel2Comman >d >> s >> >> Lib.c >> >> @@ -268,6 +268,7 @@ VerifyIntermediateDirectories ( >> >> @return Char as an upper case character. >> >> **/ >> >> CHAR16 >> >> +EFIAPI >> >> InternalCharToUpper ( >> >> IN CONST CHAR16 Char >> >> ); >> >> -- >> >> 2.11.0 >> > >> >_______________________________________________ >> >edk2-devel mailing list >> >[email protected] >> >https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
