X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.c;h=7fe6eb17b863f0ceeef887d81636fcb77991a3e8;hb=f448b68de0e844db3628332ebf70f2746882527c;hp=757622fe7076cf10a43a70aa9b1ec6facd5fc816;hpb=230a13476d9af732cb60b2c0393feeadb5b39e67;p=ext%2Fsubsurface.git

diff --git a/dive.c b/dive.c
index 757622f..7fe6eb1 100644
--- a/dive.c
+++ b/dive.c
@@ -21,10 +21,38 @@
  */
 static void update_depth(depth_t *depth, int new)
 {
-	int old = depth->mm;
+	if (new) {
+		int old = depth->mm;
 
-	if (abs(old - new) > 1000)
-		depth->mm = new;
+		if (abs(old - new) > 1000)
+			depth->mm = new;
+	}
+}
+
+static void update_pressure(pressure_t *pressure, int new)
+{
+	if (new) {
+		int old = pressure->mbar;
+
+		if (abs(old - new) > 1000)
+			pressure->mbar = new;
+	}
+}
+
+static void update_duration(duration_t *duration, int new)
+{
+	if (new)
+		duration->seconds = new;
+}
+
+static void update_temperature(temperature_t *temperature, int new)
+{
+	if (new) {
+		int old = temperature->mkelvin;
+
+		if (abs(old - new) > 1000)
+			temperature->mkelvin = new;
+	}
 }
 
 struct dive *fixup_dive(struct dive *dive)
@@ -85,18 +113,16 @@ struct dive *fixup_dive(struct dive *dive)
 	}
 	if (end < 0)
 		return dive;
-	dive->duration.seconds = end - start;
+
+	update_duration(&dive->duration, end - start);
 	if (start != end)
-		update_depth(&dive->meandepth, depthtime / (end - start));
-	if (startpress)
-		dive->beginning_pressure.mbar = startpress;
-	if (endpress)
-		dive->end_pressure.mbar = endpress;
-	if (mintemp)
-		dive->watertemp.mkelvin = mintemp;
+		depthtime /= (end - start);
 
-	if (maxdepth)
-		update_depth(&dive->maxdepth, maxdepth);
+	update_depth(&dive->meandepth, depthtime);
+	update_pressure(&dive->beginning_pressure, startpress);
+	update_pressure(&dive->end_pressure, endpress);
+	update_temperature(&dive->watertemp, mintemp);
+	update_depth(&dive->maxdepth, maxdepth);
 
 	return dive;
 }
@@ -253,7 +279,6 @@ struct dive *try_to_merge(struct dive *a, struct dive *b)
 	memset(res, 0, dive_size(alloc_samples));
 
 	res->when = a->when;
-	res->name = merge_text(a->name, b->name);
 	res->location = merge_text(a->location, b->location);
 	res->notes = merge_text(a->notes, b->notes);
 	MERGE_MAX(res, a, b, maxdepth.mm);