From 588fcb6ed2785431640b0d0563368e29bf70886c Mon Sep 17 00:00:00 2001
From: lmat <dartme18@gmail.com>
Date: Sat, 23 Dec 2017 13:06:59 -0500
Subject: [PATCH] Transaction getVoidTime uses time64.

---
 libgnucash/engine/Transaction.c                     |  6 +++---
 libgnucash/engine/Transaction.h                     |  4 ++--
 libgnucash/engine/test/test-transaction-voiding.cpp | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libgnucash/engine/Transaction.c b/libgnucash/engine/Transaction.c
index 8f434f9acf..2ff4af4f53 100644
--- a/libgnucash/engine/Transaction.c
+++ b/libgnucash/engine/Transaction.c
@@ -2754,19 +2754,19 @@ xaccTransGetVoidReason(const Transaction *trans)
     return NULL;
 }
 
-Timespec
+time64
 xaccTransGetVoidTime(const Transaction *tr)
 {
     GValue v = G_VALUE_INIT;
     const char *s = NULL;
-    Timespec void_time = {0, 0};
+    time64 void_time = 0;
 
     g_return_val_if_fail(tr, void_time);
     qof_instance_get_kvp (QOF_INSTANCE (tr), &v, 1, void_time_str);
     if (G_VALUE_HOLDS_STRING (&v))
         s = g_value_get_string (&v);
     if (s)
-        return gnc_iso8601_to_timespec_gmt (s);
+        return gnc_iso8601_to_timespec_gmt (s).tv_sec;
     return void_time;
 }
 
diff --git a/libgnucash/engine/Transaction.h b/libgnucash/engine/Transaction.h
index 6c26c0fef7..610463307f 100644
--- a/libgnucash/engine/Transaction.h
+++ b/libgnucash/engine/Transaction.h
@@ -756,10 +756,10 @@ const char *xaccTransGetVoidReason(const Transaction *transaction);
  *
  *  @param tr The transaction in question.
  *
- *  @return A Timespec containing the time that this transaction was
+ *  @return A time64 containing the time that this transaction was
  *  voided. Returns a time of zero upon error.
  */
-Timespec xaccTransGetVoidTime(const Transaction *tr);
+time64 xaccTransGetVoidTime(const Transaction *tr);
 /** @} */
 
 /** @name Transaction Parameter names
diff --git a/libgnucash/engine/test/test-transaction-voiding.cpp b/libgnucash/engine/test/test-transaction-voiding.cpp
index 2e59d74c1b..fcc86e166c 100644
--- a/libgnucash/engine/test/test-transaction-voiding.cpp
+++ b/libgnucash/engine/test/test-transaction-voiding.cpp
@@ -58,7 +58,7 @@ run_test (void)
     Transaction *transaction;
     gnc_numeric old_amt, new_amt, old_val, new_val;
     QofBook *book;
-    Timespec ts;
+    time64 time;
     time64 now;
 
     const char *reason = "because I can";
@@ -97,10 +97,10 @@ run_test (void)
 
     xaccTransVoid(transaction, reason);
 
-    ts = xaccTransGetVoidTime (transaction);
+    time = xaccTransGetVoidTime (transaction);
 
     /* figure at most 2 seconds difference */
-    if ((ts.tv_sec < now) || ((ts.tv_sec - now) > 2))
+    if ((time < now) || ((time - now) > 2))
     {
         failure("bad void time");
     }
@@ -146,10 +146,10 @@ run_test (void)
      */
     xaccTransUnvoid(transaction);
 
-    ts = xaccTransGetVoidTime (transaction);
+    time = xaccTransGetVoidTime (transaction);
 
     /* figure at most 2 seconds difference */
-    if ((ts.tv_sec != 0) || (ts.tv_sec != 0))
+    if ((time != 0))
     {
         failure("void time not zero after restore");
     }
@@ -193,7 +193,7 @@ run_test (void)
     xaccTransSetReadOnly (transaction, "Read-only void test");
     xaccTransVoid(transaction, reason);
 
-    ts = xaccTransGetVoidTime (transaction);
+    time = xaccTransGetVoidTime (transaction);
 
     if (xaccTransGetVoidStatus(transaction))
     {