From 2f89e4595bfa1cb356f9d94273809aa4f8bc5cd2 Mon Sep 17 00:00:00 2001 From: lmat Date: Fri, 1 Dec 2017 16:17:42 -0500 Subject: [PATCH] timespec->time64 for gnc_budget_get_period... --- libgnucash/engine/gnc-budget.c | 19 ++++++------------- libgnucash/engine/gnc-budget.h | 4 ++-- libgnucash/engine/test/utest-Budget.c | 4 ++-- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/libgnucash/engine/gnc-budget.c b/libgnucash/engine/gnc-budget.c index a4a2a21a15..ecd9ca7288 100644 --- a/libgnucash/engine/gnc-budget.c +++ b/libgnucash/engine/gnc-budget.c @@ -591,25 +591,18 @@ gnc_budget_get_account_period_value(const GncBudget *budget, } -Timespec +time64 gnc_budget_get_period_start_date(const GncBudget *budget, guint period_num) { - Timespec ts = {0, 0}; - g_return_val_if_fail (GNC_IS_BUDGET(budget), ts); - timespecFromTime64( - &ts, recurrenceGetPeriodTime(&GET_PRIVATE(budget)->recurrence, - period_num, FALSE)); - return ts; + g_return_val_if_fail (GNC_IS_BUDGET(budget), 0); + return recurrenceGetPeriodTime(&GET_PRIVATE(budget)->recurrence, period_num, FALSE); } -Timespec +time64 gnc_budget_get_period_end_date(const GncBudget *budget, guint period_num) { - Timespec ts = {0, 0}; - g_return_val_if_fail (GNC_IS_BUDGET(budget), ts); - timespecFromTime64( - &ts, recurrenceGetPeriodTime(&GET_PRIVATE(budget)->recurrence, period_num, TRUE)); - return ts; + g_return_val_if_fail (GNC_IS_BUDGET(budget), 0); + return recurrenceGetPeriodTime(&GET_PRIVATE(budget)->recurrence, period_num, TRUE); } gnc_numeric diff --git a/libgnucash/engine/gnc-budget.h b/libgnucash/engine/gnc-budget.h index 35815d06ca..5482758339 100644 --- a/libgnucash/engine/gnc-budget.h +++ b/libgnucash/engine/gnc-budget.h @@ -131,10 +131,10 @@ void gnc_budget_set_recurrence(GncBudget *budget, const Recurrence *r); const Recurrence * gnc_budget_get_recurrence(const GncBudget *budget); /** Get the starting date of the Budget period*/ -Timespec gnc_budget_get_period_start_date(const GncBudget* budget, guint period_num); +time64 gnc_budget_get_period_start_date(const GncBudget* budget, guint period_num); /** Get the ending date of the Budget period*/ -Timespec gnc_budget_get_period_end_date(const GncBudget* budget, guint period_num); +time64 gnc_budget_get_period_end_date(const GncBudget* budget, guint period_num); /* Period indices are zero-based. */ void gnc_budget_set_account_period_value( diff --git a/libgnucash/engine/test/utest-Budget.c b/libgnucash/engine/test/utest-Budget.c index 7509208dfd..fd311d19ce 100644 --- a/libgnucash/engine/test/utest-Budget.c +++ b/libgnucash/engine/test/utest-Budget.c @@ -2533,8 +2533,8 @@ test_gnc_set_budget_recurrence() for (i = 0; i < 12; ++i) { - period_start = timespec_to_gdate(gnc_budget_get_period_start_date(budget, i)); - period_end = timespec_to_gdate(gnc_budget_get_period_end_date(budget, i)); + period_start = time64_to_gdate(gnc_budget_get_period_start_date(budget, i)); + period_end = time64_to_gdate(gnc_budget_get_period_end_date(budget, i)); g_assert_cmpint(g_date_get_day(&period_start), ==, 1); g_assert_cmpint(g_date_get_day(&period_end), ==, period_info[i].end_day);