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>
This commit is contained in:
Dirk Hohndel 2014-04-18 13:06:21 -07:00
parent 72be8260b4
commit d191f5af6f
2 changed files with 4 additions and 8 deletions

View file

@ -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;

View file

@ -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;