Fix two memleak reports from Coverity (#12466)

[minetest.git] / src / script / scripting_mainmenu.cpp

diff --git a/src/script/scripting_mainmenu.cpp b/src/script/scripting_mainmenu.cpp
index b8a44205a9fc962c9853087b43aa42b69396ef7d..2a0cadb23288eec1529c218094087a06f6249304 100644 (file)
--- a/src/script/scripting_mainmenu.cpp
+++ b/src/script/scripting_mainmenu.cpp
@@ -18,9 +18,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "scripting_mainmenu.h"
-#include "mods.h"
+#include "content/mods.h"
 #include "cpp_api/s_internal.h"
 #include "lua_api/l_base.h"
+#include "lua_api/l_http.h"
 #include "lua_api/l_mainmenu.h"
 #include "lua_api/l_sound.h"
 #include "lua_api/l_util.h"
@@ -30,14 +31,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 extern "C" {
 #include "lualib.h"
 }
-
 #define MAINMENU_NUM_ASYNC_THREADS 4
 
 
-MainMenuScripting::MainMenuScripting(GUIEngine* guiengine)
+MainMenuScripting::MainMenuScripting(GUIEngine* guiengine):
+               ScriptApiBase(ScriptingType::MainMenu)
 {
        setGuiEngine(guiengine);
-       setType(ScriptingType::MainMenu);
 
        SCRIPTAPI_PRECHECKHEADER
 
@@ -67,10 +67,12 @@ void MainMenuScripting::initializeModApi(lua_State *L, int top)
        ModApiMainMenu::Initialize(L, top);
        ModApiUtil::Initialize(L, top);
        ModApiSound::Initialize(L, top);
+       ModApiHttp::Initialize(L, top);
 
        asyncEngine.registerStateInitializer(registerLuaClasses);
        asyncEngine.registerStateInitializer(ModApiMainMenu::InitializeAsync);
        asyncEngine.registerStateInitializer(ModApiUtil::InitializeAsync);
+       asyncEngine.registerStateInitializer(ModApiHttp::InitializeAsync);
 
        // Initialize async environment
        //TODO possibly make number of async threads configurable
@@ -90,9 +92,9 @@ void MainMenuScripting::step()
 }
 
 /******************************************************************************/
-unsigned int MainMenuScripting::queueAsync(const std::string &serialized_func,
-               const std::string &serialized_param)
+u32 MainMenuScripting::queueAsync(std::string &&serialized_func,
+               std::string &&serialized_param)
 {
-       return asyncEngine.queueAsyncJob(serialized_func, serialized_param);
+       return asyncEngine.queueAsyncJob(std::move(serialized_func), std::move(serialized_param));
 }