X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=libdivecomputer.c;h=b1c86c5ee8d378ad1852a88e7d396d88885b78a1;hb=c52b95d502fb79e52d5927b7c59addef984d23e2;hp=78be2019a4adba9c03461ba5274271506a730f03;hpb=1531a37dd0b74fcb06ca06fd2f225d4a2d228a87;p=ext%2Fsubsurface.git

diff --git a/libdivecomputer.c b/libdivecomputer.c
index 78be201..b1c86c5 100644
--- a/libdivecomputer.c
+++ b/libdivecomputer.c
@@ -223,7 +223,7 @@ static int find_dive(struct dive *dive, device_data_t *devdata)
 {
 	int i;
 
-	for (i = 0; i < devdata->preexisting; i++) {
+	for (i = 0; i < dive_table.preexisting; i++) {
 		struct dive *old = dive_table.dives[i];
 
 		if (dive->when != old->when)
@@ -333,7 +333,6 @@ static int dive_cb(const unsigned char *data, unsigned int size,
 
 static device_status_t import_device_data(device_t *device, device_data_t *devicedata)
 {
-	devicedata->preexisting = dive_table.nr;
 	return device_foreach(device, dive_cb, devicedata);
 }
 
@@ -412,10 +411,10 @@ static device_status_t device_open(const char *devname,
 
 static void event_cb(device_t *device, device_event_t event, const void *data, void *userdata)
 {
-	const device_progress_t *progress = (device_progress_t *) data;
-	const device_devinfo_t *devinfo = (device_devinfo_t *) data;
-	const device_clock_t *clock = (device_clock_t *) data;
-	device_data_t *devdata = (device_data_t *) userdata;
+	const device_progress_t *progress = data;
+	const device_devinfo_t *devinfo = data;
+	const device_clock_t *clock = data;
+	device_data_t *devdata = userdata;
 
 	switch (event) {
 	case DEVICE_EVENT_WAITING: