diff options
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/Storage/AHCI.cc | 8 | ||||
| -rw-r--r-- | dev/Kernel/src/PEFCodeMgr.cc | 2 | ||||
| -rw-r--r-- | dev/Usr/LibCF/String.h | 13 | ||||
| -rw-r--r-- | dev/Usr/LibWM/WindowConnection.h | 4 |
4 files changed, 16 insertions, 11 deletions
diff --git a/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc b/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc index bb37fd11..e1f48503 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/AHCI.cc @@ -179,10 +179,16 @@ STATIC Void drv_std_input_output(UInt64 lba, UInt8* buffer, SizeT sector_sz, Siz kSATAHba->Ports[kSATAIndex].Ci = (1 << slot); - while (1) + while (YES) { if ((kSATAHba->Ports[kSATAIndex].Ci & (1 << slot)) == 0) break; + + if (kSATAHba->Is & kHBAErrTaskFile) + { + err_global_get() = kErrorDiskIsCorrupted; + return; + } } // Check IS again. diff --git a/dev/Kernel/src/PEFCodeMgr.cc b/dev/Kernel/src/PEFCodeMgr.cc index e39e72ca..426a1e26 100644 --- a/dev/Kernel/src/PEFCodeMgr.cc +++ b/dev/Kernel/src/PEFCodeMgr.cc @@ -166,7 +166,7 @@ namespace NeOS for (SizeT index = 0; index < container->Count; ++index) { if (KStringBuilder::Equals(container_header->Name, - error_or_symbol.Leak().Leak().CData())) + error_or_symbol.Leak().Leak().CData())) { if (container_header->Kind == kind) { diff --git a/dev/Usr/LibCF/String.h b/dev/Usr/LibCF/String.h index d87c2d2d..9b83fec6 100644 --- a/dev/Usr/LibCF/String.h +++ b/dev/Usr/LibCF/String.h @@ -11,11 +11,10 @@ namespace LibCF { - class CFString; + class CFString; - class CFString final CF_OBJECT - { - public: - - }; -}
\ No newline at end of file + class CFString final CF_OBJECT + { + public: + }; +} // namespace LibCF
\ No newline at end of file diff --git a/dev/Usr/LibWM/WindowConnection.h b/dev/Usr/LibWM/WindowConnection.h index 3a3e39a6..22938130 100644 --- a/dev/Usr/LibWM/WindowConnection.h +++ b/dev/Usr/LibWM/WindowConnection.h @@ -24,8 +24,8 @@ namespace LibCF constexpr static SInt16 kMaxPeers = 16; - Char mConnName[256] = {0}; - SInt32 mConnPeersCnt{0}; + Char mConnName[256] = {0}; + SInt32 mConnPeersCnt{0}; CFArray<VoidPtr, kMaxPeers> mConnPeers; }; } // namespace LibCF
\ No newline at end of file |