Move events and samples into a 'struct divecomputer'

For now we only have one fixed divecomputer associated with each dive,
so this doesn't really change any current semantics.  But it will make
it easier for us to associate a dive with multiple dive computers.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/file.c b/file.c
index 1289f3436..ac5bf2790 100644
--- a/file.c
+++ b/file.c
@@ -204,10 +204,10 @@ static int try_to_open_csv(const char *filename, struct memblock *mem, enum csv_
 		if (errno)
 			break;
 
-		sample = prepare_sample(dive);
+		sample = prepare_sample(&dive->dc);
 		sample->time.seconds = time;
 		add_sample_data(sample, type, val);
-		finish_sample(dive);
+		finish_sample(&dive->dc);
 
 		time++;
 		dive->duration.seconds = time;