X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=libdivecomputer.c;h=4495b1716e72bab5ba18edcc57b56f82b969886d;hb=b0ba22a06879;hp=14f794e8cc8440b55137c557c8ac805cf2763fa7;hpb=c8f3dc3594aa850829ab87ac7d290776dfb846bd;p=ext%2Fsubsurface.git

diff --git a/libdivecomputer.c b/libdivecomputer.c
index 14f794e..4495b17 100644
--- a/libdivecomputer.c
+++ b/libdivecomputer.c
@@ -18,7 +18,7 @@
   #define NOT_FROG
 #endif
 
-static void error(const char *fmt, ...)
+static GError *error(const char *fmt, ...)
 {
 	va_list args;
 	GError *error;
@@ -28,8 +28,7 @@ static void error(const char *fmt, ...)
 		g_quark_from_string("subsurface"),
 		DIVE_ERROR_PARSE, fmt, args);
 	va_end(args);
-	report_error(error);
-	g_error_free(error);
+	return error;
 }
 
 static parser_status_t create_parser(device_data_t *devdata, parser_t **parser)
@@ -512,7 +511,7 @@ static void *pthread_wrapper(void *_data)
 	return (void *)err_string;
 }
 
-void do_import(device_data_t *data)
+GError *do_import(device_data_t *data)
 {
 	pthread_t pthread;
 	void *retval;
@@ -527,7 +526,8 @@ void do_import(device_data_t *data)
 	if (pthread_join(pthread, &retval) < 0)
 		retval = "Odd pthread error return";
 	if (retval)
-		error(retval, data->name, data->devname);
+		return error(retval, data->name, data->devname);
+	return NULL;
 }
 
 /*