X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.c;h=67a78cc8ad309189dc14419501e1209b1997e637;hb=3a77eb85101a5fb1dc186b88a3a02d2ae27690c7;hp=41bbabd698868bf43c90555acc38d13a83b41a9c;hpb=d94fb7ca6b4fc17dacd069522d7fad00aa69e088;p=ext%2Fsubsurface.git

diff --git a/dive.c b/dive.c
index 41bbabd..67a78cc 100644
--- a/dive.c
+++ b/dive.c
@@ -5,6 +5,29 @@
 
 #include "dive.h"
 
+void add_event(struct dive *dive, int time, int type, int flags, int value, const char *name)
+{
+	struct event *ev, **p;
+	unsigned int size, len = strlen(name);
+
+	size = sizeof(*ev) + len + 1;
+	ev = malloc(size);
+	if (!ev)
+		return;
+	memset(ev, 0, size);
+	memcpy(ev->name, name, len);
+	ev->time.seconds = time;
+	ev->type = type;
+	ev->flags = flags;
+	ev->value = value;
+	ev->next = NULL;
+
+	p = &dive->events;
+	while (*p)
+		p = &(*p)->next;
+	*p = ev;
+}
+
 double get_depth_units(unsigned int mm, int *frac, const char **units)
 {
 	int decimals;
@@ -198,6 +221,7 @@ struct dive *fixup_dive(struct dive *dive)
 /* Don't pick a zero for MERGE_MIN() */
 #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)
+#define MERGE_TXT(res, a, b, n) res->n = merge_text(a->n, b->n)
 
 static struct dive *add_sample(struct sample *sample, int time, struct dive *dive)
 {
@@ -334,8 +358,10 @@ struct dive *try_to_merge(struct dive *a, struct dive *b)
 	res = alloc_dive();
 
 	res->when = a->when;
-	res->location = merge_text(a->location, b->location);
-	res->notes = merge_text(a->notes, b->notes);
+	MERGE_TXT(res, a, b, location);
+	MERGE_TXT(res, a, b, notes);
+	MERGE_TXT(res, a, b, buddy);
+	MERGE_TXT(res, a, b, divemaster);
 	MERGE_MAX(res, a, b, number);
 	MERGE_MAX(res, a, b, maxdepth.mm);
 	res->meandepth.mm = 0;