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

Minor coding style adjustment for DiskIo, Partition, English and Ebc modules.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5200 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qhuang8
2008-05-14 06:07:07 +00:00
parent d29270810c
commit ea7cb08c0a
11 changed files with 218 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.c
View File

@ -122,7 +122,7 @@ InitializeUnicodeCollationEng (
}
}
for (Index = 0; mOtherChars[Index]; Index++) {
for (Index = 0; mOtherChars[Index] != 0; Index++) {
Index2 = mOtherChars[Index];
mEngInfoMap[Index2] |= CHAR_FAT_VALID;
}
@ -191,8 +191,8 @@ EngStriColl (
IN CHAR16 *Str2
)
{
while (*Str1) {
if (ToUpper (*Str1) != ToUpper (*Str2)) {
while (*Str1 != 0) {
if (TO_UPPER (*Str1) != TO_UPPER (*Str2)) {
break;
}
@ -200,7 +200,7 @@ EngStriColl (
Str2 += 1;
}
return ToUpper (*Str1) - ToUpper (*Str2);
return TO_UPPER (*Str1) - TO_UPPER (*Str2);
}
@ -219,8 +219,8 @@ EngStrLwr (
IN OUT CHAR16 *Str
)
{
while (*Str) {
*Str = ToLower (*Str);
while (*Str != 0) {
*Str = TO_LOWER (*Str);
Str += 1;
}
}
@ -241,8 +241,8 @@ EngStrUpr (
IN OUT CHAR16 *Str
)
{
while (*Str) {
*Str = ToUpper (*Str);
while (*Str != 0) {
*Str = TO_UPPER (*Str);
Str += 1;
}
}
@ -280,7 +280,7 @@ EngMetaiMatch (
//
// End of pattern. If end of string, TRUE match
//
if (*String) {
if (*String != 0) {
return FALSE;
} else {
return TRUE;
@ -290,7 +290,7 @@ EngMetaiMatch (
//
// Match zero or more chars
//
while (*String) {
while (*String != 0) {
if (EngMetaiMatch (This, String, Pattern)) {
return TRUE;
}
@ -304,7 +304,7 @@ EngMetaiMatch (
//
// Match any one char
//
if (!*String) {
if (*String == 0) {
return FALSE;
}
@ -316,7 +316,7 @@ EngMetaiMatch (
// Match char set
//
CharC = *String;
if (!CharC) {
if (CharC == 0) {
//
// syntax problem
//
@ -325,7 +325,7 @@ EngMetaiMatch (
Index3 = 0;
CharP = *Pattern++;
while (CharP) {
while (CharP != 0) {
if (CharP == ']') {
return FALSE;
}
@ -342,7 +342,7 @@ EngMetaiMatch (
return FALSE;
}
if (ToUpper (CharC) >= ToUpper (Index3) && ToUpper (CharC) <= ToUpper (CharP)) {
if (TO_UPPER (CharC) >= TO_UPPER (Index3) && TO_UPPER (CharC) <= TO_UPPER (CharP)) {
//
// if in range, it's a match
//
@ -351,7 +351,7 @@ EngMetaiMatch (
}
Index3 = CharP;
if (ToUpper (CharC) == ToUpper (CharP)) {
if (TO_UPPER (CharC) == TO_UPPER (CharP)) {
//
// if char matches
//
@ -363,7 +363,7 @@ EngMetaiMatch (
//
// skip to end of match char set
//
while (CharP && CharP != ']') {
while ((CharP != 0) && (CharP != ']')) {
CharP = *Pattern;
Pattern += 1;
}
@ -373,7 +373,7 @@ EngMetaiMatch (
default:
CharC = *String;
if (ToUpper (CharC) != ToUpper (CharP)) {
if (TO_UPPER (CharC) != TO_UPPER (CharP)) {
return FALSE;
}
@ -408,7 +408,7 @@ EngFatToStr (
//
// No DBCS issues, just expand and add null terminate to end of string
//
while (*Fat && FatSize) {
while ((*Fat != 0) && (FatSize != 0)) {
*String = *Fat;
String += 1;
Fat += 1;
@ -446,7 +446,7 @@ EngStrToFat (
BOOLEAN SpecialCharExist;
SpecialCharExist = FALSE;
while (*String && FatSize) {
while ((*String != 0) && (FatSize != 0)) {
//
// Skip '.' or ' ' when making a fat name
//
@ -455,7 +455,7 @@ EngStrToFat (
// If this is a valid fat char, move it.
// Otherwise, move a '_' and flag the fact that the name needs an Lfn
//
if (*String < 0x100 && (mEngInfoMap[*String] & CHAR_FAT_VALID)) {
if (*String < 0x100 && ((mEngInfoMap[*String] & CHAR_FAT_VALID) != 0)) {
*Fat = mEngUpperMap[*String];
} else {
*Fat = '_';

66
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/UnicodeCollationEng.h
View File

@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
**/
#ifndef _UNICODE_COLLATION_ENG_H
#define _UNICODE_COLLATION_ENG_H
#ifndef _UNICODE_COLLATION_ENG_H_
#define _UNICODE_COLLATION_ENG_H_
@ -32,8 +32,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
//
#define CHAR_FAT_VALID 0x01
#define ToUpper(a) (CHAR16) (a <= 0xFF ? mEngUpperMap[a] : a)
#define ToLower(a) (CHAR16) (a <= 0xFF ? mEngLowerMap[a] : a)
#define TO_UPPER(a) (CHAR16) (a <= 0xFF ? mEngUpperMap[a] : a)
#define TO_LOWER(a) (CHAR16) (a <= 0xFF ? mEngLowerMap[a] : a)
//
// Prototypes
@ -54,11 +54,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
INTN
EFIAPI
EngStriColl (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *Str1,
IN CHAR16 *Str2
)
;
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *Str1,
IN CHAR16 *Str2
);
/**
Performs a case-insensitive comparison of a Null-terminated Unicode
@ -75,11 +74,10 @@ EngStriColl (
BOOLEAN
EFIAPI
EngMetaiMatch (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *String,
IN CHAR16 *Pattern
)
;
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *String,
IN CHAR16 *Pattern
);
/**
Converts all the Unicode characters in a Null-terminated Unicode string to
@ -92,10 +90,9 @@ EngMetaiMatch (
VOID
EFIAPI
EngStrLwr (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN OUT CHAR16 *Str
)
;
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN OUT CHAR16 *Str
);
/**
Converts all the Unicode characters in a Null-terminated Unicode string to upper
@ -108,10 +105,9 @@ EngStrLwr (
VOID
EFIAPI
EngStrUpr (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN OUT CHAR16 *Str
)
;
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN OUT CHAR16 *Str
);
/**
Converts an 8.3 FAT file name in an OEM character set to a Null-terminated
@ -128,12 +124,11 @@ EngStrUpr (
VOID
EFIAPI
EngFatToStr (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN UINTN FatSize,
IN CHAR8 *Fat,
OUT CHAR16 *String
)
;
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN UINTN FatSize,
IN CHAR8 *Fat,
OUT CHAR16 *String
);
/**
Converts a Null-terminated Unicode string to legal characters in a FAT
@ -153,12 +148,11 @@ EngFatToStr (
BOOLEAN
EFIAPI
EngStrToFat (
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *String,
IN UINTN FatSize,
OUT CHAR8 *Fat
)
;
IN EFI_UNICODE_COLLATION_PROTOCOL *This,
IN CHAR16 *String,
IN UINTN FatSize,
OUT CHAR8 *Fat
);
/**
The user Entry Point for English module.
@ -178,7 +172,7 @@ EFIAPI
InitializeUnicodeCollationEng (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
;
);
#endif