Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/FatPkg/EnhancedFatDxe/FileName.c

Timestamp:

Apr 14, 2023 3:17:44 PM (23 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156854

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• FatPkg/EnhancedFatDxe/FileName.c (modified) (21 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/FatPkg/EnhancedFatDxe/FileName.c

@@ -24 +24 @@
 BOOLEAN
 FatCheckIs8Dot3Name (
-  IN  CHAR16    *FileName,
-  OUT CHAR8     *File8Dot3Name
-  )
-{
-  BOOLEAN PossibleShortName;
-  CHAR16  *TempName;
-  CHAR16  *ExtendName;
-  CHAR16  *SeparateDot;
-  UINTN   MainNameLen;
-  UINTN   ExtendNameLen;
+  IN  CHAR16  *FileName,
+  OUT CHAR8   *File8Dot3Name
+  )
+{
+  BOOLEAN  PossibleShortName;
+  CHAR16   *TempName;
+  CHAR16   *ExtendName;
+  CHAR16   *SeparateDot;
+  UINTN    MainNameLen;
+  UINTN    ExtendNameLen;
 
   PossibleShortName = TRUE;
@@ -59 +59 @@
     ExtendNameLen = TempName - ExtendName;
   }
+
   //
   // We scan the filename for the second time
@@ -64 +65 @@
   //
   while (--TempName >= FileName) {
-    if ((*TempName == L'.' || *TempName == L' ') && (TempName != SeparateDot)) {
+    if (((*TempName == L'.') || (*TempName == L' ')) && (TempName != SeparateDot)) {
       //
       // There exist extra blanks and dots
@@ -110 +111 @@
 UINTN
 FatTrimAsciiTrailingBlanks (
-  IN CHAR8        *Name,
-  IN UINTN        Len
+  IN CHAR8  *Name,
+  IN UINTN  Len
   )
 {
@@ -134 +135 @@
 VOID
 FatNameToStr (
-  IN  CHAR8            *FatName,
-  IN  UINTN            Len,
-  IN  UINTN            LowerCase,
-  OUT CHAR16           *Str
+  IN  CHAR8   *FatName,
+  IN  UINTN   Len,
+  IN  UINTN   LowerCase,
+  OUT CHAR16  *Str
   )
 {
@@ -167 +168 @@
 VOID
 FatCreate8Dot3Name (
-  IN FAT_OFILE    *Parent,
-  IN FAT_DIRENT   *DirEnt
-  )
-{
-  CHAR8 *ShortName;
-  CHAR8 *ShortNameChar;
-  UINTN BaseTagLen;
-  UINTN Index;
-  UINTN Retry;
-  UINT8 Segment;
+  IN FAT_OFILE   *Parent,
+  IN FAT_DIRENT  *DirEnt
+  )
+{
+  CHAR8  *ShortName;
+  CHAR8  *ShortNameChar;
+  UINTN  BaseTagLen;
+  UINTN  Index;
+  UINTN  Retry;
+  UINT8  Segment;
+
   union {
-    UINT32  Crc;
+    UINT32    Crc;
     struct HEX_DATA {
-      UINT8 Segment : HASH_VALUE_TAG_LEN;
+      UINT8    Segment : HASH_VALUE_TAG_LEN;
     } Hex[HASH_VALUE_TAG_LEN];
   } HashValue;
@@ -196 +198 @@
     BaseTagLen = SPEC_BASE_TAG_LEN;
   }
+
   //
   // We first use the algorithm described by spec.
   //
-  ShortNameChar     = ShortName + BaseTagLen;
-  *ShortNameChar++  = '~';
-  *ShortNameChar    = '1';
-  Retry = 0;
+  ShortNameChar    = ShortName + BaseTagLen;
+  *ShortNameChar++ = '~';
+  *ShortNameChar   = '1';
+  Retry            = 0;
   while (*FatShortNameHashSearch (Parent->ODir, ShortName) != NULL) {
     *ShortNameChar = (CHAR8)(*ShortNameChar + 1);
@@ -226 +229 @@
       }
 
-      *ShortNameChar++  = '~';
-      *ShortNameChar    = '1';
+      *ShortNameChar++ = '~';
+      *ShortNameChar   = '1';
     }
   }
@@ -246 +249 @@
 UINT8
 FatCheckNameCase (
-  IN CHAR16           *Str,
-  IN UINT8            InCaseFlag
+  IN CHAR16  *Str,
+  IN UINT8   InCaseFlag
   )
 {
@@ -266 +269 @@
     OutCaseFlag = InCaseFlag;
   }
+
   //
   // Upper case a copy of the string, if it matches the
@@ -288 +292 @@
 VOID
 FatSetCaseFlag (
-  IN FAT_DIRENT   *DirEnt
+  IN FAT_DIRENT  *DirEnt
   )
 {
@@ -343 +347 @@
 VOID
 FatGetFileNameViaCaseFlag (
-  IN     FAT_DIRENT   *DirEnt,
-  IN OUT CHAR16       *FileString,
-  IN     UINTN        FileStringMax
+  IN     FAT_DIRENT  *DirEnt,
+  IN OUT CHAR16      *FileString,
+  IN     UINTN       FileStringMax
   )
 {
@@ -351 +355 @@
   CHAR8   *File8Dot3Name;
   CHAR16  TempExt[1 + FAT_EXTEND_NAME_LEN + 1];
+
   //
   // Store file extension like ".txt"
@@ -379 +384 @@
   )
 {
-  UINTN ShortNameLen;
-  UINT8 Sum;
+  UINTN  ShortNameLen;
+  UINT8  Sum;
+
   Sum = 0;
   for (ShortNameLen = FAT_NAME_LEN; ShortNameLen != 0; ShortNameLen--) {
@@ -403 +409 @@
 CHAR16 *
 FatGetNextNameComponent (
-  IN  CHAR16      *Path,
-  OUT CHAR16      *Name
+  IN  CHAR16  *Path,
+  OUT CHAR16  *Name
   )
 {
@@ -410 +416 @@
     *Name++ = *Path++;
   }
+
   *Name = 0;
   //
@@ -442 +449 @@
   CHAR16  *TempNamePointer;
   CHAR16  TempChar;
+
   //
   // Trim Leading blanks
@@ -453 +461 @@
     *TempNamePointer++ = *InputFileName++;
   }
+
   //
   // Trim Trailing blanks and dots
@@ -458 +467 @@
   while (TempNamePointer > OutputFileName) {
     TempChar = *(TempNamePointer - 1);
-    if (TempChar != L' ' && TempChar != L'.') {
+    if ((TempChar != L' ') && (TempChar != L'.')) {
       break;
     }
@@ -476 +485 @@
     return FALSE;
   }
+
   //
   // See if there is any illegal characters within the name
   //
   do {
-    if (*OutputFileName < 0x20 ||
-        *OutputFileName == '\"' ||
-        *OutputFileName == '*' ||
-        *OutputFileName == '/' ||
-        *OutputFileName == ':' ||
-        *OutputFileName == '<' ||
-        *OutputFileName == '>' ||
-        *OutputFileName == '?' ||
-        *OutputFileName == '\\' ||
-        *OutputFileName == '|'
-        ) {
+    if ((*OutputFileName < 0x20) ||
+        (*OutputFileName == '\"') ||
+        (*OutputFileName == '*') ||
+        (*OutputFileName == '/') ||
+        (*OutputFileName == ':') ||
+        (*OutputFileName == '<') ||
+        (*OutputFileName == '>') ||
+        (*OutputFileName == '?') ||
+        (*OutputFileName == '\\') ||
+        (*OutputFileName == '|')
+        )
+    {
       return FALSE;
     }
@@ -496 +507 @@
     OutputFileName++;
   } while (*OutputFileName != 0);
+
   return TRUE;
 }