Merge branch 'time-function'

Merge the 64-bit timestamp_t time function branch.

This makes subsurface not only safe against the 2038-year problem, but
also avoids the use of thread-unsafe gmtime() etc.

We still use the system time_t for initializing the calendar widget for
adding a new dive, but that's cosmetic rather than anything fundamental.

* time-function:
  FIND_TRIP: don't cast a timestamp to a pointer
  dive-time widget: fix incorrect use of timestamp_t
  Fix the incorrect data type for DIVE_DATE accesses
  Use a 64-bit 'timestamp_t' for all timestamps, rather than 'time_t'

1 files changed, 12 insertions, 12 deletions

diff --git a/print.c b/print.c
index 12504b13d..5adba94cd 100644
--- a/print.c
+++ b/print.c
@@ -51,7 +51,7 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w,
 	const char *unit;
 	int len, decimals, width, height, maxwidth, maxheight;
 	PangoLayout *layout;
-	struct tm *tm;
+	struct tm tm;
 	char buffer[80], divenr[20], *people;
 
 	maxwidth = w * PANGO_SCALE;
@@ -65,14 +65,14 @@ static void show_dive_text(struct dive *dive, cairo_t *cr, double w,
 	if (dive->number)
 		snprintf(divenr, sizeof(divenr), "Dive #%d - ", dive->number);
 
-	tm = gmtime(&dive->when);
+	utc_mkdate(dive->when, &tm);
 	len = snprintf(buffer, sizeof(buffer),
 		"%s%s, %s %d, %d   %d:%02d",
 		divenr,
-		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_font(layout, font, FONT_LARGE, PANGO_ALIGN_LEFT);
 	pango_layout_set_text(layout, buffer, len);
@@ -194,7 +194,7 @@ static void show_dive_table(struct dive *dive, cairo_t *cr, double w,
 	int len, decimals;
 	double maxwidth, maxheight, colwidth, curwidth;
 	PangoLayout *layout;
-	struct tm *tm;
+	struct tm tm;
 	char buffer[160], divenr[20];
 
 	maxwidth = w * PANGO_SCALE;
@@ -223,13 +223,13 @@ static void show_dive_table(struct dive *dive, cairo_t *cr, double w,
 
 	// Col 2: Date #
 	pango_layout_set_width(layout, colwidth);
-	tm = gmtime(&dive->when);
+	utc_mkdate(dive->when, &tm);
 	len = snprintf(buffer, sizeof(buffer),
 		"%s, %s %d, %d   %dh%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
 		);
 	cairo_move_to(cr, curwidth / PANGO_SCALE, 0);
 	pango_layout_set_text(layout, buffer, len);