diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2014-04-18 13:06:21 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2014-04-18 13:06:21 -0700 |
commit | d191f5af6f78068a9ff2655a8b9aa354f4c85e94 (patch) | |
tree | 59fbb2c21ead3d836ecf7d8dbdc367680ce89dc7 | |
parent | 72be8260b46ba54c72264488eaf24269fdb21e27 (diff) | |
download | subsurface-d191f5af6f78068a9ff2655a8b9aa354f4c85e94.tar.gz |
Remove unused variables and fix signed/unsigned mismatch
The depth types are unsigned for dive plan datapoints.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | planner.c | 6 | ||||
-rw-r--r-- | qt-ui/diveplanner.cpp | 6 |
2 files changed, 4 insertions, 8 deletions
@@ -119,7 +119,7 @@ double tissue_at_end(struct dive *dive, char **cached_datap) { struct divecomputer *dc; struct sample *sample, *psample; - int i, j, t0, t1, gasidx, lastdepth; + int i, t0, t1, gasidx, lastdepth; int o2, he; double tissue_tolerance; @@ -582,11 +582,11 @@ void plan(struct diveplan *diveplan, char **cached_datap, struct dive **divep, b { struct dive *dive; struct sample *sample; - int wait_time, o2, he, po2; + int o2, he, po2; int transitiontime, gi; int current_cylinder; unsigned int stopidx; - int depth, ceiling; + int depth; double tissue_tolerance; struct gaschanges *gaschanges = NULL; int gaschangenr; diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp index 2f55fd564..94fcc1b1c 100644 --- a/qt-ui/diveplanner.cpp +++ b/qt-ui/diveplanner.cpp @@ -520,9 +520,7 @@ void DivePlannerGraphics::drawProfile() computedPoints.push_back(i); plannerModel->removeSelectedPoints(computedPoints); - int lastdepth = 0; - int lasto2 = 0; - int lasthe = 0; + unsigned int lastdepth = 0; for (dp = diveplan.dp; dp != NULL; dp = dp->next) { if (dp->time == 0) // magic entry for available tank continue; @@ -538,8 +536,6 @@ void DivePlannerGraphics::drawProfile() if (dp->depth == lastdepth || dp->o2 != dp->next->o2 || dp->he != dp->next->he) plannerModel->addStop(dp->depth, dp->time, dp->o2, dp->he, 0, false); lastdepth = dp->depth; - lasto2 = dp->o2; - lasthe = dp->he; } } lastx = xpos; |