From 8bbc375fab7f2e34f1877126298209d7d1b04da0 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 17 Mar 2019 13:52:45 -0700 Subject: 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 --- core/divelist.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/divelist.h') 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(); -- cgit v1.2.3-70-g09d2