Changeset 1430

Timestamp:

Dec 17, 2011, 2:48:11 AM (11 years ago)

Author:

Peter Johansson

Message:

remove str2time which was identical to Date(string) constructor

Location:

trunk/lib

Files:

• main_utility.cc (modified) (3 diffs)
• utility.cc (modified) (1 diff)
• utility.h (modified) (1 diff)

trunk/lib/main_utility.cc

@@ -27 +27 @@
 #include "utility.h"
 
+#include "yat/utility.h"
+
 #include <cctype>
 #include <cassert>
@@ -46 +48 @@
       if (verbose)
         std::cout << "Reading configuration file: `" << file << "'\n";
-      try { 
+      try {
         config.load(is);
       }
@@ -70 +72 @@
     typedef SVNlog::container::const_iterator LogIterator;
     for (LogIterator i=log.commits().begin(); i!=log.commits().end(); ++i){
-      time_t sec = str2time(i->date());
-      tm* timeinfo = gmtime(&sec);
+      // grep everything prior first '-'
+      std::string year = i->date().substr(0,i->date().find('-'));
+      using yat::utility::convert;
       // ignore commits in repository not present in wc
-      year2rev[timeinfo->tm_year] = std::min(i->revision(), 
-                                             tree.last_changed_rev());
+      year2rev[convert<int>(year)-1900] = std::min(i->revision(),
+                                                   tree.last_changed_rev());
     }
 

trunk/lib/utility.cc

@@ -343 +343 @@
   }
 
-  time_t str2time(const std::string& str)
-  {
-    //  str in format 2006-09-09T10:55:52.132733Z
-    std::stringstream sstream(str);
-    time_t rawtime;
-    struct tm * timeinfo;
-    time ( &rawtime );
-    timeinfo =  gmtime ( &rawtime );
-
-    unsigned int year, month, day, hour, minute, second;
-    std::string tmp;
-    getline(sstream,tmp,'-');
-    year=atoi(tmp.c_str());
-    timeinfo->tm_year = year - 1900;
-
-    getline(sstream,tmp,'-');
-    month=atoi(tmp.c_str());
-    timeinfo->tm_mon = month - 1;
-
-    getline(sstream,tmp,'T');
-    day=atoi(tmp.c_str());
-    timeinfo->tm_mday = day;
-
-    getline(sstream,tmp,':');
-    hour=atoi(tmp.c_str());
-    timeinfo->tm_hour = hour;
-
-    getline(sstream,tmp,':');
-    minute=atoi(tmp.c_str());
-    timeinfo->tm_min = minute;
-
-    getline(sstream,tmp,'.');
-    second=atoi(tmp.c_str());
-    timeinfo->tm_sec = second;
-
-    return mktime(timeinfo);
-  }
-
 
   std::string match(std::string::const_iterator& first,

trunk/lib/utility.h

@@ -220 +220 @@
   { return std::search(first, last, str.begin(), str.end()); }
 
-  ///
-  ///
-  ///
-  time_t str2time(const std::string&);
-
   /**
      same as sum(3) but using binary(result, *first) rather than