IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

GncDate: Remove now-superfluous base parameter.

Browse Source
This commit is contained in:
John Ralls 2023-12-08 13:49:28 -08:00
parent 1e289cb2b8
commit 6bc12898a8
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libgnucash/engine/gnc-date.cpp
View File

@ -126,15 +126,14 @@ gnc_localtime_r (const time64 *secs, struct tm* time)
} }
static void static void
normalize_time_component (int *inner, int *outer, int divisor, normalize_time_component (int *inner, int *outer, int divisor)
int base)
{ {
while (*inner < base) while (*inner < 0)
{ {
--(*outer); --(*outer);
*inner += divisor; *inner += divisor;
} }
while (*inner >= divisor + base) while (*inner >= divisor)
{ {
++(*outer); ++(*outer);
*inner -= divisor; *inner -= divisor;
@ -153,15 +152,15 @@ normalize_struct_tm (struct tm* time)
if (year < 1400) year += 1400; if (year < 1400) year += 1400;
if (year > 9999) year %= 10000; if (year > 9999) year %= 10000;
normalize_time_component (&(time->tm_sec), &(time->tm_min), 60, 0); normalize_time_component (&(time->tm_sec), &(time->tm_min), 60);
normalize_time_component (&(time->tm_min), &(time->tm_hour), 60, 0); normalize_time_component (&(time->tm_min), &(time->tm_hour), 60);
normalize_time_component (&(time->tm_hour), &(time->tm_mday), 24, 0); normalize_time_component (&(time->tm_hour), &(time->tm_mday), 24);
normalize_time_component (&(time->tm_mon), &year, 12, 0); normalize_time_component (&(time->tm_mon), &year, 12);
// auto month_in_range = []int (int m){ return (m + 12) % 12; } // auto month_in_range = []int (int m){ return (m + 12) % 12; }
while (time->tm_mday < 1) while (time->tm_mday < 1)
{ {
normalize_time_component (&(--time->tm_mon), &year, 12, 0); normalize_time_component (&(--time->tm_mon), &year, 12);
last_day = gnc_date_get_last_mday (time->tm_mon, year); last_day = gnc_date_get_last_mday (time->tm_mon, year);
time->tm_mday += last_day; time->tm_mday += last_day;
} }
@ -169,7 +168,7 @@ normalize_struct_tm (struct tm* time)
while (time->tm_mday > last_day) while (time->tm_mday > last_day)
{ {
time->tm_mday -= last_day; time->tm_mday -= last_day;
normalize_time_component(&(++time->tm_mon), &year, 12, 0); normalize_time_component(&(++time->tm_mon), &year, 12);
last_day = gnc_date_get_last_mday (time->tm_mon, year); last_day = gnc_date_get_last_mday (time->tm_mon, year);
} }
time->tm_year = year - 1900; time->tm_year = year - 1900;