diff options
| author | nOOb3167 <nOOb3167@gmail.com> | 2018-07-22 21:56:06 +0200 |
|---|---|---|
| committer | SmallJoker <SmallJoker@users.noreply.github.com> | 2018-07-22 21:56:06 +0200 |
| commit | 9537cfd3f8264700619f58d15741829489e1099e (patch) | |
| tree | 36412677aba19e1a2037db7fad2f934a2daa5046 /src/unittest | |
| parent | 9855651c06f84f29780cf6b25a392ac841b4630c (diff) | |
| download | minetest-9537cfd3f8264700619f58d15741829489e1099e.tar.gz minetest-9537cfd3f8264700619f58d15741829489e1099e.tar.bz2 minetest-9537cfd3f8264700619f58d15741829489e1099e.zip | |
Add a MSVC / Windows compatible snprintf function (#7353)
Use sizeof where applicable for mt_snprintf
Diffstat (limited to 'src/unittest')
| -rw-r--r-- | src/unittest/test.cpp | 5 | ||||
| -rw-r--r-- | src/unittest/test_connection.cpp | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/unittest/test.cpp b/src/unittest/test.cpp index 547c3fd07..3ac8ffb19 100644 --- a/src/unittest/test.cpp +++ b/src/unittest/test.cpp @@ -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"; } diff --git a/src/unittest/test_connection.cpp b/src/unittest/test_connection.cpp index 8217c403e..c5e4085e1 100644 --- a/src/unittest/test_connection.cpp +++ b/src/unittest/test_connection.cpp @@ -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) |