From b1b578f988619e94775017e62893b2c22da9c37a Mon Sep 17 00:00:00 2001 From: Rubidium Date: Sat, 6 May 2023 09:47:54 +0200 Subject: [PATCH] Cleanup: stredup-ing string variant for calling scripts --- src/script/squirrel.cpp | 10 ---------- src/script/squirrel.hpp | 1 - 2 files changed, 11 deletions(-) diff --git a/src/script/squirrel.cpp b/src/script/squirrel.cpp index 0d0d2724ba..7e656d0a08 100644 --- a/src/script/squirrel.cpp +++ b/src/script/squirrel.cpp @@ -432,16 +432,6 @@ bool Squirrel::CallMethod(HSQOBJECT instance, const char *method_name, HSQOBJECT return true; } -bool Squirrel::CallStringMethodStrdup(HSQOBJECT instance, const char *method_name, const char **res, int suspend) -{ - HSQOBJECT ret; - if (!this->CallMethod(instance, method_name, &ret, suspend)) return false; - if (ret._type != OT_STRING) return false; - *res = stredup(ObjectToString(&ret)); - StrMakeValidInPlace(const_cast(*res)); - return true; -} - bool Squirrel::CallStringMethod(HSQOBJECT instance, const char *method_name, std::string *res, int suspend) { HSQOBJECT ret; diff --git a/src/script/squirrel.hpp b/src/script/squirrel.hpp index 22c3435617..85b0bd1cf6 100644 --- a/src/script/squirrel.hpp +++ b/src/script/squirrel.hpp @@ -159,7 +159,6 @@ public: */ bool CallMethod(HSQOBJECT instance, const char *method_name, HSQOBJECT *ret, int suspend); bool CallMethod(HSQOBJECT instance, const char *method_name, int suspend) { return this->CallMethod(instance, method_name, nullptr, suspend); } - bool CallStringMethodStrdup(HSQOBJECT instance, const char *method_name, const char **res, int suspend); bool CallStringMethod(HSQOBJECT instance, const char *method_name, std::string *res, int suspend); bool CallIntegerMethod(HSQOBJECT instance, const char *method_name, int *res, int suspend); bool CallBoolMethod(HSQOBJECT instance, const char *method_name, bool *res, int suspend);