Merge branch 'master' of https://github.com/open-license-manager/open-licen...

Gabriele Contini

2019-09-07 c536a979f5a213188ac54f5669ddf4b4ff48c218

 src/library/base/StringUtils.cpp

@@ -2,7 +2,7 @@
 * StringUtils.cpp
 *
 *  Created on: Apr 8, 2014
 *      Author: devel
 *      
 */

#include <cctype> //toupper
@@ -11,6 +11,11 @@
#include <string>
#include <cstring>
#include <algorithm>
#include <stdexcept>

#ifdef _WIN32
#include <time.h> //mktime under windows
#endif

namespace license {
using namespace std;
@@ -37,14 +42,14 @@
   int year, month, day;
   tm tm;
   if (strlen(timeString) == 8) {
      int nfield = sscanf(timeString, "%4d%2d%2d", &year, &month, &day);
      const int nfield = sscanf(timeString, "%4d%2d%2d", &year, &month, &day);
      if (nfield != 3) {
         throw invalid_argument("Date not recognized");
      }
   } else if (strlen(timeString) == 10) {
      int nfield = sscanf(timeString, "%4d-%2d-%2d", &year, &month, &day);
      const int nfield = sscanf(timeString, "%4d-%2d-%2d", &year, &month, &day);
      if (nfield != 3) {
         int nfield = sscanf(timeString, "%4d/%2d/%2d", &year, &month, &day);
         const int nfield = sscanf(timeString, "%4d/%2d/%2d", &year, &month, &day);
         if (nfield != 3) {
            throw invalid_argument("Date not recognized");
         }