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

* '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 9961c7f89ce6: "Remove redundant temperature readings").

1 files changed, 0 insertions, 4 deletions

diff --git a/dive.c b/dive.c
index 9bac25eee..757622fe7 100644
--- 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;
 		}