Removed seed_rand() function. Seeding will now be done automatically, if needed.

[mutilities/MUtilities.git] / src / Version.cpp

diff --git a/src/Version.cpp b/src/Version.cpp
index 2544bd7..739233f 100644 (file)
--- a/src/Version.cpp
+++ b/src/Version.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // MuldeR's Utilities for Qt
-// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2016 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
@@ -19,19 +19,15 @@
 // http://www.gnu.org/licenses/lgpl-2.1.txt
 //////////////////////////////////////////////////////////////////////////////////
 
-#define MUTILS_INC_CONFIG 1
-
+//MUtils
 #include <MUtils/Version.h>
-
-//Internal
 #include <MUtils/Global.h>
 #include <MUtils/Exception.h>
 #include <MUtils/OSSupport.h>
-#include "Config.h"
 
-#ifdef _MSC_VER
-#define _snscanf(X, Y, Z, ...) _snscanf_s((X), (Y), (Z), __VA_ARGS__)
-#endif
+//Internal
+#define MUTILS_INC_CONFIG 1
+#include "Config.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // HELPER FUNCTIONS
@@ -39,13 +35,13 @@
 
 static const char *g_months_lut[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
 
-static int month2int(const char *str)
+static int month_str2int(const char *str)
 {
        int ret = 0;
 
        for(int j = 0; j < 12; j++)
        {
-               if(!_strcmpi(str, g_months_lut[j]))
+               if(!_strnicmp(str, g_months_lut[j], 3))
                {
                        ret = j+1;
                        break;
@@ -55,36 +51,29 @@ static int month2int(const char *str)
        return ret;
 }
 
-static const QDate decode_date_str(const char *const date_str)
+static const QDate decode_date_str(const char *const date_str) //Mmm dd yyyy
 {
-       bool ok = true;
        int date[3] = {0, 0, 0};
-       char month_s[4];
 
-       ok = ok && (_snscanf(&date_str[0x0], 3, "%s", &month_s) == 1);
-       ok = ok && ((date[1] = month2int(month_s)) > 0);
-       ok = ok && (_snscanf(&date_str[0x4], 2, "%d", &date[2]) == 1);
-       ok = ok && (_snscanf(&date_str[0x7], 4, "%d", &date[0]) == 1);
+       if(sscanf_s(date_str, "%*3s %2d %4d", &date[2], &date[0]) != 2)
+       {
+               MUTILS_THROW("Internal error: Date format could not be recognized!");
+       }
 
-       if(!ok)
+       if((date[1] = month_str2int(date_str)) < 1)
        {
                MUTILS_THROW("Internal error: Date format could not be recognized!");
        }
-       
+
        //qWarning("MUtils::Version::build_date: y=%d, m=%d, d=%d", date[0], date[1], date[2]);
        return QDate(date[0], date[1], date[2]);
 }
 
-static const QTime decode_time_str(const char *const time_str)
+static const QTime decode_time_str(const char *const time_str) //hh:mm:ss
 {
-       bool ok = true;
        int time[3] = {0, 0, 0};
 
-       ok = ok && (_snscanf(&time_str[0x0], 2, "%d", &time[0]) == 1);
-       ok = ok && (_snscanf(&time_str[0x3], 2, "%d", &time[1]) == 1);
-       ok = ok && (_snscanf(&time_str[0x6], 2, "%d", &time[2]) == 1);
-
-       if(!ok)
+       if(sscanf_s(time_str, "%2d:%2d:%2d", &time[0], &time[1], &time[2]) != 3)
        {
                MUTILS_THROW("Internal error: Time format could not be recognized!");
        }