Generate date string for the dive list dynamically

[ext/subsurface.git] / dive.c

diff --git a/dive.c b/dive.c
index 9bac25eeef3aa8412972e2ccfe890851828b3445..5ddb6bc8087faae233843dc46683382934fe6792 100644 (file)
--- a/dive.c
+++ b/dive.c
@@ -34,7 +34,6 @@ struct dive *fixup_dive(struct dive *dive)
        int lasttime = 0;
        int start = -1, end = -1;
        int startpress = 0, endpress = 0;
-       int starttemp = 0, endtemp = 0;
        int maxdepth = 0, mintemp = 0;
        int lastdepth = 0;
        int lasttemp = 0;
@@ -77,9 +76,6 @@ struct dive *fixup_dive(struct dive *dive)
                                lasttemp = temp;
                        }
 
-                       endtemp = temp;
-                       if (!starttemp)
-                               starttemp = temp;
                        if (!mintemp || temp < mintemp)
                                mintemp = temp;
                }
@@ -257,7 +253,6 @@ struct dive *try_to_merge(struct dive *a, struct dive *b)
        memset(res, 0, dive_size(alloc_samples));
 
        res->when = a->when;
-       res->name = merge_text(a->name, b->name);
        res->location = merge_text(a->location, b->location);
        res->notes = merge_text(a->notes, b->notes);
        MERGE_MAX(res, a, b, maxdepth.mm);