Security-177.tar.gz

[apple/security.git] / cdsa / cdsa_utilities / timeflow.cpp

diff --git a/cdsa/cdsa_utilities/timeflow.cpp b/cdsa/cdsa_utilities/timeflow.cpp
index 9814ce48b5d9308fd0f8f8a63602fba57295ea40..88566798e296c6a354f5867456ce9f84ea49e624 100644 (file)
--- a/cdsa/cdsa_utilities/timeflow.cpp
+++ b/cdsa/cdsa_utilities/timeflow.cpp
@@ -45,6 +45,9 @@ Absolute now()
 Absolute::Absolute(const struct timeval &tv)
 { mValue = tv.tv_sec + double(tv.tv_usec) / 1E6; }
 
 Absolute::Absolute(const struct timeval &tv)
 { mValue = tv.tv_sec + double(tv.tv_usec) / 1E6; }
 

+Absolute::Absolute(const struct timespec &tv)
+{ mValue = tv.tv_sec + double(tv.tv_nsec) / 1E9; }
+

 Absolute::operator struct timeval () const
 {
     struct timeval tv;
 Absolute::operator struct timeval () const
 {
     struct timeval tv;


@@ -54,11 +57,25 @@ Absolute::operator struct timeval () const
     } else {
         tv.tv_sec = int32_t(mValue);
         double intPart;
     } else {
         tv.tv_sec = int32_t(mValue);
         double intPart;

-        tv.tv_usec = int32_t(modf(mValue, &intPart));
+        tv.tv_usec = int32_t(modf(mValue, &intPart) * 1E6);

     }
     return tv;
 }
 
     }
     return tv;
 }
 

+Absolute::operator struct timespec () const
+{
+    struct timespec ts;
+    if (mValue > LONG_MAX) {
+        ts.tv_sec = LONG_MAX;
+        ts.tv_nsec = 0;
+    } else {
+        ts.tv_sec = time_t(mValue);
+        double intPart;
+        ts.tv_nsec = int32_t(modf(mValue, &intPart) * 1E9);
+    }
+    return ts;
+}
+

 struct timeval Interval::timevalInterval() const
 {
     struct timeval tv;
 struct timeval Interval::timevalInterval() const
 {
     struct timeval tv;


@@ -70,7 +87,7 @@ struct timeval Interval::timevalInterval() const
     } else {
         tv.tv_sec = int32_t(mValue);
         double intPart;
     } else {
         tv.tv_sec = int32_t(mValue);
         double intPart;

-        tv.tv_usec = int32_t(modf(mValue, &intPart));
+        tv.tv_usec = int32_t(modf(mValue, &intPart) * 1E6);

     }
     return tv;
 }
     }
     return tv;
 }