mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-26 16:09:10 +00:00
Code Issues Activity

Codechange: replace buffer+strecpy with std::string

Browse Source
This commit is contained in:
Rubidium
2023-06-29 16:27:17 +02:00
committed by rubidium42
parent 3f18a8863a
commit 0ea3e338ab
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/network/network_content.cpp
View File

@@ -699,19 +699,19 @@ void ClientNetworkContentSocketHandler::OnReceiveData(const char *data, size_t l
check_not_null(p); check_not_null(p);
p++; // Start after the '/' p++; // Start after the '/'
char tmp[MAX_PATH]; std::string filename = p;
if (strecpy(tmp, p, lastof(tmp)) == lastof(tmp)) {
this->OnFailure();
return;
}
/* Remove the extension from the string. */ /* Remove the extension from the string. */
for (uint i = 0; i < 2; i++) { for (uint i = 0; i < 2; i++) {
p = strrchr(tmp, '.'); auto pos = filename.find_last_of('.');
check_and_terminate(p); if (pos == std::string::npos) {
this->OnFailure();
return;
}
filename.erase(pos);
} }
/* Copy the string, without extension, to the filename. */ /* Copy the string, without extension, to the filename. */
this->curInfo->filename = tmp; this->curInfo->filename = std::move(filename);
/* Request the next file. */ /* Request the next file. */
if (!this->BeforeDownload()) { if (!this->BeforeDownload()) {