Refactor UTF8BOM checks out (on resource start)

Author: qaisjp

MTA10/mods/shared_logic/lua/CLuaMain.cpp

@@ -2014,25 +2014,11 @@ bool CLuaMain::LoadScriptFromBuffer ( const char* cpInBuffer, unsigned int uiInS
         g_pClientGame->TellServerSomethingImportant( 1003, SStringX( "CLIENT SCRIPT ERROR: " ) + strMessage, false );
         return false;
     }
-
-    bool bUTF8;
-
-    // UTF-8 BOM?  Compare by checking the standard UTF-8 BOM
-    if ( IsUTF8BOM ( cpBuffer, uiSize ) )
-    {
-        // If there's a BOM, load ignoring the first 3 bytes
-        bUTF8 = true;
-        cpBuffer += 3;
-        uiSize -= 3;
-    }
-    else
-    {
-        // Maybe not UTF-8, if we have a >80% heuristic detection confidence, assume it is
-        bUTF8 = ( GetUTF8Confidence ( (const unsigned char*) cpBuffer, uiSize ) >= 80 );
-    }
+
+    bool bUTF8 = CLuaShared::CheckUTF8BOMAndUpdate ( &cpBuffer, &uiSize );
 
     // If compiled script, make sure correct chunkname is embedded
-    EmbedChunkName( strNiceFilename, &cpBuffer, &uiSize );
+    CLuaShared::EmbedChunkName( strNiceFilename, &cpBuffer, &uiSize );
 
     if ( m_luaVM )
     {

MTA10_Server/mods/deathmatch/logic/lua/CLuaMain.cpp

@@ -307,24 +307,10 @@ bool CLuaMain::LoadScriptFromBuffer ( const char* cpInBuffer, unsigned int uiInS
         return false;
     }
 
-    bool bUTF8;
-
-    // UTF-8 BOM?  Compare by checking the standard UTF-8 BOM
-    if ( IsUTF8BOM( cpBuffer, uiSize ) )
-    {
-        // If there's a BOM, load ignoring the first 3 bytes
-        bUTF8 = true;
-        cpBuffer += 3;
-        uiSize -= 3;
-    }
-    else
-    {
-        // Maybe not UTF-8, if we have a >80% heuristic detection confidence, assume it is
-        bUTF8 = ( GetUTF8Confidence ( (const unsigned char*) cpBuffer, uiSize ) >= 80 );
-    }
+    bool bUTF8 = CLuaShared::CheckUTF8BOMAndUpdate ( &cpBuffer, &uiSize );
 
     // If compiled script, make sure correct chunkname is embedded
-    EmbedChunkName( strNiceFilename, &cpBuffer, &uiSize );
+    CLuaShared::EmbedChunkName( strNiceFilename, &cpBuffer, &uiSize );
 
     if ( m_luaVM )
     {

Shared/mods/deathmatch/logic/CLuaShared.cpp

@@ -10,7 +10,7 @@
 #include "StdInc.h"
 
 // If compiled script, make sure correct chunkname is embedded
-void EmbedChunkName( SString strChunkName, const char** pcpOutBuffer, uint* puiOutSize )
+void CLuaShared::EmbedChunkName( SString strChunkName, const char** pcpOutBuffer, uint* puiOutSize )
 {
     const char*& cpBuffer = *pcpOutBuffer;
     uint& uiSize = *puiOutSize;
@@ -47,4 +47,27 @@ void EmbedChunkName( SString strChunkName, const char** pcpOutBuffer, uint* puiO
 
     cpBuffer = store.GetData();
     uiSize = store.GetSize();
+}
+
+bool CLuaShared::CheckUTF8BOMAndUpdate ( const char ** pcpOutBuffer, uint * puiOutSize )
+{
+    const char*& cpBuffer = *pcpOutBuffer;
+    uint& uiSize = *puiOutSize;
+    bool bUTF8;
+
+    // UTF-8 BOM?  Compare by checking the standard UTF-8 BOM
+    if ( IsUTF8BOM ( cpBuffer, uiSize ) )
+    {
+        // If there's a BOM, load ignoring the first 3 bytes
+        bUTF8 = true;
+        cpBuffer += 3;
+        uiSize -= 3;
+    }
+    else
+    {
+        // Maybe not UTF-8, if we have a >80% heuristic detection confidence, assume it is
+        bUTF8 = ( GetUTF8Confidence ( (const unsigned char*) cpBuffer, uiSize ) >= 80 );
+    }
+
+    return bUTF8;
 }

Shared/mods/deathmatch/logic/CLuaShared.h

@@ -6,5 +6,10 @@
 *  FILE:        mods/shared_logic/CLuaShared.h
 *
 *****************************************************************************/
-
-void        EmbedChunkName          ( SString strChunkName, const char** pcpOutBuffer, uint* puiOutSize );
+#pragma once
+static class CLuaShared
+{
+public:
+    static void        EmbedChunkName          ( SString strChunkName, const char** pcpOutBuffer, uint* puiOutSize );
+    static bool        CheckUTF8BOMAndUpdate ( const char** pcpOutBuffer, uint* puiOutSize );
+};