diff options
| author | Patric Stout <truebrain@openttd.org> | 2021-05-29 15:18:51 +0200 |
|---|---|---|
| committer | Patric Stout <github@truebrain.nl> | 2021-05-29 16:23:59 +0200 |
| commit | 7713c3e3ccdb8dea2924cc11a7108f227e374232 (patch) | |
| tree | 623b71b57bed7d3654a2b8f6cda4e988a968bfa7 /src/script | |
| parent | 665e3c1f45a6ae44d4a25534b1d67816f2d1962b (diff) | |
| download | openttd-7713c3e3ccdb8dea2924cc11a7108f227e374232.tar.xz | |
Codechange: move casting a "const char *" to "char *" to the caller
It is not nice to have your definition say you won't change a value
while in fact the whole reason for your existance is to change it.
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/api/script_text.cpp | 2 | ||||
| -rw-r--r-- | src/script/script_info.cpp | 8 | ||||
| -rw-r--r-- | src/script/squirrel.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/script/api/script_text.cpp b/src/script/api/script_text.cpp index dd32d0d42..eeb7b2221 100644 --- a/src/script/api/script_text.cpp +++ b/src/script/api/script_text.cpp @@ -157,7 +157,7 @@ SQInteger ScriptText::_set(HSQUIRRELVM vm) if (sq_gettype(vm, 2) == OT_STRING) { const SQChar *key_string; sq_getstring(vm, 2, &key_string); - StrMakeValidInPlace(key_string); + StrMakeValidInPlace(const_cast<char *>(key_string)); if (strncmp(key_string, "param_", 6) != 0 || strlen(key_string) > 8) return SQ_ERROR; k = atoi(key_string + 6); diff --git a/src/script/script_info.cpp b/src/script/script_info.cpp index 17b0e1969..d381ae9c2 100644 --- a/src/script/script_info.cpp +++ b/src/script/script_info.cpp @@ -122,7 +122,7 @@ SQInteger ScriptInfo::AddSetting(HSQUIRRELVM vm) while (SQ_SUCCEEDED(sq_next(vm, -2))) { const SQChar *key; if (SQ_FAILED(sq_getstring(vm, -2, &key))) return SQ_ERROR; - StrMakeValidInPlace(key); + StrMakeValidInPlace(const_cast<char *>(key)); if (strcmp(key, "name") == 0) { const SQChar *sqvalue; @@ -141,7 +141,7 @@ SQInteger ScriptInfo::AddSetting(HSQUIRRELVM vm) const SQChar *sqdescription; if (SQ_FAILED(sq_getstring(vm, -1, &sqdescription))) return SQ_ERROR; config.description = stredup(sqdescription); - StrMakeValidInPlace(config.description); + StrMakeValidInPlace(const_cast<char *>(config.description)); items |= 0x002; } else if (strcmp(key, "min_value") == 0) { SQInteger res; @@ -226,7 +226,7 @@ SQInteger ScriptInfo::AddLabels(HSQUIRRELVM vm) { const SQChar *setting_name; if (SQ_FAILED(sq_getstring(vm, -2, &setting_name))) return SQ_ERROR; - StrMakeValidInPlace(setting_name); + StrMakeValidInPlace(const_cast<char *>(setting_name)); ScriptConfigItem *config = nullptr; for (auto &item : this->config_list) { @@ -253,7 +253,7 @@ SQInteger ScriptInfo::AddLabels(HSQUIRRELVM vm) /* Because squirrel doesn't support identifiers starting with a digit, * we skip the first character. */ int key = atoi(key_string + 1); - StrMakeValidInPlace(label); + StrMakeValidInPlace(const_cast<char *>(label)); /* !Contains() prevents stredup from leaking. */ if (!config->labels->Contains(key)) config->labels->Insert(key, stredup(label)); diff --git a/src/script/squirrel.cpp b/src/script/squirrel.cpp index 89d86180d..aa698af83 100644 --- a/src/script/squirrel.cpp +++ b/src/script/squirrel.cpp @@ -448,7 +448,7 @@ bool Squirrel::CallStringMethodStrdup(HSQOBJECT instance, const char *method_nam if (!this->CallMethod(instance, method_name, &ret, suspend)) return false; if (ret._type != OT_STRING) return false; *res = stredup(ObjectToString(&ret)); - StrMakeValidInPlace(*res); + StrMakeValidInPlace(const_cast<char *>(*res)); return true; } |