5 files changed, 16 insertions, 14 deletions
diff --git a/dev/boot/BootKit/BootKit.h b/dev/boot/BootKit/BootKit.h
index cc80e359..85de8d86 100644
--- a/dev/boot/BootKit/BootKit.h
+++ b/dev/boot/BootKit/BootKit.h
@@ -293,16 +293,16 @@ inline Boolean BDiskFormatFactory<BootDev>::Format(const Char* part_name) {
   CopyMem(gpt_part->Signature, reinterpret_cast<VoidPtr>(const_cast<Char*>(kMagicGPT)),
           StrLen(kMagicGPT));
 
-  gpt_part->Revision   = 0x00010000;
+  gpt_part->Revision = 0x00010000;
   gpt_part->HeaderSize = sizeof(GPT_PARTITION_TABLE);
 
   gpt_part->CRC32 = 0x00000000;
 
-  gpt_part->Reserved1     = 0x00000000;
-  gpt_part->LBAHeader     = 0x00000000;
-  gpt_part->LBAAltHeader  = 0x00000000;
+  gpt_part->Reserved1 = 0x00000000;
+  gpt_part->LBAHeader = 0x00000000;
+  gpt_part->LBAAltHeader = 0x00000000;
   gpt_part->FirstGPTEntry = 0x00000000;
-  gpt_part->LastGPTEntry  = 0x00000000;
+  gpt_part->LastGPTEntry = 0x00000000;
 
   gpt_part->Guid.Data1 = 0x00000000;
   gpt_part->Guid.Data2 = 0x0000;
@@ -312,10 +312,10 @@ inline Boolean BDiskFormatFactory<BootDev>::Format(const Char* part_name) {
 
   gpt_part->Revision = 0x00010000;
 
-  gpt_part->StartingLBA         = 0x00000000;
+  gpt_part->StartingLBA = 0x00000000;
   gpt_part->NumPartitionEntries = 0x00000000;
-  gpt_part->SizeOfEntries       = 0x00000000;
-  gpt_part->CRC32PartEntry      = 0x00000000;
+  gpt_part->SizeOfEntries = 0x00000000;
+  gpt_part->CRC32PartEntry = 0x00000000;
 
   SetMem(gpt_part->Reserved2, 0, kSectorAlignGPT_PartTbl);
 
diff --git a/dev/boot/modules/BootNet/BootNet.cc b/dev/boot/modules/BootNet/BootNet.cc
index 840aabd5..3ea7350e 100644
--- a/dev/boot/modules/BootNet/BootNet.cc
+++ b/dev/boot/modules/BootNet/BootNet.cc
@@ -12,8 +12,8 @@
 #include <FirmwareKit/EFI/API.h>
 #include <modules/BootNet/BootNet.h>
 
-STATIC EfiGUID                      kEfiSimpleProtoGUID = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
-STATIC EFI_SIMPLE_NETWORK_PROTOCOL* kEfiProtocol        = nullptr;
+STATIC EfiGUID kEfiSimpleProtoGUID               = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
+STATIC EFI_SIMPLE_NETWORK_PROTOCOL* kEfiProtocol = nullptr;
 
 STATIC Void bootnet_read_ip_packet(BOOTNET_INTERNET_HEADER   inet,
                                    BOOTNET_INTERNET_HEADER** inet_out);
diff --git a/dev/boot/src/HEL/AMD64/BootATA.cc b/dev/boot/src/HEL/AMD64/BootATA.cc
index e1ccbfc3..903a650d 100644
--- a/dev/boot/src/HEL/AMD64/BootATA.cc
+++ b/dev/boot/src/HEL/AMD64/BootATA.cc
@@ -114,7 +114,7 @@ Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeASCII* Buf,
 
   rt_out8(IO + ATA_REG_SEC_COUNT0, ((Size + SectorSz) / SectorSz));
 
-  rt_out8(IO + ATA_REG_LBA0, (Lba) & 0xFF);
+  rt_out8(IO + ATA_REG_LBA0, (Lba) &0xFF);
   rt_out8(IO + ATA_REG_LBA1, (Lba) >> 8);
   rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16);
   rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24);
@@ -143,7 +143,7 @@ Void boot_ata_write(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeASCII* Buf
 
   rt_out8(IO + ATA_REG_SEC_COUNT0, ((Size + (SectorSz)) / SectorSz));
 
-  rt_out8(IO + ATA_REG_LBA0, (Lba) & 0xFF);
+  rt_out8(IO + ATA_REG_LBA0, (Lba) &0xFF);
   rt_out8(IO + ATA_REG_LBA1, (Lba) >> 8);
   rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16);
   rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24);
diff --git a/dev/boot/src/HEL/ARM64/BootPlatform.cc b/dev/boot/src/HEL/ARM64/BootPlatform.cc
index 683245fb..9dd03afe 100644
--- a/dev/boot/src/HEL/ARM64/BootPlatform.cc
+++ b/dev/boot/src/HEL/ARM64/BootPlatform.cc
@@ -13,7 +13,8 @@
 using namespace Boot;
 
 EXTERN_C void rt_halt() {
-  while (Yes);
+  while (Yes)
+    ;
 }
 
 EXTERN_C void rt_cli() {}
diff --git a/dev/boot/src/New+Delete.cc b/dev/boot/src/New+Delete.cc
index f7ad2898..d4d5dfed 100644
--- a/dev/boot/src/New+Delete.cc
+++ b/dev/boot/src/New+Delete.cc
@@ -17,7 +17,8 @@
 void* operator new(size_t sz) {
   void* buf = nullptr;
 
-  while (BS->AllocatePool(EfiMemoryType::EfiLoaderData, sz, &buf) != kEfiOk);
+  while (BS->AllocatePool(EfiMemoryType::EfiLoaderData, sz, &buf) != kEfiOk)
+    ;
 
   return buf;
 }