FIND_TRIP: don't cast a timestamp to a pointer

The pointer size may not be large enough to contain a timestamp, so make
FIND_TRIP() just pass the pointer to the timestamp instead.

And use an inline function instead of macros with casts.  That gets us
proper type safety while at it, so that we get a warning if somebody
doesn't pass the expected "timestamp_t *".  Plus the code actually looks
simpler and way more straightforward.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 15 insertions, 9 deletions

diff --git a/dive.h b/dive.h
index 0953e4d8c..a0b019f96 100644
--- a/dive.h
+++ b/dive.h
@@ -289,11 +289,17 @@ static inline int dive_date_cmp(gconstpointer _a, gconstpointer _b) {
 }
 
 /* returns 0 if the dive happened exactly at time */
-static inline int dive_when_find(gconstpointer _dive, gconstpointer _time) {
-	return ((struct dive *)_dive)->when != (timestamp_t) _time;
+static inline int dive_when_find(gconstpointer _listentry, gconstpointer _when)
+{
+	const struct dive *dive = _listentry;
+	const timestamp_t *tsp = _when;
+	return dive->when != *tsp;
 }
 
-#define FIND_TRIP(_when) g_list_find_custom(dive_trip_list, (gconstpointer)(_when), dive_when_find)
+static inline GList *FIND_TRIP(timestamp_t *when)
+{
+	return g_list_find_custom(dive_trip_list, when, dive_when_find);
+}
 
 #ifdef DEBUG_TRIP
 static void dump_trip_list(void)
@@ -316,7 +322,7 @@ static void dump_trip_list(void)
 static void inline insert_trip(struct dive **trip)
 {
 	struct dive *dive_trip = *trip;
-	GList *result = FIND_TRIP(dive_trip->when);
+	GList *result = FIND_TRIP(&dive_trip->when);
 	if (result) {
 		if (! DIVE_TRIP(result)->location)
 			DIVE_TRIP(result)->location = dive_trip->location;
diff --git a/divelist.c b/divelist.c
index 849a8bd2d..9a3493c99 100644
--- a/divelist.c
+++ b/divelist.c
@@ -1058,7 +1058,7 @@ static void fill_dive_list(void)
 					parent_ptr = NULL;
 					dive_trip = create_and_hookup_trip_from_dive(dive);
 					dive_trip->tripflag = IN_TRIP;
-					trip = FIND_TRIP(dive_trip->when);
+					trip = FIND_TRIP(&dive_trip->when);
 				}
 				if (trip)
 					dive_trip = DIVE_TRIP(trip);
@@ -1265,7 +1265,7 @@ void edit_trip_cb(GtkWidget *menuitem, GtkTreePath *path)
 
 	gtk_tree_model_get_iter(MODEL(dive_list), &iter, path);
 	gtk_tree_model_get(MODEL(dive_list), &iter, DIVE_DATE, &when, -1);
-	trip = FIND_TRIP(when);
+	trip = FIND_TRIP(&when);
 	dive_trip = DIVE_TRIP(trip);
 	if (edit_trip(dive_trip))
 		gtk_tree_store_set(STORE(dive_list), &iter, DIVE_LOCATION, dive_trip->location, -1);
@@ -1564,7 +1564,7 @@ static void remove_from_trip(GtkTreePath *path)
 	/* if this was the last dive on the trip, remove the trip */
 	if (! gtk_tree_model_iter_has_child(MODEL(dive_list), &parent)) {
 		gtk_tree_store_remove(STORE(dive_list), &parent);
-		delete_trip(FIND_TRIP(dive->divetrip->when));
+		delete_trip(FIND_TRIP(&dive->divetrip->when));
 		free(dive->divetrip);
 	}
 	/* mark the dive as intentionally at the top level */
@@ -1672,7 +1672,7 @@ void remove_trip(GtkTreePath *trippath, gboolean force_no_trip)
 	}
 	/* finally, remove the trip */
 	gtk_tree_store_remove(STORE(dive_list), &parent);
-	delete_trip(FIND_TRIP(dive_trip->when));
+	delete_trip(FIND_TRIP(&dive_trip->when));
 	free(dive_trip);
 #ifdef DEBUG_TRIP
 	dump_trip_list();
@@ -2097,7 +2097,7 @@ void remove_autogen_trips()
 	while(gtk_tree_model_get_iter(TREEMODEL(dive_list), &iter, path)) {
 		gtk_tree_model_get(TREEMODEL(dive_list), &iter, DIVE_INDEX, &idx, DIVE_DATE, &when, -1);
 		if (idx < 0) {
-			trip = FIND_TRIP(when);
+			trip = FIND_TRIP(&when);
 			if (DIVE_TRIP(trip)->tripflag == IN_TRIP) { /* this was autogen */
 				remove_trip(path, FALSE);
 				continue;