diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-01-07 11:12:48 +0100 |
|---|---|---|
| committer |  Lubomir I. Ivanov <neolit123@gmail.com> | 2018-01-11 06:07:13 +0100 |
| commit | e85ecdd9254a8bd222ccb2dfed7d3b3bb96c8294 (patch) | |
| tree | 0483cdb3c5770ca75eeeb0cc2de787b0e7bdbd3c /core/divelist.c | |
| parent | 86ef9fce7517313570838ca8e853132876035611 (diff) | |
| download | subsurface-e85ecdd9254a8bd222ccb2dfed7d3b3bb96c8294.tar.gz | |
Introduce helper function empty_string()
There are ca. 50 constructs of the kind
same_string(s, "")
to test for empty or null strings. Replace them by the new helper
function empty_string().
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/divelist.c')
| -rw-r--r-- | core/divelist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/divelist.c b/core/divelist.c index 5549825dc..7c6259a6b 100644 --- a/core/divelist.c +++ b/core/divelist.c @@ -1177,11 +1177,11 @@ void filter_dive(struct dive *d, bool shown) * (or the second one if the first one is empty */ void combine_trips(struct dive_trip *trip_a, struct dive_trip *trip_b) { - if (same_string(trip_a->location, "") && trip_b->location) { + if (empty_string(trip_a->location) && trip_b->location) { free(trip_a->location); trip_a->location = strdup(trip_b->location); } - if (same_string(trip_a->notes, "") && trip_b->notes) { + if (empty_string(trip_a->notes) && trip_b->notes) { free(trip_a->notes); trip_a->notes = strdup(trip_b->notes); } |