X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=datastore.c;h=75cd243b6ed964c46f92ea5d984c555b8d287145;hb=339729131d5acd50147e26ec238db569e273a459;hp=bb59fd587cbe5cf3d5cdd5a8e7025d3378ff3e43;hpb=33247d6acf94bb9119ba7e1a8239b474bdcfa430;p=libsigrok.git

diff --git a/datastore.c b/datastore.c
index bb59fd58..75cd243b 100644
--- a/datastore.c
+++ b/datastore.c
@@ -25,24 +25,22 @@
 
 static gpointer new_chunk(struct datastore **ds);
 
-/* TODO: Return int as error status, and the struct as param. */
-struct datastore *datastore_new(int unitsize)
+int datastore_new(int unitsize, struct datastore **ds)
 {
-	struct datastore *ds;
+	if (!ds)
+		return SIGROK_ERR;
 
 	if (unitsize <= 0)
-		// return SIGROK_ERR;
-		return NULL; /* FIXME */
+		return SIGROK_ERR; /* TODO: Different error? */
 
-	if (!(ds = g_malloc(sizeof(struct datastore))))
-		// return SIGROK_ERR_MALLOC;
-		return NULL; /* FIXME */
+	if (!(*ds = g_malloc(sizeof(struct datastore))))
+		return SIGROK_ERR_MALLOC;
 
-	ds->ds_unitsize = unitsize;
-	ds->num_units = 0;
-	ds->chunklist = NULL;
+	(*ds)->ds_unitsize = unitsize;
+	(*ds)->num_units = 0;
+	(*ds)->chunklist = NULL;
 
-	return ds;
+	return SIGROK_OK;
 }
 
 int datastore_destroy(struct datastore *ds)