mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use a 64-bit 'timestamp_t' for all timestamps, rather than 'time_t'

Browse source 
This makes the time type unambiguous, and we can use G_TYPE_INT64 for it
in the divelist too.

It also implements a portable (and thread-safe) "utc_mkdate()" function
that acts kind of like gmtime_r(), but using the 64-bit timestamp_t.  It
matches our original "utc_mktime()".

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2012-09-19 17:35:52 -07:00
parent d14932058f
commit dce08deb34
10 changed files with 195 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

28
statistics.c
View file

@ -364,7 +364,7 @@ static void process_all_dives(struct dive *dive, struct dive **prev_dive)
{
int idx;
struct dive *dp;
struct tm *tm;
struct tm tm;
int current_year = 0;
int current_month = 0;
int year_iter = 0;
@ -408,12 +408,12 @@ static void process_all_dives(struct dive *dive, struct dive **prev_dive)
process_dive(dp, &stats);
/* yearly statistics */
tm = gmtime(&dp->when);
utc_mkdate(dp->when, &tm);
if (current_year == 0)
current_year = tm->tm_year + 1900;
current_year = tm.tm_year + 1900;
if (current_year != tm->tm_year + 1900) {
current_year = tm->tm_year + 1900;
if (current_year != tm.tm_year) {
current_year = tm.tm_year + 1900;
process_dive(dp, &(stats_yearly[++year_iter]));
} else
process_dive(dp, &(stats_yearly[year_iter]));
@ -423,10 +423,10 @@ static void process_all_dives(struct dive *dive, struct dive **prev_dive)
/* monthly statistics */
if (current_month == 0) {
current_month = tm->tm_mon + 1;
current_month = tm.tm_mon + 1;
} else {
if (current_month != tm->tm_mon + 1)
current_month = tm->tm_mon + 1;
if (current_month != tm.tm_mon + 1)
current_month = tm.tm_mon + 1;
if (prev_month != current_month || prev_year != current_year)
month_iter++;
}
@ -495,17 +495,17 @@ static void show_single_dive_stats(struct dive *dive)
const char *unit;
int idx, offset, gas_used;
struct dive *prev_dive;
struct tm *tm;
struct tm tm;
process_all_dives(dive, &prev_dive);
tm = gmtime(&dive->when);
utc_mkdate(dive->when, &tm);
snprintf(buf, sizeof(buf),
"%s, %s %d, %d %2d:%02d",
weekday(tm->tm_wday),
monthname(tm->tm_mon),
tm->tm_mday, tm->tm_year + 1900,
tm->tm_hour, tm->tm_min);
weekday(tm.tm_wday),
monthname(tm.tm_mon),
tm.tm_mday, tm.tm_year + 1900,
tm.tm_hour, tm.tm_min);
set_label(single_w.date, buf);
set_label(single_w.dive_time, "%d min", (dive->duration.seconds + 30) / 60);