From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 4 Sep 2011 18:46:39 +0000 (-0700)
Subject: Merge branch 'compiler-warning' of https://github.com/nathansamson/diveclog
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=550eb862fa6dbc1d07c6a3165634900421dd2ca6;p=ext%2Fsubsurface.git

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").
---

550eb862fa6dbc1d07c6a3165634900421dd2ca6
diff --cc dive.c
index 9bac25e,f758785..757622f
--- a/dive.c
+++ b/dive.c
@@@ -34,11 -34,8 +34,10 @@@ struct dive *fixup_dive(struct dive *di
  	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;
 +	temperature_t *redundant_temp = NULL;
  
  	for (i = 0; i < dive->samples; i++) {
  		struct sample *sample = dive->sample + i;
@@@ -62,24 -59,6 +61,21 @@@
  				startpress = press;
  		}
  		if (temp) {
 +			/*
 +			 * If we have consecutive identical
 +			 * temperature readings, throw away
 +			 * the redundant ones. We care about
 +			 * the "edges" only.
 +			 */
 +			if (lasttemp == temp) {
 +				if (redundant_temp)
 +					redundant_temp->mkelvin = 0;
 +				redundant_temp = &sample->temperature;
 +			} else {
 +				redundant_temp = NULL;
 +				lasttemp = temp;
 +			}
 +
- 			endtemp = temp;
- 			if (!starttemp)
- 				starttemp = temp;
  			if (!mintemp || temp < mintemp)
  				mintemp = temp;
  		}