Changing the djbHash namespace.

Author: nicolasnoble

src/core/psxemulator.cc

@@ -90,7 +90,7 @@ void PCSX::Emulator::setLua() {
             return L.error("t_ expects a string");
         }
         auto str = L.tostring(1);
-        L.push(g_system->getStr(djbHash::hash(str), str.c_str()));
+        L.push(g_system->getStr(djb::hash(str), str.c_str()));
         return 1;
     });
     L.load("ffi = require('ffi')", "internal:setffi.lua");

src/core/system.cc

@@ -232,7 +232,7 @@ bool PCSX::System::loadLocale(const std::string& name, const std::filesystem::pa
                                 if (!currentString.empty() && !fuzzy) locale[hashValue] = currentString;
                                 break;
                             case WAITING_MSGSTRTOKEN:
-                                hashValue = djbHash::hash(currentString);
+                                hashValue = djb::hash(currentString);
                                 break;
                         }
                         currentString = "";

src/core/system.h

@@ -291,8 +291,8 @@ extern System *g_system;
 
 // i18n macros
 // Normal string lookup to const char *
-#define _(str) PCSX::g_system->getStr(PCSX::djbHash::ctHash(str), str)
+#define _(str) PCSX::g_system->getStr(PCSX::djb::ctHash(str), str)
 // Formatting string lookup to use with fmt::format or fmt::printf
-#define f_(str) fmt::runtime(PCSX::g_system->getStr(PCSX::djbHash::ctHash(str), str))
+#define f_(str) fmt::runtime(PCSX::g_system->getStr(PCSX::djb::ctHash(str), str))
 // Lambda string lookup to use with static arrays of strings
-#define l_(str) []() { return PCSX::g_system->getStr(PCSX::djbHash::ctHash(str), str); }
+#define l_(str) []() { return PCSX::g_system->getStr(PCSX::djb::ctHash(str), str); }

src/support/djbhash.h

@@ -32,19 +32,19 @@ SOFTWARE.
 
 namespace PCSX {
 
-struct djbHash {
+struct djb {
   private:
-    static inline constexpr uint64_t djbProcess(uint64_t hash, const char str[], size_t n) {
-        return n ? djbProcess(((hash << 5) + hash) ^ str[0], str + 1, n - 1) : hash;
+    static inline constexpr uint64_t process(uint64_t hash, const char str[], size_t n) {
+        return n ? process(((hash << 5) + hash) ^ static_cast<uint8_t>(str[0]), str + 1, n - 1) : hash;
     }
 
   public:
     template <size_t S>
     static inline constexpr uint64_t ctHash(const char (&str)[S]) {
-        return djbProcess(5381, str, S - 1);
+        return process(5381, str, S - 1);
     }
-    static inline constexpr uint64_t hash(const char *str, size_t n) { return djbProcess(5381, str, n); }
-    static inline uint64_t hash(const std::string &str) { return djbProcess(5381, str.c_str(), str.length()); }
+    static inline constexpr uint64_t hash(const char *str, size_t n) { return process(5381, str, n); }
+    static inline uint64_t hash(const std::string &str) { return process(5381, str.c_str(), str.length()); }
 };
 
 }  // namespace PCSX