X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=datastore.c;h=7f35ee5aae5b343101d579be4d6ea1ef03169e73;hb=82957b65b111437ebe445b7f165719eec2d4e147;hp=bb59fd587cbe5cf3d5cdd5a8e7025d3378ff3e43;hpb=33247d6acf94bb9119ba7e1a8239b474bdcfa430;p=libsigrok.git

diff --git a/datastore.c b/datastore.c
index bb59fd58..7f35ee5a 100644
--- a/datastore.c
+++ b/datastore.c
@@ -22,52 +22,51 @@
 #include <string.h>
 #include <glib.h>
 #include <sigrok.h>
+#include <sigrok-internal.h>
 
-static gpointer new_chunk(struct datastore **ds);
+static gpointer new_chunk(struct sr_datastore **ds);
 
-/* TODO: Return int as error status, and the struct as param. */
-struct datastore *datastore_new(int unitsize)
+int sr_datastore_new(int unitsize, struct sr_datastore **ds)
 {
-	struct datastore *ds;
+	if (!ds)
+		return SR_ERR;
 
 	if (unitsize <= 0)
-		// return SIGROK_ERR;
-		return NULL; /* FIXME */
+		return SR_ERR; /* TODO: Different error? */
 
-	if (!(ds = g_malloc(sizeof(struct datastore))))
-		// return SIGROK_ERR_MALLOC;
-		return NULL; /* FIXME */
+	if (!(*ds = g_malloc(sizeof(struct sr_datastore))))
+		return SR_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 SR_OK;
 }
 
-int datastore_destroy(struct datastore *ds)
+int sr_datastore_destroy(struct sr_datastore *ds)
 {
 	GSList *chunk;
 
 	if (!ds)
-		return SIGROK_ERR;
-	
+		return SR_ERR;
+
 	for (chunk = ds->chunklist; chunk; chunk = chunk->next)
 		g_free(chunk->data);
 	g_slist_free(ds->chunklist);
 	g_free(ds);
 
-	return SIGROK_OK;
+	return SR_OK;
 }
 
-void datastore_put(struct datastore *ds, void *data, unsigned int length,
-		   int in_unitsize, int *probelist)
+void sr_datastore_put(struct sr_datastore *ds, void *data, unsigned int length,
+		      int in_unitsize, int *probelist)
 {
 	unsigned int stored;
 	int capacity, size, num_chunks, chunk_bytes_free, chunk_offset;
 	gpointer chunk;
 
-	/* QUICK HACK */
+	/* Avoid compiler warnings. */
 	in_unitsize = in_unitsize;
 	probelist = probelist;
 
@@ -102,7 +101,7 @@ void datastore_put(struct datastore *ds, void *data, unsigned int length,
 	ds->num_units += stored / ds->ds_unitsize;
 }
 
-static gpointer new_chunk(struct datastore **ds)
+static gpointer new_chunk(struct sr_datastore **ds)
 {
 	gpointer chunk;