mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'compiler-warning' of https://github.com/nathansamson/diveclog

Browse source 
* 'compiler-warning' of https://github.com/nathansamson/diveclog:
  Removed the unused startemp and enttemp calculations. This fixes a compiler warning too.

Fix up trivial conflict in dive.c due to the temperature simplification
(commit 9961c7f89c: "Remove redundant temperature readings").
This commit is contained in:
Linus Torvalds 2011-09-04 11:46:39 -07:00
commit 550eb862fa
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dive.c
View file

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