sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix K8 coding issues.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9862 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jcarsey
2010-01-29 15:07:44 +00:00
parent 75dad611c8
commit 1cd45e787d
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ShellPkg/Library/UefiShellLib/UefiShellLib.c
View File

@ -107,7 +107,7 @@ ShellFindSE2 (
Buffer Buffer
); );
} }
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status) && Buffer != NULL) {
// //
// now parse the list of returned handles // now parse the list of returned handles
// //
@ -1490,6 +1490,7 @@ ShellFindFilePath (
CHAR16 *TestPath; CHAR16 *TestPath;
CONST CHAR16 *Walker; CONST CHAR16 *Walker;
UINTN Size; UINTN Size;
CHAR16 *TempChar;
RetVal = NULL; RetVal = NULL;
@ -1517,8 +1518,9 @@ ShellFindFilePath (
Walker = (CHAR16*)Path; Walker = (CHAR16*)Path;
do { do {
CopyMem(TestPath, Walker, StrSize(Walker)); CopyMem(TestPath, Walker, StrSize(Walker));
if (StrStr(TestPath, L";") != NULL) { TempChar = StrStr(TestPath, L";");
*(StrStr(TestPath, L";")) = CHAR_NULL; if (TempChar != NULL) {
*TempChar = CHAR_NULL;
} }
StrCat(TestPath, FileName); StrCat(TestPath, FileName);
if (StrStr(Walker, L";") != NULL) { if (StrStr(Walker, L";") != NULL) {
@ -1565,6 +1567,8 @@ ShellFindFilePathEx (
CHAR16 *RetVal; CHAR16 *RetVal;
CONST CHAR16 *ExtensionWalker; CONST CHAR16 *ExtensionWalker;
UINTN Size; UINTN Size;
CHAR16 *TempChar;
ASSERT(FileName != NULL); ASSERT(FileName != NULL);
if (FileExtension == NULL) { if (FileExtension == NULL) {
return (ShellFindFilePath(FileName)); return (ShellFindFilePath(FileName));
@ -1578,9 +1582,12 @@ ShellFindFilePathEx (
TestPath = AllocateZeroPool(Size); TestPath = AllocateZeroPool(Size);
for (ExtensionWalker = FileExtension ; ; ExtensionWalker = StrStr(ExtensionWalker, L";") + 1 ){ for (ExtensionWalker = FileExtension ; ; ExtensionWalker = StrStr(ExtensionWalker, L";") + 1 ){
StrCpy(TestPath, FileName); StrCpy(TestPath, FileName);
StrCat(TestPath, ExtensionWalker); if (ExtensionWalker != NULL) {
if (StrStr(TestPath, L";") != NULL) { StrCat(TestPath, ExtensionWalker);
*(StrStr(TestPath, L";")) = CHAR_NULL; }
TempChar = StrStr(TestPath, L";");
if (TempChar != NULL) {
*TempChar = CHAR_NULL;
} }
RetVal = ShellFindFilePath(TestPath); RetVal = ShellFindFilePath(TestPath);
if (RetVal != NULL) { if (RetVal != NULL) {
@ -2696,10 +2703,15 @@ ShellStrToUintn(
{ {
CONST CHAR16 *Walker; CONST CHAR16 *Walker;
for (Walker = String; Walker != NULL && *Walker != CHAR_NULL && *Walker == L' '; Walker++); for (Walker = String; Walker != NULL && *Walker != CHAR_NULL && *Walker == L' '; Walker++);
if (StrnCmp(Walker, L"0x", 2) == 0 || StrnCmp(Walker, L"0X", 2) == 0){ if (Walker == NULL || *Walker == CHAR_NULL) {
return (StrHexToUintn(Walker)); ASSERT(FALSE);
return ((UINTN)(-1));
} else {
if (StrnCmp(Walker, L"0x", 2) == 0 || StrnCmp(Walker, L"0X", 2) == 0){
return (StrHexToUintn(Walker));
}
return (StrDecimalToUintn(Walker));
} }
return (StrDecimalToUintn(Walker));
} }
/** /**