You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2017/04/26 01:28:23 UTC

incubator-mynewt-core git commit: MYNEWT-696 NMP datetime: always put usecs in rsp.

Repository: incubator-mynewt-core
Updated Branches:
  refs/heads/master 5ec317d45 -> 6ac1b82ef


MYNEWT-696 NMP datetime: always put usecs in rsp.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/6ac1b82e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/6ac1b82e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/6ac1b82e

Branch: refs/heads/master
Commit: 6ac1b82ef24fc45adb742e4fa872204faa4ea410
Parents: 5ec317d
Author: Christopher Collins <cc...@apache.org>
Authored: Tue Apr 25 18:27:52 2017 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Tue Apr 25 18:27:52 2017 -0700

----------------------------------------------------------------------
 time/datetime/src/datetime.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/6ac1b82e/time/datetime/src/datetime.c
----------------------------------------------------------------------
diff --git a/time/datetime/src/datetime.c b/time/datetime/src/datetime.c
index 229866a..31a3641 100644
--- a/time/datetime/src/datetime.c
+++ b/time/datetime/src/datetime.c
@@ -379,23 +379,14 @@ datetime_format(const struct os_timeval *tv, const struct os_timezone *tz,
     cp = ostr;
     rlen = olen;
 
-    rc = snprintf(cp, rlen, "%04d-%02d-%02dT%02d:%02d:%02d",
-        ct.year, ct.mon, ct.day, ct.hour, ct.min, ct.sec);
+    rc = snprintf(cp, rlen, "%04d-%02d-%02dT%02d:%02d:%02d.%06d",
+        ct.year, ct.mon, ct.day, ct.hour, ct.min, ct.sec, ct.usec);
     cp += rc;
     rlen -= rc;
     if (rc < 0 || rlen <= 0) {
         goto err;
     }
 
-    if (ct.usec != 0) {
-        rc = snprintf(cp, rlen, ".%06d", ct.usec);
-        cp += rc;
-        rlen -= rc;
-        if (rc < 0 || rlen <= 0) {
-            goto err;
-        }
-    }
-
     if (tz != NULL) {
         minswest = tz->tz_minuteswest;
         if (tz->tz_dsttime) {