summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--public/frameworks/LaunchHelpers.fwrk/headers/Foundation.h16
-rw-r--r--src/kernel/HALKit/AMD64/HalCoreInterruptHandler.cc2
-rw-r--r--src/kernel/KernelKit/FileMgr.h2
-rw-r--r--src/kernel/KernelKit/IPEFDylibObject.h22
-rw-r--r--src/kernel/NeKit/Ref.h2
-rw-r--r--src/kernel/src/FS/Ext2+IFS.cc11
-rw-r--r--src/kernel/src/Pmm.cc2
-rw-r--r--src/libDDK/DriverKit/c++/driver_base.h2
8 files changed, 34 insertions, 25 deletions
diff --git a/public/frameworks/LaunchHelpers.fwrk/headers/Foundation.h b/public/frameworks/LaunchHelpers.fwrk/headers/Foundation.h
index cba2e7c4..e0cdcc64 100644
--- a/public/frameworks/LaunchHelpers.fwrk/headers/Foundation.h
+++ b/public/frameworks/LaunchHelpers.fwrk/headers/Foundation.h
@@ -18,14 +18,14 @@ inline constexpr auto kMaxArgs = 256;
/// @brief Launch information structure.
/// @note This structure is read-only. Modyfing its members wo't have any effect.
struct LHLaunchInfo final {
- CF::CFString fExecutablePath{kMaxPath};
- CF::CFString fWorkingDirectory{kMaxPath};
- CF::CFRef<CF::CFString> fArguments[kMaxArgs];
- CF::CFString fEnvironment{kMaxPath};
- CF::CFInteger64 fUID{0};
- CF::CFInteger64 fGID{0};
-
- LHLaunchInfo() = default;
+ CF::CFString fExecutablePath{kMaxPath};
+ CF::CFString fWorkingDirectory{kMaxPath};
+ CF::CFRef<CF::CFString> fArguments[kMaxArgs];
+ CF::CFString fEnvironment{kMaxPath};
+ CF::CFInteger64 fUID{0};
+ CF::CFInteger64 fGID{0};
+
+ LHLaunchInfo() = default;
~LHLaunchInfo() = default;
LIBSYS_COPY_DELETE(LHLaunchInfo)
diff --git a/src/kernel/HALKit/AMD64/HalCoreInterruptHandler.cc b/src/kernel/HALKit/AMD64/HalCoreInterruptHandler.cc
index ae36746e..02931daf 100644
--- a/src/kernel/HALKit/AMD64/HalCoreInterruptHandler.cc
+++ b/src/kernel/HALKit/AMD64/HalCoreInterruptHandler.cc
@@ -7,9 +7,9 @@
#include <ArchKit/ArchKit.h>
#include <KernelKit/ProcessScheduler.h>
#include <KernelKit/UserMgr.h>
+#include <NeKit/Atom.h>
#include <NeKit/KString.h>
#include <SignalKit/Signals.h>
-#include <NeKit/Atom.h>
EXTERN_C Kernel::Void idt_handle_breakpoint(Kernel::UIntPtr rip);
EXTERN_C Kernel::UIntPtr kApicBaseAddress;
diff --git a/src/kernel/KernelKit/FileMgr.h b/src/kernel/KernelKit/FileMgr.h
index 5d3ab581..c04c95af 100644
--- a/src/kernel/KernelKit/FileMgr.h
+++ b/src/kernel/KernelKit/FileMgr.h
@@ -265,7 +265,7 @@ class HeFileSystemMgr final : public IFilesystemMgr {
private:
HeFileSystemParser* mParser{nullptr};
- DriveTrait mDriveTrait;
+ DriveTrait mDriveTrait;
};
#endif // ifdef __FSKIT_INCLUDES_OPENHEFS__
diff --git a/src/kernel/KernelKit/IPEFDylibObject.h b/src/kernel/KernelKit/IPEFDylibObject.h
index d8ed3fc5..cff1ec8c 100644
--- a/src/kernel/KernelKit/IPEFDylibObject.h
+++ b/src/kernel/KernelKit/IPEFDylibObject.h
@@ -29,17 +29,21 @@ class IPEFDylibObject final NE_DYLIB_OBJECT {
public:
NE_COPY_DEFAULT(IPEFDylibObject)
+ using DylibTraitsPtr = DylibTraits*;
+ using DylibTraitsPtrX2 = DylibTraitsPtr*;
+
private:
- DylibTraits* fMounted{nullptr};
+ DylibTraitsPtr fMounted{nullptr};
public:
- DylibTraits** GetAddressOf() { return &fMounted; }
+ DylibTraitsPtrX2 GetAddressOf() { return &fMounted; }
- DylibTraits* Get() { return fMounted; }
+ DylibTraitsPtr Get() { return fMounted; }
public:
- void Mount(DylibTraits* to_mount) {
- if (!to_mount || !to_mount->ImageObject) return;
+ void Mount(DylibTraitsPtr to_mount) {
+ if (!to_mount) return;
+ if (!to_mount->ImageObject) return;
fMounted = to_mount;
@@ -62,7 +66,7 @@ class IPEFDylibObject final NE_DYLIB_OBJECT {
if (symbol_name == nullptr || *symbol_name == 0) return nullptr;
if (len > kPathLen || len < 1) return nullptr;
- auto ret = reinterpret_cast<SymbolType>(fLoader->FindSymbol(symbol_name, kind).Leak().Leak());
+ auto ret = static_cast<SymbolType>(fLoader->FindSymbol(symbol_name, kind).Leak().Leak());
if (!ret) {
if (kind == kPefCode) return (VoidPtr) &__ne_pure_call;
@@ -74,10 +78,12 @@ class IPEFDylibObject final NE_DYLIB_OBJECT {
}
private:
- PEFLoader* fLoader{nullptr};
+ using LoaderType = PEFLoader;
+
+ LoaderType* fLoader{nullptr};
};
-typedef IPEFDylibObject* IDylibRef;
+using IDylibRef = IPEFDylibObject*;
EXTERN_C IDylibRef rtl_init_dylib_pef(UserProcess& header);
EXTERN_C Void rtl_fini_dylib_pef(UserProcess& header, IDylibRef lib, Bool* successful);
diff --git a/src/kernel/NeKit/Ref.h b/src/kernel/NeKit/Ref.h
index 253ee379..25706437 100644
--- a/src/kernel/NeKit/Ref.h
+++ b/src/kernel/NeKit/Ref.h
@@ -47,7 +47,7 @@ class Ref final {
Type operator*() { return fClass; }
explicit operator bool() { return Vettable<Type>::kValue; }
- bool operator!() { return !Vettable<Type>::kValue; }
+ bool operator!() { return !Vettable<Type>::kValue; }
private:
Type fClass;
diff --git a/src/kernel/src/FS/Ext2+IFS.cc b/src/kernel/src/FS/Ext2+IFS.cc
index bd70f334..5b5fbb3b 100644
--- a/src/kernel/src/FS/Ext2+IFS.cc
+++ b/src/kernel/src/FS/Ext2+IFS.cc
@@ -188,8 +188,9 @@ static ErrorOr<voidPtr> ext2_read_inode_data(Ext2Context* ctx, Ext2Node* node, S
// Get group descriptor information for a given block/inode number
static ErrorOr<::Detail::Ext2GroupInfo*> ext2_get_group_descriptor_info(Ext2Context* ctx,
- UInt32 targetBlockOrInode) {
- if (!ctx || !ctx->superblock || !ctx->drive) return ErrorOr<::Detail::Ext2GroupInfo*>(kErrorInvalidData);
+ UInt32 targetBlockOrInode) {
+ if (!ctx || !ctx->superblock || !ctx->drive)
+ return ErrorOr<::Detail::Ext2GroupInfo*>(kErrorInvalidData);
UInt32 blockSize = ctx->BlockSize();
UInt32 blocksPerGroup = ctx->superblock->fBlocksPerGroup;
@@ -197,7 +198,8 @@ static ErrorOr<::Detail::Ext2GroupInfo*> ext2_get_group_descriptor_info(Ext2Cont
UInt32 totalBlocks = ctx->superblock->fBlockCount;
UInt32 totalInodes = ctx->superblock->fInodeCount;
- if (blocksPerGroup == 0 || inodesPerGroup == 0) return ErrorOr<::Detail::Ext2GroupInfo*>(kErrorInvalidData);
+ if (blocksPerGroup == 0 || inodesPerGroup == 0)
+ return ErrorOr<::Detail::Ext2GroupInfo*>(kErrorInvalidData);
// block group index
UInt32 groupIndex = 0;
@@ -242,7 +244,8 @@ static ErrorOr<::Detail::Ext2GroupInfo*> ext2_get_group_descriptor_info(Ext2Cont
return ErrorOr<::Detail::Ext2GroupInfo*>(kErrorDisk);
}
- auto groupInfo = (::Detail::Ext2GroupInfo*) mm_alloc_ptr(sizeof(::Detail::Ext2GroupInfo), true, false);
+ auto groupInfo =
+ (::Detail::Ext2GroupInfo*) mm_alloc_ptr(sizeof(::Detail::Ext2GroupInfo), true, false);
if (!groupInfo) {
mm_free_ptr(blockBuffer);
return ErrorOr<::Detail::Ext2GroupInfo*>(kErrorHeapOutOfMemory);
diff --git a/src/kernel/src/Pmm.cc b/src/kernel/src/Pmm.cc
index 074ae54b..8a6aa550 100644
--- a/src/kernel/src/Pmm.cc
+++ b/src/kernel/src/Pmm.cc
@@ -4,9 +4,9 @@
======================================== */
+#include <ArchKit/ArchKit.h>
#include <KernelKit/DebugOutput.h>
#include <NeKit/Pmm.h>
-#include <ArchKit/ArchKit.h>
namespace Kernel {
/***********************************************************************************/
diff --git a/src/libDDK/DriverKit/c++/driver_base.h b/src/libDDK/DriverKit/c++/driver_base.h
index 925628b3..f43ae0bf 100644
--- a/src/libDDK/DriverKit/c++/driver_base.h
+++ b/src/libDDK/DriverKit/c++/driver_base.h
@@ -32,7 +32,7 @@ class IDriverBase {
using PtrType = VoidPtr;
- virtual constexpr BOOL IsCastable() { return NO; }
+ virtual constexpr BOOL IsCastable() { return NO; }
virtual constexpr BOOL IsActive() { return NO; }
virtual PtrType Leak() { return nullptr; }
virtual constexpr Int32 Type() { return kInvalidType; }
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-12 22:59:10 +0000