summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-05-30 20:57:32 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-06-19 13:11:10 -0700
commitf1c2cd375e295730d92e23093e44777baf838f1d (patch)
treeabd60ae573880028d22c7f046369f76d9dccde4e
parent529bdef0d66ade01f7ae0c99d1f5577102bfe278 (diff)
downloadsubsurface-f1c2cd375e295730d92e23093e44777baf838f1d.tar.gz
Cleanup: move TRIP_THRESHOLD into divelist.c
This macro was not used elsewhere. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
-rw-r--r--core/dive.h4
-rw-r--r--core/divelist.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/core/dive.h b/core/dive.h
index 8f9c95e94..7259575cc 100644
--- a/core/dive.h
+++ b/core/dive.h
@@ -303,10 +303,6 @@ extern depth_t gas_mnd(struct gasmix mix, depth_t end, const struct dive *dive,
#define SURFACE_THRESHOLD 750 /* somewhat arbitrary: only below 75cm is it really diving */
extern bool autogroup;
-/* random threashold: three days without diving -> new trip
- * this works very well for people who usually dive as part of a trip and don't
- * regularly dive at a local facility; this is why trips are an optional feature */
-#define TRIP_THRESHOLD 3600 * 24 * 3
extern void add_dive_to_trip(struct dive *, dive_trip_t *);
diff --git a/core/divelist.c b/core/divelist.c
index b342e1cd3..aeabdb89b 100644
--- a/core/divelist.c
+++ b/core/divelist.c
@@ -955,6 +955,11 @@ dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive, struct trip_tab
return dive_trip;
}
+/* random threshold: three days without diving -> new trip
+ * this works very well for people who usually dive as part of a trip and don't
+ * regularly dive at a local facility; this is why trips are an optional feature */
+#define TRIP_THRESHOLD 3600 * 24 * 3
+
/*
* Find a trip a new dive should be autogrouped with. If no such trips
* exist, allocate a new trip. The bool "*allocated" is set to true