From 3c26035feb3418ab89b2fb8bccd395dd90c3c188 Mon Sep 17 00:00:00 2001
From: devdl11 <dl11developer@gmail.com>
Date: Fri, 8 Apr 2022 14:01:55 +0200
Subject: [PATCH] [Review] Class to namespace

---
 bootloader/boot.cpp          |  4 ++--
 bootloader/itoa.cpp          |  2 +-
 bootloader/kernel_header.cpp |  4 ++--
 bootloader/usb_data.cpp      |  4 ++--
 bootloader/utility.cpp       |  2 +-
 bootloader/utility.h         | 10 ++++------
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/bootloader/boot.cpp b/bootloader/boot.cpp
index cc71d711d..284acf8ad 100644
--- a/bootloader/boot.cpp
+++ b/bootloader/boot.cpp
@@ -26,8 +26,8 @@ void Boot::bootSlot(Bootloader::Slot s) {
     // We are trying to boot epsilon, so we check the version and show an advertisement if needed
     const char * version = s.userlandHeader()->version();
     const char * min = "18.2.4";
-    int vsum = Bootloader::Utility::versionSum(version, strlen(version));
-    int minsum = Bootloader::Utility::versionSum(min, strlen(min));
+    int vsum = Utility::versionSum(version, strlen(version));
+    int minsum = Utility::versionSum(min, strlen(min));
     if (vsum >= minsum) {
       Interface::drawEpsilonAdvertisement();
       uint64_t scan = 0;
diff --git a/bootloader/itoa.cpp b/bootloader/itoa.cpp
index 8235e7b32..7d712ebdd 100644
--- a/bootloader/itoa.cpp
+++ b/bootloader/itoa.cpp
@@ -19,7 +19,7 @@ char* reverse(char *buffer, int i, int j) {
 }
  
 // Iterative function to implement `itoa()` function in C
-char* Bootloader::Utility::itoa(int value, char* buffer, int base) {
+char* Utility::itoa(int value, char* buffer, int base) {
     // invalid input
     if (base < 2 || base > 32) {
         return buffer;
diff --git a/bootloader/kernel_header.cpp b/bootloader/kernel_header.cpp
index 7f55b9fc3..53e02cfaf 100644
--- a/bootloader/kernel_header.cpp
+++ b/bootloader/kernel_header.cpp
@@ -24,9 +24,9 @@ const void(*KernelHeader::startPointer() const)() {
 }
 
 const bool KernelHeader::isAboveVersion16 () const {
-  int sum = Bootloader::Utility::versionSum(m_version, 2);
+  int sum = Utility::versionSum(m_version, 2);
   char newVersion[] = "16";
-  int min = Bootloader::Utility::versionSum(newVersion, 2);
+  int min = Utility::versionSum(newVersion, 2);
   return sum >= min;
 }
 
diff --git a/bootloader/usb_data.cpp b/bootloader/usb_data.cpp
index b161df94c..1074d7223 100644
--- a/bootloader/usb_data.cpp
+++ b/bootloader/usb_data.cpp
@@ -13,13 +13,13 @@ static char data[255];
 
 const char * Bootloader::USBData::buildStringDescriptor(StringHeader header, uint32_t startAddress, uint32_t size) {
     strlcpy(data, header.getString(), sizeof(data));
-    Bootloader::Utility::itoa((int32_t)startAddress, &data[strlen(header.getString())], 16);
+    Utility::itoa((int32_t)startAddress, &data[strlen(header.getString())], 16);
     data[strlen(header.getString()) + 8] = '/';
     data[strlen(header.getString()) + 8 + 1] = '0';
     data[strlen(header.getString()) + 8 + 2] = '1';
     data[strlen(header.getString()) + 8 + 3] = '*';
     data[strlen(header.getString()) + 8 + 4] = '0';
-    Bootloader::Utility::itoa((int32_t)size/1024, &data[strlen(header.getString()) + 8 + 5], 10);
+    Utility::itoa((int32_t)size/1024, &data[strlen(header.getString()) + 8 + 5], 10);
     data[strlen(header.getString()) + 8 + 5 + 2] = 'K';
     data[strlen(header.getString()) + 8 + 5 + 2 + 1] = 'g';
     data[strlen(header.getString()) + 8 + 5 + 2 + 2] = '\0';
diff --git a/bootloader/utility.cpp b/bootloader/utility.cpp
index 1329351e5..d2bdc44a0 100644
--- a/bootloader/utility.cpp
+++ b/bootloader/utility.cpp
@@ -1,7 +1,7 @@
 #include <bootloader/utility.h>
 #include <string.h>
 
-int Bootloader::Utility::versionSum(const char * version, int length) {
+int Utility::versionSum(const char * version, int length) {
     int sum = 0;
     for (int i  = 0; i < length; i++) {
         sum += version[i] * (strlen(version) * 100 - i * 10);
diff --git a/bootloader/utility.h b/bootloader/utility.h
index f0739f35a..1a4589541 100644
--- a/bootloader/utility.h
+++ b/bootloader/utility.h
@@ -1,12 +1,10 @@
 #ifndef _BOOTLOADER_ITOA_H_
 #define _BOOTLOADER_ITOA_H_
 
-namespace Bootloader {
-    class Utility {
-        public:
-            static char * itoa(int value, char * result, int base);
-            static int versionSum(const char * version, int length);
-    };
+namespace Utility {
+
+    static char * itoa(int value, char * result, int base);
+    static int versionSum(const char * version, int length);
 }
 
 #endif