From: Yehuda Sadeh <yehuda@inktank.com>
Date: Fri, 19 Jul 2013 04:50:51 +0000 (-0700)
Subject: rgw: fix time parsing in replica log
X-Git-Tag: v0.67-rc1~16^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0024e5aa2240c37da11488264d03b52dbe8b9cab;p=ceph.git

rgw: fix time parsing in replica log

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/rgw/rgw_rest_replica_log.cc b/src/rgw/rgw_rest_replica_log.cc
index 863a979a22e4..600a8edb78c5 100644
--- a/src/rgw/rgw_rest_replica_log.cc
+++ b/src/rgw/rgw_rest_replica_log.cc
@@ -27,13 +27,13 @@
 #define REPLICA_INPUT_MAX_LEN (512*1024)
 
 static int parse_to_utime(string& in, utime_t& out) {
-  struct tm tm;
-  
-  if (!parse_iso8601(in.c_str(), &tm)) 
-    return -EINVAL;
+  uint64_t sec = 0;
+  uint64_t nsec = 0;
+  int ret = utime_t::parse_date(in.c_str(), &sec, &nsec);
+  if (ret < 0)
+    return ret;
 
-  time_t tt = mktime(&tm);
-  out = utime_t(tt, 0);
+  out = utime_t(sec, nsec);
   return 0;
 }