Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[2278] trunk/OpenMPT
|
From: <man...@us...> - 2013-06-01 23:38:39
|
Revision: 2278
http://sourceforge.net/p/modplug/code/2278
Author: manxorist
Date: 2013-06-01 23:38:30 +0000 (Sat, 01 Jun 2013)
Log Message:
-----------
[Ref] Rename mpt_strnicmp to mpt::strnicmp.
Modified Paths:
--------------
trunk/OpenMPT/common/mptString.h
trunk/OpenMPT/mptrack/Modedit.cpp
trunk/OpenMPT/mptrack/Vstplug.cpp
trunk/OpenMPT/soundlib/Load_mid.cpp
trunk/OpenMPT/soundlib/Load_stm.cpp
trunk/OpenMPT/soundlib/Load_xm.cpp
trunk/OpenMPT/soundlib/SampleFormats.cpp
Modified: trunk/OpenMPT/common/mptString.h
===================================================================
--- trunk/OpenMPT/common/mptString.h 2013-06-01 23:10:08 UTC (rev 2277)
+++ trunk/OpenMPT/common/mptString.h 2013-06-01 23:38:30 UTC (rev 2278)
@@ -124,10 +124,7 @@
}
-} // namespace mpt
-
-
-static inline int mpt_strnicmp(const char *a, const char *b, size_t count)
+static inline int strnicmp(const char *a, const char *b, size_t count)
{
#if MPT_COMPILER_MSVC
return _strnicmp(a, b, count);
@@ -137,6 +134,9 @@
}
+} // namespace mpt
+
+
#if MPT_COMPILER_MSVC
#define snprintf _snprintf
#endif
Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp 2013-06-01 23:10:08 UTC (rev 2277)
+++ trunk/OpenMPT/mptrack/Modedit.cpp 2013-06-01 23:38:30 UTC (rev 2278)
@@ -1014,7 +1014,7 @@
UINT susBegin = 0, susEnd = 0, loopBegin = 0, loopEnd = 0, bSus = 0, bLoop = 0, bCarry = 0, nPoints = 0, releaseNode = ENV_RELEASE_NODE_UNSET;
DWORD dwMemSize = GlobalSize(hCpy), dwPos = strlen(pszEnvHdr);
- if ((dwMemSize > dwPos) && (!mpt_strnicmp(p, pszEnvHdr, dwPos - 2)))
+ if ((dwMemSize > dwPos) && (!mpt::strnicmp(p, pszEnvHdr, dwPos - 2)))
{
sscanf(p + dwPos, pszEnvFmt, &nPoints, &susBegin, &susEnd, &loopBegin, &loopEnd, &bSus, &bLoop, &bCarry);
while ((dwPos < dwMemSize) && (p[dwPos] != '\r') && (p[dwPos] != '\n')) dwPos++;
Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp 2013-06-01 23:10:08 UTC (rev 2277)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp 2013-06-01 23:38:30 UTC (rev 2278)
@@ -505,7 +505,7 @@
{
b1 = true;
}
- if (!mpt_strnicmp(p->szLibraryName, mixPlugin.GetLibraryName(), 64))
+ if (!mpt::strnicmp(p->szLibraryName, mixPlugin.GetLibraryName(), 64))
{
b2 = true;
}
@@ -1634,7 +1634,7 @@
TrackerSettings::Instance().SetWorkingDirectory(files.workingDirectory.c_str(), DIR_PLUGINPRESETS, true);
}
- bool bank = !mpt_strnicmp(files.first_file.substr(files.first_file.length() - 3).c_str(), "fxb", 3);
+ bool bank = !mpt::strnicmp(files.first_file.substr(files.first_file.length() - 3).c_str(), "fxb", 3);
std::fstream f;
f.open(files.first_file.c_str(), std::ios::out | std::ios::trunc | std::ios::binary);
Modified: trunk/OpenMPT/soundlib/Load_mid.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mid.cpp 2013-06-01 23:10:08 UTC (rev 2277)
+++ trunk/OpenMPT/soundlib/Load_mid.cpp 2013-06-01 23:38:30 UTC (rev 2278)
@@ -742,7 +742,7 @@
CHAR s[32];
memcpy(s, ptrk->ptracks, k);
s[k] = 0;
- if ((!mpt_strnicmp(s, "Copyri", 6)) || (!s[0])) break;
+ if ((!mpt::strnicmp(s, "Copyri", 6)) || (!s[0])) break;
if (i == 0x03)
{
if (!m_szNames[0][0]) strcpy(m_szNames[0], s);
Modified: trunk/OpenMPT/soundlib/Load_stm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_stm.cpp 2013-06-01 23:10:08 UTC (rev 2277)
+++ trunk/OpenMPT/soundlib/Load_stm.cpp 2013-06-01 23:38:30 UTC (rev 2278)
@@ -123,8 +123,8 @@
if(!file.Read(fileHeader)
|| fileHeader.filetype != 2
|| fileHeader.dosEof != 0x1A
- || (mpt_strnicmp(fileHeader.trackername, "!SCREAM!", 8)
- && mpt_strnicmp(fileHeader.trackername, "BMOD2STM", 8)))
+ || (mpt::strnicmp(fileHeader.trackername, "!SCREAM!", 8)
+ && mpt::strnicmp(fileHeader.trackername, "BMOD2STM", 8)))
{
return false;
} else if(loadFlags == onlyVerifyHeader)
Modified: trunk/OpenMPT/soundlib/Load_xm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_xm.cpp 2013-06-01 23:10:08 UTC (rev 2277)
+++ trunk/OpenMPT/soundlib/Load_xm.cpp 2013-06-01 23:38:30 UTC (rev 2278)
@@ -262,7 +262,7 @@
if(!file.ReadConvertEndianness(fileHeader)
|| fileHeader.channels == 0
|| fileHeader.channels > MAX_BASECHANNELS
- || mpt_strnicmp(fileHeader.signature, "Extended Module: ", 17)
+ || mpt::strnicmp(fileHeader.signature, "Extended Module: ", 17)
|| !file.CanRead(fileHeader.orders))
{
return false;
Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp 2013-06-01 23:10:08 UTC (rev 2277)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp 2013-06-01 23:38:30 UTC (rev 2278)
@@ -2072,7 +2072,7 @@
{
const char *tag = reinterpret_cast<const char *>(metadata->data.vorbis_comment.comments[i].entry);
const FLAC__uint32 length = metadata->data.vorbis_comment.comments[i].length;
- if(length > 6 && !mpt_strnicmp(tag, "TITLE=", 6))
+ if(length > 6 && !mpt::strnicmp(tag, "TITLE=", 6))
{
mpt::String::Read<mpt::String::maybeNullTerminated>(client.sndFile.m_szNames[client.sample], tag + 6, length - 6);
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
