///////////////////////////////////////////////////////////////////////////////
// MuldeR's Utilities for Qt
-// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2018 LoRd_MuldeR <MuldeR2@GMX.de>
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//MUtils
#include <MUtils/Global.h>
#include <MUtils/OSSupport.h>
+#include <MUtils/Version.h>
//Internal
#include "DirLocker.h"
#include <QReadWriteLock>
#include <QProcess>
#include <QTextCodec>
+#include <QPair>
+#include <QListIterator>
+#include <QMutex>
+#include <QThreadStorage>
//CRT
#include <cstdlib>
#include <process.h>
//VLD
+#ifdef _MSC_VER
#include <vld.h>
+#endif
///////////////////////////////////////////////////////////////////////////////
// Random Support
///////////////////////////////////////////////////////////////////////////////
+#ifndef _CRT_RAND_S
+#define rand_s(X) (true)
+#endif
+
+//Per-thread init flag
+static QThreadStorage<bool> g_srand_flag;
+
+//32-Bit wrapper for qrand()
+#define QRAND() ((static_cast<quint32>(qrand()) & 0xFFFF) | (static_cast<quint32>(qrand()) << 16U))
+
//Robert Jenkins' 96 bit Mix Function
-static unsigned int mix_function(const unsigned int x, const unsigned int y, const unsigned int z)
+static quint32 mix_function(quint32 a, quint32 b, quint32 c)
{
- unsigned int a = x;
- unsigned int b = y;
- unsigned int c = z;
-
a=a-b; a=a-c; a=a^(c >> 13);
- b=b-c; b=b-a; b=b^(a << 8 );
+ b=b-c; b=b-a; b=b^(a << 8);
c=c-a; c=c-b; c=c^(b >> 13);
a=a-b; a=a-c; a=a^(c >> 12);
b=b-c; b=b-a; b=b^(a << 16);
- c=c-a; c=c-b; c=c^(b >> 5 );
- a=a-b; a=a-c; a=a^(c >> 3 );
+ c=c-a; c=c-b; c=c^(b >> 5);
+ a=a-b; a=a-c; a=a^(c >> 3);
b=b-c; b=b-a; b=b^(a << 10);
c=c-a; c=c-b; c=c^(b >> 15);
return a ^ b ^ c;
}
-void MUtils::seed_rand(void)
+static void seed_rand(void)
{
- qsrand(mix_function(clock(), time(NULL), _getpid()));
+ QDateTime build(MUtils::Version::lib_build_date(), MUtils::Version::lib_build_time());
+ const quint32 seed_0 = mix_function(MUtils::OS::process_id(), MUtils::OS::thread_id(), build.toMSecsSinceEpoch());
+ qsrand(mix_function(clock(), time(NULL), seed_0));
}
-quint32 MUtils::next_rand32(void)
+static quint32 rand_fallback(void)
{
- quint32 rnd = 0xDEADBEEF;
+ Q_ASSERT(RAND_MAX >= 0x7FFF);
-#ifdef _CRT_RAND_S
- if(rand_s(&rnd) == 0)
+ if (!(g_srand_flag.hasLocalData() && g_srand_flag.localData()))
{
- return rnd;
+ seed_rand();
+ g_srand_flag.setLocalData(true);
}
-#endif //_CRT_RAND_S
- for(size_t i = 0; i < sizeof(quint32); i++)
+ quint32 rnd_val = mix_function(0x32288EA3, clock(), time(NULL));
+
+ for (size_t i = 0; i < 42; i++)
{
- rnd = (rnd << 8) ^ qrand();
+ rnd_val = mix_function(rnd_val, QRAND(), QRAND());
+ rnd_val = mix_function(QRAND(), rnd_val, QRAND());
+ rnd_val = mix_function(QRAND(), QRAND(), rnd_val);
}
+ return rnd_val;
+}
+
+quint32 MUtils::next_rand_u32(void)
+{
+ quint32 rnd;
+ if (rand_s(&rnd))
+ {
+ return rand_fallback();
+ }
return rnd;
}
-quint64 MUtils::next_rand64(void)
+quint64 MUtils::next_rand_u64(void)
+{
+ return (quint64(next_rand_u32()) << 32) | quint64(next_rand_u32());
+}
+
+QString MUtils::next_rand_str(const bool &bLong)
{
- return (quint64(next_rand32()) << 32) | quint64(next_rand32());
+ if (bLong)
+ {
+ return next_rand_str(false) + next_rand_str(false);
+ }
+ else
+ {
+ return QString::number(next_rand_u64(), 16).rightJustified(16, QLatin1Char('0'));
+ }
}
-QString MUtils::rand_str(const bool &bLong)
+///////////////////////////////////////////////////////////////////////////////
+// STRING UTILITY FUNCTIONS
+///////////////////////////////////////////////////////////////////////////////
+
+static QScopedPointer<QRegExp> g_str_trim_rx_r;
+static QScopedPointer<QRegExp> g_str_trim_rx_l;
+static QMutex g_str_trim_lock;
+
+static QString& trim_helper(QString &str, QScopedPointer<QRegExp> ®ex, const char *const pattern)
{
- if(!bLong)
+ QMutexLocker lock(&g_str_trim_lock);
+ if (regex.isNull())
{
- return QString::number(next_rand64(), 16).rightJustified(16, QLatin1Char('0'));
+ regex.reset(new QRegExp(QLatin1String(pattern)));
}
- return QString("%1%2").arg(rand_str(false), rand_str(false));
+ str.remove(*regex.data());
+ return str;
+}
+
+QString& MUtils::trim_right(QString &str)
+{
+ static const char *const TRIM_RIGHT = "\\s+$";
+ return trim_helper(str, g_str_trim_rx_r, TRIM_RIGHT);
+}
+
+QString& MUtils::trim_left(QString &str)
+{
+ static const char *const TRIM_LEFT = "^\\s+";
+ return trim_helper(str, g_str_trim_rx_l, TRIM_LEFT);
+}
+
+QString MUtils::trim_right(const QString &str)
+{
+ QString temp(str);
+ return trim_right(temp);
+}
+
+QString MUtils::trim_left(const QString &str)
+{
+ QString temp(str);
+ return trim_left(temp);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// GENERATE FILE NAME
+///////////////////////////////////////////////////////////////////////////////
+
+QString MUtils::make_temp_file(const QString &basePath, const QString &extension, const bool placeholder)
+{
+ for(int i = 0; i < 4096; i++)
+ {
+ const QString tempFileName = QString("%1/%2.%3").arg(basePath, next_rand_str(), extension);
+ if(!QFileInfo(tempFileName).exists())
+ {
+ if(placeholder)
+ {
+ QFile file(tempFileName);
+ if(file.open(QFile::ReadWrite))
+ {
+ file.close();
+ return tempFileName;
+ }
+ }
+ else
+ {
+ return tempFileName;
+ }
+ }
+ }
+
+ qWarning("Failed to generate temp file name!");
+ return QString();
+}
+
+QString MUtils::make_unique_file(const QString &basePath, const QString &baseName, const QString &extension, const bool fancy)
+{
+ quint32 n = fancy ? 2 : 0;
+ QString fileName = fancy ? QString("%1/%2.%3").arg(basePath, baseName, extension) : QString();
+ while (fileName.isEmpty() || QFileInfo(fileName).exists())
+ {
+ if (n <= quint32(USHRT_MAX))
+ {
+ if (fancy)
+ {
+ fileName = QString("%1/%2 (%3).%4").arg(basePath, baseName, QString::number(n++), extension);
+ }
+ else
+ {
+ fileName = QString("%1/%2.%3.%4").arg(basePath, baseName, QString::number(n++, 16).rightJustified(4, QLatin1Char('0')), extension);
+ }
+ }
+ else
+ {
+ qWarning("Failed to generate unique file name!");
+ return QString();
+ }
+ }
+ return fileName;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// COMPUTE PARITY
+///////////////////////////////////////////////////////////////////////////////
+
+/*
+ * Compute parity in parallel
+ * http://www.graphics.stanford.edu/~seander/bithacks.html#ParityParallel
+ */
+bool MUtils::parity(quint32 value)
+{
+ value ^= value >> 16;
+ value ^= value >> 8;
+ value ^= value >> 4;
+ value &= 0xf;
+ return ((0x6996 >> value) & 1) != 0;
}
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
static QScopedPointer<MUtils::Internal::DirLock> g_temp_folder_file;
-static QReadWriteLock g_temp_folder_lock;
+static QReadWriteLock g_temp_folder_lock;
static QString try_create_subfolder(const QString &baseDir, const QString &postfix)
{
static MUtils::Internal::DirLock *try_init_temp_folder(const QString &baseDir)
{
- const QString tempPath = try_create_subfolder(baseDir, MUtils::rand_str());
+ const QString tempPath = try_create_subfolder(baseDir, MUtils::next_rand_str());
if(!tempPath.isEmpty())
{
for(int i = 0; i < 32; i++)
return NULL;
}
+static bool temp_folder_cleanup_helper(const QString &tempPath)
+{
+ size_t delay = 1;
+ static const size_t MAX_DELAY = 8192;
+ forever
+ {
+ QDir::setCurrent(QDir::rootPath());
+ if(MUtils::remove_directory(tempPath, true))
+ {
+ return true;
+ }
+ else
+ {
+ if(delay > MAX_DELAY)
+ {
+ return false;
+ }
+ MUtils::OS::sleep_ms(delay);
+ delay *= 2;
+ }
+ }
+}
+
+static void temp_folder_cleaup(void)
+{
+ QWriteLocker writeLock(&g_temp_folder_lock);
+
+ //Clean the directory
+ while(!g_temp_folder_file.isNull())
+ {
+ const QString tempPath = g_temp_folder_file->getPath();
+ g_temp_folder_file.reset(NULL);
+ if(!temp_folder_cleanup_helper(tempPath))
+ {
+ MUtils::OS::system_message_wrn(L"Temp Cleaner", L"Warning: Not all temporary files could be removed!");
+ }
+ }
+}
+
const QString &MUtils::temp_folder(void)
{
QReadLocker readLock(&g_temp_folder_lock);
//Already initialized?
if(!g_temp_folder_file.isNull())
{
- return g_temp_folder_file->path();
+ return g_temp_folder_file->getPath();
}
//Obtain the write lock to initilaize
//Still uninitilaized?
if(!g_temp_folder_file.isNull())
{
- return g_temp_folder_file->path();
+ return g_temp_folder_file->getPath();
}
//Try the %TMP% or %TEMP% directory first
if(MUtils::Internal::DirLock *lockFile = try_init_temp_folder(QDir::tempPath()))
{
g_temp_folder_file.reset(lockFile);
- return lockFile->path();
+ atexit(temp_folder_cleaup);
+ return lockFile->getPath();
}
qWarning("%%TEMP%% directory not found -> trying fallback mode now!");
if(MUtils::Internal::DirLock *lockFile = try_init_temp_folder(tempRoot))
{
g_temp_folder_file.reset(lockFile);
- return lockFile->path();
+ atexit(temp_folder_cleaup);
+ return lockFile->getPath();
}
}
}
// REMOVE DIRECTORY / FILE
///////////////////////////////////////////////////////////////////////////////
+static const QFile::Permissions FILE_PERMISSIONS_NONE = QFile::ReadOther | QFile::WriteOther;
+
bool MUtils::remove_file(const QString &fileName)
{
QFileInfo fileInfo(fileName);
for(int i = 0; i < 32; i++)
{
QFile file(fileName);
- file.setPermissions(QFile::ReadOther | QFile::WriteOther);
- if(file.remove())
+ file.setPermissions(FILE_PERMISSIONS_NONE);
+ if((!(fileInfo.exists() && fileInfo.isFile())) || file.remove())
{
return true;
}
+ MUtils::OS::sleep_ms(1);
+ fileInfo.refresh();
}
qWarning("Could not delete \"%s\"", MUTILS_UTF8(fileName));
return false;
}
-bool MUtils::remove_directory(const QString &folderPath)
+static bool remove_directory_helper(const QDir &folder)
{
- QDir folder(folderPath);
if(!folder.exists())
{
return true;
}
-
- const QFileInfoList entryList = folder.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::Hidden);
- for(int i = 0; i < entryList.count(); i++)
+ const QString dirName = folder.dirName();
+ if(!dirName.isEmpty())
{
- if(entryList.at(i).isDir())
+ QDir parent(folder);
+ if(parent.cdUp())
{
- remove_directory(entryList.at(i).canonicalFilePath());
+ QFile::setPermissions(folder.absolutePath(), FILE_PERMISSIONS_NONE);
+ if(parent.rmdir(dirName))
+ {
+ return true;
+ }
}
- else
+ }
+ return false;
+}
+
+bool MUtils::remove_directory(const QString &folderPath, const bool &recursive)
+{
+ QDir folder(folderPath);
+ if(!folder.exists())
+ {
+ return true;
+ }
+
+ if(recursive)
+ {
+ const QFileInfoList entryList = folder.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::Hidden);
+ for(QFileInfoList::ConstIterator iter = entryList.constBegin(); iter != entryList.constEnd(); iter++)
{
- remove_file(entryList.at(i).canonicalFilePath());
+ if(iter->isDir())
+ {
+ remove_directory(iter->canonicalFilePath(), true);
+ }
+ else if(iter->isFile())
+ {
+ remove_file(iter->canonicalFilePath());
+ }
}
}
for(int i = 0; i < 32; i++)
{
- if(folder.rmdir("."))
+ if(remove_directory_helper(folder))
{
return true;
}
+ MUtils::OS::sleep_ms(1);
+ folder.refresh();
}
qWarning("Could not rmdir \"%s\"", MUTILS_UTF8(folderPath));
// PROCESS UTILS
///////////////////////////////////////////////////////////////////////////////
-void MUtils::init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir)
+static void prependToPath(QProcessEnvironment &env, const QString &value)
+{
+ const QLatin1String PATH = QLatin1String("PATH");
+ const QString path = env.value(PATH, QString()).trimmed();
+ env.insert(PATH, path.isEmpty() ? value : QString("%1;%2").arg(value, path));
+}
+
+void MUtils::init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir, const QStringList *const extraPaths)
{
//Environment variable names
static const char *const s_envvar_names_temp[] =
}
//Setup PATH variable
- const QString path = env.value("PATH", QString()).trimmed();
- env.insert("PATH", path.isEmpty() ? tempDir : QString("%1;%2").arg(tempDir, path));
+ prependToPath(env, tempDir);
+ if (extraPaths && (!extraPaths->isEmpty()))
+ {
+ QListIterator<QString> iter(*extraPaths);
+ iter.toBack();
+ while (iter.hasPrevious())
+ {
+ prependToPath(env, QDir::toNativeSeparators(iter.previous()));
+ }
+ }
//Setup QPorcess object
process.setWorkingDirectory(wokringDir);
// CLEAN FILE PATH
///////////////////////////////////////////////////////////////////////////////
-static const struct
+static QMutex g_clean_file_name_mutex;
+static QScopedPointer<const QList<QPair<QRegExp,QString>>> g_clean_file_name_regex;
+
+static void clean_file_name_make_pretty(QString &str)
{
- const char *const search;
- const char *const replace;
+ static const struct { const char *p; const char *r; } PATTERN[] =
+ {
+ { "^\\s*\"([^\"]*)\"\\s*$", "\\1" }, //Remove straight double quotes around the whole string
+ { "\"([^\"]*)\"", "\xE2\x80\x9C\\1\xE2\x80\x9D" }, //Replace remaining pairs of straight double quotes with opening/closing double quote
+ { "^[\\\\/:]+([^\\\\/:]+.*)$", "\\1" }, //Remove leading slash, backslash and colon characters
+ { "^(.*[^\\\\/:]+)[\\\\/:]+$", "\\1" }, //Remove trailing slash, backslash and colon characters
+ { "(\\s*[\\\\/:]\\s*)+", " - " }, //Replace any slash, backslash or colon character that appears in the middle
+ { NULL, NULL }
+ };
+
+ QMutexLocker locker(&g_clean_file_name_mutex);
+
+ if (g_clean_file_name_regex.isNull())
+ {
+ QScopedPointer<QList<QPair<QRegExp, QString>>> list(new QList<QPair<QRegExp, QString>>());
+ for (size_t i = 0; PATTERN[i].p; ++i)
+ {
+ list->append(qMakePair(QRegExp(QString::fromUtf8(PATTERN[i].p), Qt::CaseInsensitive), PATTERN[i].r ? QString::fromUtf8(PATTERN[i].r) : QString()));
+ }
+ g_clean_file_name_regex.reset(list.take());
+ }
+
+ bool keepOnGoing = !str.isEmpty();
+ while(keepOnGoing)
+ {
+ const QString prev = str;
+ keepOnGoing = false;
+ for (QList<QPair<QRegExp, QString>>::ConstIterator iter = g_clean_file_name_regex->constBegin(); iter != g_clean_file_name_regex->constEnd(); ++iter)
+ {
+ str.replace(iter->first, iter->second);
+ if (str.compare(prev))
+ {
+ str = str.simplified();
+ keepOnGoing = !str.isEmpty();
+ break;
+ }
+ }
+ }
}
-CLEAN_FILE_NAME[] =
-{
- { "\\", "-" },
- { " / ", ", " },
- { "/", "," },
- { ":", "-" },
- { "*", "x" },
- { "?", "!" },
- { "<", "[" },
- { ">", "]" },
- { "|", "!" },
- { "\"", "'" },
- { NULL, NULL }
-};
-QString MUtils::clean_file_name(const QString &name)
+QString MUtils::clean_file_name(const QString &name, const bool &pretty)
{
- QString str = name.simplified();
+ static const QLatin1Char REPLACEMENT_CHAR('_');
+ static const char FILENAME_ILLEGAL_CHARS[] = "<>:\"/\\|?*";
+ static const char *const FILENAME_RESERVED_NAMES[] =
+ {
+ "CON", "PRN", "AUX", "NUL",
+ "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9",
+ "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9", NULL
+ };
- for(size_t i = 0; CLEAN_FILE_NAME[i].search; i++)
+ QString result(name);
+ if (pretty)
{
- str.replace(CLEAN_FILE_NAME[i].search, CLEAN_FILE_NAME[i].replace);
+ clean_file_name_make_pretty(result);
+ }
+
+ for(QString::Iterator iter = result.begin(); iter != result.end(); iter++)
+ {
+ if (iter->category() == QChar::Other_Control)
+ {
+ *iter = REPLACEMENT_CHAR;
+ }
+ }
+
+ for(size_t i = 0; FILENAME_ILLEGAL_CHARS[i]; i++)
+ {
+ result.replace(QLatin1Char(FILENAME_ILLEGAL_CHARS[i]), REPLACEMENT_CHAR);
}
- QRegExp regExp("\"(.+)\"");
- regExp.setMinimal(true);
- str.replace(regExp, "`\\1ยด");
-
- return str.simplified();
+ trim_right(result);
+ while (result.endsWith(QLatin1Char('.')))
+ {
+ result.chop(1);
+ trim_right(result);
+ }
+
+ for (size_t i = 0; FILENAME_RESERVED_NAMES[i]; i++)
+ {
+ const QString reserved = QString::fromLatin1(FILENAME_RESERVED_NAMES[i]);
+ if ((!result.compare(reserved, Qt::CaseInsensitive)) || result.startsWith(reserved + QLatin1Char('.'), Qt::CaseInsensitive))
+ {
+ result.replace(0, reserved.length(), QString().leftJustified(reserved.length(), REPLACEMENT_CHAR));
+ }
+ }
+
+ return result;
+}
+
+static QPair<QString,QString> clean_file_path_get_prefix(const QString path)
+{
+ static const char *const PREFIXES[] =
+ {
+ "//?/", "//", "/", NULL
+ };
+ const QString posixPath = QDir::fromNativeSeparators(path.trimmed());
+ for (int i = 0; PREFIXES[i]; i++)
+ {
+ const QString prefix = QString::fromLatin1(PREFIXES[i]);
+ if (posixPath.startsWith(prefix))
+ {
+ return qMakePair(prefix, posixPath.mid(prefix.length()));
+ }
+ }
+ return qMakePair(QString(), posixPath);
}
-QString MUtils::clean_file_path(const QString &path)
+QString MUtils::clean_file_path(const QString &path, const bool &pretty)
{
- QStringList parts = path.simplified().replace("\\", "/").split("/", QString::SkipEmptyParts);
+ const QPair<QString, QString> prefix = clean_file_path_get_prefix(path);
+ QStringList parts = prefix.second.split(QLatin1Char('/'), QString::SkipEmptyParts);
for(int i = 0; i < parts.count(); i++)
{
- parts[i] = MUtils::clean_file_name(parts[i]);
+ if((i == 0) && (parts[i].length() == 2) && parts[i][0].isLetter() && (parts[i][1] == QLatin1Char(':')))
+ {
+ continue; //handle case "c:\"
+ }
+ parts[i] = MUtils::clean_file_name(parts[i], pretty);
}
- return parts.join("/");
+ const QString cleanPath = parts.join(QLatin1String("/"));
+ return prefix.first.isEmpty() ? cleanPath : prefix.first + cleanPath;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// REGULAR EXPESSION HELPER
+///////////////////////////////////////////////////////////////////////////////
+
+bool MUtils::regexp_parse_uint32(const QRegExp ®exp, quint32 &value)
+{
+ return regexp_parse_uint32(regexp, &value, 1U, 1U);
+}
+
+bool MUtils::regexp_parse_int32(const QRegExp ®exp, qint32 &value)
+{
+ return regexp_parse_int32(regexp, &value, 1U, 1U);
+}
+
+bool MUtils::regexp_parse_uint32(const QRegExp ®exp, quint32 &value, const size_t &offset)
+{
+ return regexp_parse_uint32(regexp, &value, offset, 1U);
+}
+
+bool MUtils::regexp_parse_int32(const QRegExp ®exp, qint32 &value, const size_t &offset)
+{
+ return regexp_parse_int32(regexp, &value, offset, 1U);
+}
+
+bool MUtils::regexp_parse_uint32(const QRegExp ®exp, quint32 *values, const size_t &count)
+{
+ return regexp_parse_uint32(regexp, values, 1U, count);
+}
+
+bool MUtils::regexp_parse_int32(const QRegExp ®exp, qint32 *values, const size_t &count)
+{
+ return regexp_parse_int32(regexp, values, 1U, count);
+}
+
+bool MUtils::regexp_parse_uint32(const QRegExp ®exp, quint32 *values, const size_t &offset, const size_t &count)
+{
+ const QStringList caps = regexp.capturedTexts();
+
+ if (caps.isEmpty() || (quint32(caps.count()) <= count))
+ {
+ return false;
+ }
+
+ for (size_t i = 0; i < count; i++)
+ {
+ bool ok = false;
+ values[i] = caps[offset+i].toUInt(&ok);
+ if (!ok)
+ {
+ return false;
+ }
+ }
+
+ return true;
+}
+
+bool MUtils::regexp_parse_int32(const QRegExp ®exp, qint32 *values, const size_t &offset, const size_t &count)
+{
+ const QStringList caps = regexp.capturedTexts();
+
+ if (caps.isEmpty() || (quint32(caps.count()) <= count))
+ {
+ return false;
+ }
+
+ for (size_t i = 0; i < count; i++)
+ {
+ bool ok = false;
+ values[i] = caps[offset+i].toInt(&ok);
+ if (!ok)
+ {
+ return false;
+ }
+ }
+
+ return true;
}
///////////////////////////////////////////////////////////////////////////////
}
///////////////////////////////////////////////////////////////////////////////
+// FP MATH SUPPORT
+///////////////////////////////////////////////////////////////////////////////
+
+MUtils::fp_parts_t MUtils::break_fp(const double value)
+{
+ fp_parts_t result;
+ result.fractpart = modf(value, &result.intpart);
+ return result;
+}
+
+///////////////////////////////////////////////////////////////////////////////
// SELF-TEST
///////////////////////////////////////////////////////////////////////////////
int MUtils::Internal::selfTest(const char *const buildKey, const bool debug)
{
static const bool MY_DEBUG_FLAG = MUTILS_DEBUG;
- static const char *const MY_BUILD_KEY = __DATE__"@"__TIME__;
+ static const char *const MY_BUILD_KEY = __DATE__ "@" __TIME__;
- if(strncmp(buildKey, MY_BUILD_KEY, 14) || (MY_DEBUG_FLAG != debug))
+ if(strncmp(buildKey, MY_BUILD_KEY, 13) || (MY_DEBUG_FLAG != debug))
{
MUtils::OS::system_message_err(L"MUtils", L"FATAL ERROR: MUtils library version mismatch detected!");
- MUtils::OS::system_message_wrn(L"MUtils", L"Please re-build the complete solution in order to fix this issue!");
+ MUtils::OS::system_message_wrn(L"MUtils", L"Perform a clean(!) re-install of the application to fix the problem!");
abort();
}
return 0;