diff options
Diffstat (limited to 'Private')
| -rw-r--r-- | Private/NewKit/Variant.hpp | 63 | ||||
| -rw-r--r-- | Private/Source/DriveManager.cxx | 4 | ||||
| -rw-r--r-- | Private/Source/GUIDWizard.cxx | 3 | ||||
| -rw-r--r-- | Private/Source/NewFS-IO.cxx | 2 | ||||
| -rw-r--r-- | Private/Source/Variant.cxx | 2 |
5 files changed, 34 insertions, 40 deletions
diff --git a/Private/NewKit/Variant.hpp b/Private/NewKit/Variant.hpp index 23316ec1..a897b63a 100644 --- a/Private/NewKit/Variant.hpp +++ b/Private/NewKit/Variant.hpp @@ -12,38 +12,31 @@ #include <NewKit/Defines.hpp> #include <NewKit/String.hpp> -namespace HCore -{ - class Variant final - { - public: - enum class VariantKind - { - kString, - kPointer, - kUndefined - }; - - public: - explicit Variant() = delete; - - public: - Variant &operator=(const Variant &) = default; - Variant(const Variant &) = default; - - ~Variant() = default; - - public: - explicit Variant(StringView* stringView) : m_Ptr((voidPtr)stringView), m_Kind(VariantKind::kString) {} - explicit Variant(nullPtr) : m_Ptr(nullptr), m_Kind(VariantKind::kUndefined) {} - explicit Variant(voidPtr ptr) : m_Ptr(ptr), m_Kind(VariantKind::kPointer) {} - - public: - const Char* ToString(); - - private: - voidPtr m_Ptr{nullptr}; - VariantKind m_Kind{VariantKind::kUndefined}; - - }; -} // namespace HCore +namespace HCore { +class Variant final { + public: + enum class VariantKind { kString, kPointer, kUndefined }; + + public: + explicit Variant() = delete; + + public: + Variant &operator=(const Variant &) = default; + Variant(const Variant &) = default; + + ~Variant() = default; + + public: + explicit Variant(StringView *stringView) + : m_Ptr((voidPtr)stringView), m_Kind(VariantKind::kString) {} + explicit Variant(nullPtr) : m_Ptr(nullptr), m_Kind(VariantKind::kUndefined) {} + explicit Variant(voidPtr ptr) : m_Ptr(ptr), m_Kind(VariantKind::kPointer) {} + + public: + const Char *ToString(); + + private: + voidPtr m_Ptr{nullptr}; + VariantKind m_Kind{VariantKind::kUndefined}; +}; +} // namespace HCore diff --git a/Private/Source/DriveManager.cxx b/Private/Source/DriveManager.cxx index 9611575d..10c4d28e 100644 --- a/Private/Source/DriveManager.cxx +++ b/Private/Source/DriveManager.cxx @@ -29,7 +29,7 @@ bool DriveSelector::Mount(DriveTraits *drive) { fDrive = drive; fDrive->fMount(); - kcout << "[Mount] drive: " << fDrive->fName << "\n"; + kcout << "Mount drive: " << fDrive->fName << "\n"; return true; } @@ -45,7 +45,7 @@ DriveTraits *DriveSelector::Unmount() { fDrive->fUnmount(); fDrive = nullptr; - kcout << "[Unmount] drive: " << drivePointer->fName << "\n"; + kcout << "Unmount drive: " << drivePointer->fName << "\n"; return drivePointer; } diff --git a/Private/Source/GUIDWizard.cxx b/Private/Source/GUIDWizard.cxx index 57915f64..829a27d8 100644 --- a/Private/Source/GUIDWizard.cxx +++ b/Private/Source/GUIDWizard.cxx @@ -12,9 +12,8 @@ // begin of ascii 'readable' characters. (A, C, C, 1, 2) #define kAsciiBegin 47 - // @brief Size of UUID. -#define kUUIDSize 32 +#define kUUIDSize 37 namespace HCore::XRN::Version1 { auto make_sequence(const ArrayList<UShort>& uuidSeq) -> Ref<GUIDSequence*> { diff --git a/Private/Source/NewFS-IO.cxx b/Private/Source/NewFS-IO.cxx index f5d550e0..7ecd396d 100644 --- a/Private/Source/NewFS-IO.cxx +++ b/Private/Source/NewFS-IO.cxx @@ -11,4 +11,6 @@ #include <KernelKit/DriveManager.hpp> #include <KernelKit/FileManager.hpp> +/// @brief this implements NewFS with Device Abstraction in mind. + /// bugs 0 diff --git a/Private/Source/Variant.cxx b/Private/Source/Variant.cxx index a09c847c..a6e34119 100644 --- a/Private/Source/Variant.cxx +++ b/Private/Source/Variant.cxx @@ -21,7 +21,7 @@ const Char* Variant::ToString() { case VariantKind::kPointer: return ("Memory:{Pointer}"); default: - return ("Class:{Undefined}"); + return ("Memory:{Undefined}"); } } |
