X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.c;h=1b906ee43bd9a7e86db41d08cc5d3f288732a012;hb=682135838ff313594c7f67fabd9be8f88a33883b;hp=ba5200f51af744c90dc3e86595c6c320e3956288;hpb=c24fd4b82cf4476c6d9c863ee03f2d729b64e5f0;p=ext%2Fsubsurface.git

diff --git a/dive.c b/dive.c
index ba5200f..1b906ee 100644
--- a/dive.c
+++ b/dive.c
@@ -1,8 +1,55 @@
+/* dive.c */
+/* maintains the internal dive list structure */
 #include <string.h>
 #include <stdio.h>
 
 #include "dive.h"
 
+struct dive *alloc_dive(void)
+{
+	const int initial_samples = 5;
+	unsigned int size;
+	struct dive *dive;
+
+	size = dive_size(initial_samples);
+	dive = malloc(size);
+	if (!dive)
+		exit(1);
+	memset(dive, 0, size);
+	dive->alloc_samples = initial_samples;
+	return dive;
+}
+
+struct sample *prepare_sample(struct dive **divep)
+{
+	struct dive *dive = *divep;
+	if (dive) {
+		int nr = dive->samples;
+		int alloc_samples = dive->alloc_samples;
+		struct sample *sample;
+		if (nr >= alloc_samples) {
+			unsigned int size;
+
+			alloc_samples = (alloc_samples * 3)/2 + 10;
+			size = dive_size(alloc_samples);
+			dive = realloc(dive, size);
+			if (!dive)
+				return NULL;
+			dive->alloc_samples = alloc_samples;
+			*divep = dive;
+		}
+		sample = dive->sample + nr;
+		memset(sample, 0, sizeof(*sample));
+		return sample;
+	}
+	return NULL;
+}
+
+void finish_sample(struct dive *dive, struct sample *sample)
+{
+	dive->samples++;
+}
+
 /*
  * So when we re-calculate maxdepth and meandepth, we will
  * not override the old numbers if they are close to the
@@ -72,7 +119,6 @@ struct dive *fixup_dive(struct dive *dive)
 	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;
@@ -96,17 +142,12 @@ struct dive *fixup_dive(struct dive *dive)
 			/*
 			 * If we have consecutive identical
 			 * temperature readings, throw away
-			 * the redundant ones. We care about
-			 * the "edges" only.
+			 * the redundant ones.
 			 */
-			if (lasttemp == temp) {
-				if (redundant_temp)
-					redundant_temp->mkelvin = 0;
-				redundant_temp = &sample->temperature;
-			} else {
-				redundant_temp = NULL;
+			if (lasttemp == temp)
+				sample->temperature.mkelvin = 0;
+			else
 				lasttemp = temp;
-			}
 
 			if (!mintemp || temp < mintemp)
 				mintemp = temp;
@@ -133,24 +174,15 @@ struct dive *fixup_dive(struct dive *dive)
 #define MERGE_MAX(res, a, b, n) res->n = MAX(a->n, b->n)
 #define MERGE_MIN(res, a, b, n) res->n = (a->n)?(b->n)?MIN(a->n, b->n):(a->n):(b->n)
 
-static int alloc_samples;
-
 static struct dive *add_sample(struct sample *sample, int time, struct dive *dive)
 {
-	int nr = dive->samples;
-	struct sample *d;
+	struct sample *p = prepare_sample(&dive);
 
-	if (nr >= alloc_samples) {
-		alloc_samples = (alloc_samples + 64) * 3 / 2;
-		dive = realloc(dive, dive_size(alloc_samples));
-		if (!dive)
-			return NULL;
-	}
-	dive->samples = nr+1;
-	d = dive->sample + nr;
-
-	*d = *sample;
-	d->time.seconds = time;
+	if (!p)
+		return NULL;
+	*p = *sample;
+	p->time.seconds = time;
+	finish_sample(dive, p);
 	return dive;
 }
 
@@ -246,7 +278,7 @@ static void merge_cylinder_type(cylinder_type_t *res, cylinder_type_t *a, cylind
 	*res = *b;
 }
 
-static void merge_cylinder_mix(gasmix_t *res, gasmix_t *a, gasmix_t *b)
+static void merge_cylinder_mix(struct gasmix *res, struct gasmix *a, struct gasmix *b)
 {
 	if (a->o2.permille)
 		b = a;
@@ -274,15 +306,12 @@ struct dive *try_to_merge(struct dive *a, struct dive *b)
 	if (a->when != b->when)
 		return NULL;
 
-	alloc_samples = 5;
-	res = malloc(dive_size(alloc_samples));
-	if (!res)
-		return NULL;
-	memset(res, 0, dive_size(alloc_samples));
+	res = alloc_dive();
 
 	res->when = a->when;
 	res->location = merge_text(a->location, b->location);
 	res->notes = merge_text(a->notes, b->notes);
+	MERGE_MAX(res, a, b, number);
 	MERGE_MAX(res, a, b, maxdepth.mm);
 	res->meandepth.mm = 0;
 	MERGE_MAX(res, a, b, duration.seconds);