From 8a394b9db42a21f684c6ae85005a55c29d060c38 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Tue, 14 Aug 2018 14:09:30 -0400 Subject: Filter: constify doFilter() argument Conceptually, the doFilter() functions shouldn't modify the dive they test. Therefore, make the argument const. To do this, constify the parameter of get_dive_location(), which likewise seems to be the right thing to do. Signed-off-by: Berthold Stoeger --- core/dive.c | 4 ++-- core/dive.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'core') diff --git a/core/dive.c b/core/dive.c index da4b19346..482ba585b 100644 --- a/core/dive.c +++ b/core/dive.c @@ -4202,9 +4202,9 @@ const char *get_dive_country(struct dive *dive) return NULL; } -char *get_dive_location(struct dive *dive) +const char *get_dive_location(const struct dive *dive) { - struct dive_site *ds = get_dive_site_by_uuid(dive->dive_site_uuid); + const struct dive_site *ds = get_dive_site_by_uuid(dive->dive_site_uuid); if (ds && ds->name) return ds->name; return NULL; diff --git a/core/dive.h b/core/dive.h index 98ac06fdc..01ec1fd3d 100644 --- a/core/dive.h +++ b/core/dive.h @@ -444,7 +444,7 @@ extern struct dive *get_dive(int nr); extern struct dive *get_dive_from_table(int nr, struct dive_table *dt); extern struct dive_site *get_dive_site_for_dive(struct dive *dive); extern const char *get_dive_country(struct dive *dive); -extern char *get_dive_location(struct dive *dive); +extern const char *get_dive_location(const struct dive *dive); extern unsigned int number_of_computers(struct dive *dive); extern struct divecomputer *get_dive_dc(struct dive *dive, int nr); extern timestamp_t dive_endtime(const struct dive *dive); -- cgit v1.2.3-70-g09d2