diff options
author | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-09-17 20:09:48 +0000 |
---|---|---|
committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-09-17 20:09:48 +0000 |
commit | e97233217ed6d37d7bb7fefb0ff0821515a23b48 (patch) | |
tree | f7701934bb62d5ba79025c295b098f2eee5abbc1 | |
parent | a48ea694577d853c9e38500e0d0ce3ab65f17d90 (diff) | |
download | edk2-platforms-e97233217ed6d37d7bb7fefb0ff0821515a23b48.tar.xz |
ShellPkg: Fix several GCC compiler warnings
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10890 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r-- | ShellPkg/Application/Shell/ShellProtocol.c | 8 | ||||
-rw-r--r-- | ShellPkg/Library/UefiShellLevel1CommandsLib/If.c | 5 | ||||
-rw-r--r-- | ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c | 2 | ||||
-rw-r--r-- | ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c | 6 |
4 files changed, 14 insertions, 7 deletions
diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c index 214693f2ae..27488ab62e 100644 --- a/ShellPkg/Application/Shell/ShellProtocol.c +++ b/ShellPkg/Application/Shell/ShellProtocol.c @@ -488,7 +488,9 @@ EfiShellGetDevicePathFromFilePath( NewPath = AllocateZeroPool(Size);
ASSERT(NewPath != NULL);
StrCpy(NewPath, Cwd);
- if (NewPath[StrLen(NewPath)-1] == Path[0] == (CHAR16)L'\\') {
+ if ((NewPath[0] == (CHAR16)L'\\') &&
+ (NewPath[StrLen(NewPath)-1] == (CHAR16)L'\\')
+ ) {
((CHAR16*)NewPath)[StrLen(NewPath)-1] = CHAR_NULL;
}
StrCat(NewPath, Path);
@@ -2958,7 +2960,7 @@ EFI_SHELL_PROTOCOL mShellProtocol = { This must be removed via calling CleanUpShellProtocol().
- @param[in,out] NewShell The pointer to the pointer to the structure
+ @param[in,out] NewShell The pointer to the pointer to the structure
to install.
@retval EFI_SUCCESS The operation was successful.
@@ -3071,7 +3073,7 @@ CreatePopulateInstallShellProtocol ( }
/**
- Opposite of CreatePopulateInstallShellProtocol.
+ Opposite of CreatePopulateInstallShellProtocol.
Free all memory and restore the system to the state it was in before calling
CreatePopulateInstallShellProtocol.
diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c index 3376329622..3a154a2625 100644 --- a/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c +++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c @@ -62,7 +62,7 @@ IsNextFragment ( //
*Statement+=StrLen(Fragment);
while (*Statement[0] == L' ') {
- *Statement++;
+ Statement++;
}
FreePool(Tester);
return (TRUE);
@@ -302,6 +302,9 @@ TestOperation ( }
return (FALSE);
break;
+ default:
+ ASSERT(FALSE);
+ return (FALSE);
}
ASSERT(FALSE);
return (FALSE);
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c index e35bf18824..94161cfecb 100644 --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Cp.c @@ -111,6 +111,8 @@ CopySingleFile( *Resp = Response;
case ShellPromptResponseYes:
break;
+ default:
+ return SHELL_ABORTED;
}
}
}
diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c index 5d6a200c19..c4c8c87ff4 100644 --- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c +++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c @@ -790,9 +790,9 @@ IsNumberLetterOnly( )
{
while(String != NULL && *String != CHAR_NULL) {
- if (! ( *String >= L'a' && *String <= L'z'
- || *String >= L'A' && *String <= L'Z'
- || *String >= L'0' && *String <= L'9')
+ if (! ((*String >= L'a' && *String <= L'z') ||
+ (*String >= L'A' && *String <= L'Z') ||
+ (*String >= L'0' && *String <= L'9'))
){
return (FALSE);
}
|