summaryrefslogtreecommitdiffstats
path: root/core/divelist.h
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2019-03-17 13:52:45 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-03-17 15:11:31 -0700
commit8bbc375fab7f2e34f1877126298209d7d1b04da0 (patch)
treef16b919e048d4ecfadb718c09dac8aa227645cf6 /core/divelist.h
parent6a6c62ecf5f007533f85ecb029a0c57168ec926c (diff)
downloadsubsurface-8bbc375fab7f2e34f1877126298209d7d1b04da0.tar.gz
Core: remove variable name conflict
Having a parameter with the same name as a global variable is potentially confusing. Found via LGTM.com Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/divelist.h')
-rw-r--r--core/divelist.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/divelist.h b/core/divelist.h
index 31f92c718..e1ff706f7 100644
--- a/core/divelist.h
+++ b/core/divelist.h
@@ -35,10 +35,10 @@ extern void add_single_dive(int idx, struct dive *dive);
extern void get_dive_gas(const struct dive *dive, int *o2_p, int *he_p, int *o2low_p);
extern int get_divenr(const struct dive *dive);
extern struct dive_trip *unregister_dive_from_trip(struct dive *dive);
-extern void remove_dive_from_trip(struct dive *dive, struct trip_table *trip_table);
+extern void remove_dive_from_trip(struct dive *dive, struct trip_table *trip_table_arg);
extern dive_trip_t *alloc_trip(void);
extern dive_trip_t *create_trip_from_dive(struct dive *dive);
-extern dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive, struct trip_table *trip_table);
+extern dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive, struct trip_table *trip_table_arg);
extern dive_trip_t *get_dives_to_autogroup(struct dive_table *table, int start, int *from, int *to, bool *allocated);
extern dive_trip_t *get_trip_for_new_dive(struct dive *new_dive, bool *allocated);
extern bool consecutive_selected();