oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-02 16:38:41 +00:00
Code Wiki Activity

Add a MSVC / Windows compatible snprintf function (#7353)

Browse source 
Use sizeof where applicable for mt_snprintf
This commit is contained in:
nOOb3167 2018-07-22 21:56:06 +02:00 • committed by SmallJoker
parent 9855651c06
commit 9537cfd3f8
13 changed files with 54 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/unittest/test.cpp
View file

@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "modchannels.h"
#include "content/mods.h"
#include "util/numeric.h"
#include "porting.h"
content_t t_CONTENT_STONE;
content_t t_CONTENT_GRASS;
@ -323,7 +324,7 @@ std::string TestBase::getTestTempDirectory()
return m_test_dir;
char buf[32];
snprintf(buf, sizeof(buf), "%08X", myrand());
porting::mt_snprintf(buf, sizeof(buf), "%08X", myrand());
m_test_dir = fs::TempPath() + DIR_DELIM "mttest_" + buf;
if (!fs::CreateDir(m_test_dir))
@ -335,7 +336,7 @@ std::string TestBase::getTestTempDirectory()
std::string TestBase::getTestTempFile()
{
char buf[32];
snprintf(buf, sizeof(buf), "%08X", myrand());
porting::mt_snprintf(buf, sizeof(buf), "%08X", myrand());
return getTestTempDirectory() + DIR_DELIM + buf + ".tmp";
}

5
src/unittest/test_connection.cpp
View file

@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "test.h"
#include "log.h"
#include "porting.h"
#include "settings.h"
#include "util/serialize.h"
#include "network/connection.h"
@ -280,7 +281,7 @@ void TestConnection::testConnectSendReceive()
if (i % 2 == 0)
infostream << " ";
char buf[10];
snprintf(buf, 10, "%.2X",
porting::mt_snprintf(buf, sizeof(buf), "%.2X",
((int)((const char *)pkt.getU8Ptr(0))[i]) & 0xff);
infostream<<buf;
}
@ -323,7 +324,7 @@ void TestConnection::testConnectSendReceive()
if (i % 2 == 0)
infostream << " ";
char buf[10];
snprintf(buf, 10, "%.2X", ((int)(recvdata[i])) & 0xff);
porting::mt_snprintf(buf, sizeof(buf), "%.2X", ((int)(recvdata[i])) & 0xff);
infostream << buf;
}
if (size > 20)