From 8e330f297ed31bb13ff14110a58e93bed59dcea7 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 24 Oct 2020 14:50:59 -0700 Subject: cleanup: fix over-eager Coverity warnings Technically get_dive() could return a nullptr. The existing code made sure the argument passed to get_dive() was one that always would result in a valid dive pointer being returned. The new code is only slightly less efficient but allows a static code analysis to easily see that we don't derefence NULL pointers here. On some level this change is unnecessary. But it's also not wrong. Fixes CID 354762 Signed-off-by: Dirk Hohndel --- core/trip.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'core') diff --git a/core/trip.c b/core/trip.c index 570bd1fee..8f153d587 100644 --- a/core/trip.c +++ b/core/trip.c @@ -74,10 +74,12 @@ bool is_trip_before_after(const struct dive *dive, bool before) { int idx = get_idx_by_uniq_id(dive->id); if (before) { - if (idx > 0 && get_dive(idx - 1)->divetrip) + const struct dive *d = get_dive(idx - 1); + if (d && d->divetrip) return true; } else { - if (idx < dive_table.nr - 1 && get_dive(idx + 1)->divetrip) + const struct dive *d = get_dive(idx + 1); + if (d && d->divetrip) return true; } return false; -- cgit v1.2.3-70-g09d2