HCR-18: Fixed UEFI bootloader, loading stuff correctly.

Signed-off-by: Amlal El Mahrouss <amlalelmahrouss@icloud.com>

1 files changed, 23 insertions, 23 deletions

diff --git a/Private/Source/String.cxx b/Private/Source/String.cxx
index 045545cd..0e1b7f41 100644
--- a/Private/Source/String.cxx
+++ b/Private/Source/String.cxx
@@ -15,7 +15,7 @@ Char *StringView::Data() { return m_Data; }
 
 const Char *StringView::CData() { return m_Data; }
 
-Size StringView::Length() const { return string_length(m_Data); }
+Size StringView::Length() const { return rt_string_len(m_Data); }
 
 bool StringView::operator==(const StringView &rhs) const {
   if (rhs.Length() != this->Length()) return false;
@@ -28,9 +28,9 @@ bool StringView::operator==(const StringView &rhs) const {
 }
 
 bool StringView::operator==(const Char *rhs) const {
-  if (string_length(rhs) != this->Length()) return false;
+  if (rt_string_len(rhs) != this->Length()) return false;
 
-  for (Size index = 0; index < string_length(rhs); ++index) {
+  for (Size index = 0; index < rt_string_len(rhs); ++index) {
     if (rhs[index] != m_Data[index]) return false;
   }
 
@@ -48,9 +48,9 @@ bool StringView::operator!=(const StringView &rhs) const {
 }
 
 bool StringView::operator!=(const Char *rhs) const {
-  if (string_length(rhs) != this->Length()) return false;
+  if (rt_string_len(rhs) != this->Length()) return false;
 
-  for (Size index = 0; index < string_length(rhs); ++index) {
+  for (Size index = 0; index < rt_string_len(rhs); ++index) {
     if (rhs[index] == m_Data[index]) return false;
   }
 
@@ -60,7 +60,7 @@ bool StringView::operator!=(const Char *rhs) const {
 ErrorOr<StringView> StringBuilder::Construct(const Char *data) {
   if (!data || *data == 0) return {};
 
-  StringView view(string_length(data));
+  StringView view(rt_string_len(data));
 
   rt_copy_memory(reinterpret_cast<voidPtr>(const_cast<Char *>(data)),
                  reinterpret_cast<voidPtr>(view.Data()), view.Length());
@@ -71,7 +71,7 @@ ErrorOr<StringView> StringBuilder::Construct(const Char *data) {
 const char *StringBuilder::FromInt(const char *fmt, int i) {
   if (!fmt) return ("-1");
 
-  char *ret = (char *)__alloca(sizeof(char) * 8 + string_length(fmt));
+  char *ret = (char *)__alloca(sizeof(char) * 8 + rt_string_len(fmt));
 
   if (!ret) return ("-1");
 
@@ -81,8 +81,8 @@ const char *StringBuilder::FromInt(const char *fmt, int i) {
     return ("-1");
   }
 
-  const auto fmt_len = string_length(fmt);
-  const auto res_len = string_length(result);
+  const auto fmt_len = rt_string_len(fmt);
+  const auto res_len = rt_string_len(result);
 
   for (Size idx = 0; idx < fmt_len; ++idx) {
     if (fmt[idx] == '%') {
@@ -106,12 +106,12 @@ const char *StringBuilder::FromBool(const char *fmt, bool i) {
   if (!fmt) return ("?");
 
   const char *boolean_expr = i ? "true" : "false";
-  char *ret = (char *)__alloca((sizeof(char) * i) ? 4 : 5 + string_length(fmt));
+  char *ret = (char *)__alloca((sizeof(char) * i) ? 4 : 5 + rt_string_len(fmt));
 
   if (!ret) return ("?");
 
-  const auto fmt_len = string_length(fmt);
-  const auto res_len = string_length(boolean_expr);
+  const auto fmt_len = rt_string_len(fmt);
+  const auto res_len = rt_string_len(boolean_expr);
 
   for (Size idx = 0; idx < fmt_len; ++idx) {
     if (fmt[idx] == '%') {
@@ -132,9 +132,9 @@ const char *StringBuilder::FromBool(const char *fmt, bool i) {
 }
 
 bool StringBuilder::Equals(const char *lhs, const char *rhs) {
-  if (string_length(rhs) != string_length(lhs)) return false;
+  if (rt_string_len(rhs) != rt_string_len(lhs)) return false;
 
-  for (Size index = 0; index < string_length(rhs); ++index) {
+  for (Size index = 0; index < rt_string_len(rhs); ++index) {
     if (rhs[index] != lhs[index]) return false;
   }
 
@@ -145,14 +145,14 @@ const char *StringBuilder::Format(const char *fmt, const char *fmt2) {
   if (!fmt || !fmt2) return ("?");
 
   char *ret =
-      (char *)alloca(sizeof(char) * string_length(fmt2) + string_length(fmt2));
+      (char *)alloca(sizeof(char) * rt_string_len(fmt2) + rt_string_len(fmt2));
 
   if (!ret) return ("?");
 
-  for (Size idx = 0; idx < string_length(fmt); ++idx) {
+  for (Size idx = 0; idx < rt_string_len(fmt); ++idx) {
     if (fmt[idx] == '%') {
       Size result_cnt = idx;
-      for (Size y_idx = 0; y_idx < string_length(fmt2); ++y_idx) {
+      for (Size y_idx = 0; y_idx < rt_string_len(fmt2); ++y_idx) {
         ret[result_cnt] = fmt2[y_idx];
         ++result_cnt;
       }
@@ -167,27 +167,27 @@ const char *StringBuilder::Format(const char *fmt, const char *fmt2) {
 }
 
 static void string_append(char *lhs, char *rhs, int cur) {
-  if (lhs && rhs && cur < string_length(lhs)) {
-    SizeT sz_rhs = string_length(rhs);
+  if (lhs && rhs && cur < rt_string_len(lhs)) {
+    SizeT sz_rhs = rt_string_len(rhs);
 
     rt_copy_memory(rhs, lhs + cur, sz_rhs);
   }
 }
 
 StringView &StringView::operator+=(const Char *rhs) {
-  if (string_length(rhs) > string_length(this->m_Data)) return *this;
+  if (rt_string_len(rhs) > rt_string_len(this->m_Data)) return *this;
 
   string_append(this->m_Data, const_cast<char *>(rhs), this->m_Cur);
-  this->m_Cur += string_length(rhs);
+  this->m_Cur += rt_string_len(rhs);
 
   return *this;
 }
 
 StringView &StringView::operator+=(const StringView &rhs) {
-  if (string_length(rhs.m_Data) > string_length(this->m_Data)) return *this;
+  if (rt_string_len(rhs.m_Data) > rt_string_len(this->m_Data)) return *this;
 
   string_append(this->m_Data, const_cast<char *>(rhs.m_Data), this->m_Cur);
-  this->m_Cur += string_length(const_cast<char *>(rhs.m_Data));
+  this->m_Cur += rt_string_len(const_cast<char *>(rhs.m_Data));
 
   return *this;
 }