diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-10-03 21:14:11 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-06 19:47:06 -0700 |
| commit | ab14889563317b561eb22ad46d05f302cc582600 (patch) | |
| tree | c12edebf14d86a77a289d5535411934ca09809d7 /core | |
| parent | 810903bdb9db84997dc3d32bb8e934e320784a4d (diff) | |
| download | subsurface-ab14889563317b561eb22ad46d05f302cc582600.tar.gz | |
Core: remove preexisting field from struct dive_table
Dives are now in all cases imported via distinct dive_tables.
Therefore the "preexisting" marker is useless. Remove.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -rw-r--r-- | core/dive.h | 2 | ||||
| -rw-r--r-- | core/downloadfromdcthread.cpp | 1 | ||||
| -rw-r--r-- | core/libdivecomputer.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/core/dive.h b/core/dive.h index ccc15c782..674e52ec2 100644 --- a/core/dive.h +++ b/core/dive.h @@ -431,7 +431,7 @@ extern const struct units *get_units(void); extern int run_survey, verbose, quit, force_root; struct dive_table { - int nr, allocated, preexisting; + int nr, allocated; struct dive **dives; }; diff --git a/core/downloadfromdcthread.cpp b/core/downloadfromdcthread.cpp index 70e4aac7d..e4dc80176 100644 --- a/core/downloadfromdcthread.cpp +++ b/core/downloadfromdcthread.cpp @@ -77,7 +77,6 @@ void DownloadThread::run() #endif qDebug() << "Starting download from " << (internalData->bluetooth_mode ? "BT" : internalData->devname); downloadTable.nr = 0; - dive_table.preexisting = dive_table.nr; Q_ASSERT(internalData->download_table != nullptr); const char *errorText; diff --git a/core/libdivecomputer.c b/core/libdivecomputer.c index 5b386c032..c182d2944 100644 --- a/core/libdivecomputer.c +++ b/core/libdivecomputer.c @@ -503,7 +503,7 @@ static int find_dive(struct divecomputer *match) { int i; - for (i = dive_table.preexisting - 1; i >= 0; i--) { + for (i = dive_table.nr - 1; i >= 0; i--) { struct dive *old = dive_table.dives[i]; if (match_one_dive(match, old)) |