Skip to content

Commit 1b9f7e4

Browse files
authored
remove dead loop (#1700)
1 parent 08a168d commit 1b9f7e4

File tree

1 file changed

+17
-27
lines changed

1 file changed

+17
-27
lines changed

dWorldServer/WorldServer.cpp

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -267,36 +267,26 @@ int main(int argc, char** argv) {
267267

268268
// pre calculate the FDB checksum
269269
if (Game::config->GetValue("check_fdb") == "1") {
270-
static const std::vector<std::string> aliases = {
271-
"CDServers.fdb",
272-
"cdserver.fdb",
273-
"CDClient.fdb",
274-
"cdclient.fdb",
275-
};
276-
277-
for (const auto& file : aliases) {
278-
auto cdclient = Game::assetManager->GetFile("cdclient.fdb");
279-
if (cdclient) {
280-
281-
const int32_t bufferSize = 1024;
282-
MD5 md5;
283-
284-
char fileStreamBuffer[1024] = {};
285-
286-
while (!cdclient.eof()) {
287-
memset(fileStreamBuffer, 0, bufferSize);
288-
cdclient.read(fileStreamBuffer, bufferSize);
289-
md5.update(fileStreamBuffer, cdclient.gcount());
290-
}
270+
auto cdclient = Game::assetManager->GetFile("cdclient.fdb");
271+
if (cdclient) {
291272

292-
const char* nullTerminateBuffer = "\0";
293-
md5.update(nullTerminateBuffer, 1); // null terminate the data
294-
md5.finalize();
295-
databaseChecksum = md5.hexdigest();
273+
const int32_t bufferSize = 1024;
274+
MD5 md5;
296275

297-
LOG("FDB Checksum calculated as: %s", databaseChecksum.c_str());
298-
break;
276+
char fileStreamBuffer[bufferSize] = {};
277+
278+
while (!cdclient.eof()) {
279+
memset(fileStreamBuffer, 0, bufferSize);
280+
cdclient.read(fileStreamBuffer, bufferSize);
281+
md5.update(fileStreamBuffer, cdclient.gcount());
299282
}
283+
284+
const char* nullTerminateBuffer = "\0";
285+
md5.update(nullTerminateBuffer, 1); // null terminate the data
286+
md5.finalize();
287+
databaseChecksum = md5.hexdigest();
288+
289+
LOG("FDB Checksum calculated as: %s", databaseChecksum.c_str());
300290
}
301291
if (databaseChecksum.empty()) {
302292
LOG("check_fdb is on but no fdb file found.");

0 commit comments

Comments
 (0)