X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=datastore.c;h=11ae0e15ce039d69efb6e8b93515536d4a0be211;hb=f38bdf5678d35a1493c17a5c260fc1120d93bd93;hp=443ab1539d96c0bbf920f8da369488f9905cd684;hpb=1b452b8510922bac08db87f8ea769515c795e22f;p=libsigrok.git

diff --git a/datastore.c b/datastore.c
index 443ab153..11ae0e15 100644
--- a/datastore.c
+++ b/datastore.c
@@ -22,39 +22,53 @@
 #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);
 
-struct datastore *datastore_new(int unitsize)
+int sr_datastore_new(int unitsize, struct sr_datastore **ds)
 {
-	struct datastore *ds;
+	if (!ds)
+		return SR_ERR;
 
-	ds = g_malloc(sizeof(struct datastore));
-	ds->ds_unitsize = unitsize;
-	ds->num_units = 0;
-	ds->chunklist = NULL;
+	if (unitsize <= 0)
+		return SR_ERR; /* TODO: Different error? */
 
-	return ds;
+	if (!(*ds = g_try_malloc(sizeof(struct sr_datastore)))) {
+		sr_err("ds: %s: ds malloc failed", __func__);
+		return SR_ERR_MALLOC;
+	}
+
+	(*ds)->ds_unitsize = unitsize;
+	(*ds)->num_units = 0;
+	(*ds)->chunklist = NULL;
+
+	return SR_OK;
 }
 
-void datastore_destroy(struct datastore *ds)
+int sr_datastore_destroy(struct sr_datastore *ds)
 {
 	GSList *chunk;
 
+	if (!ds)
+		return SR_ERR;
+
 	for (chunk = ds->chunklist; chunk; chunk = chunk->next)
 		g_free(chunk->data);
 	g_slist_free(ds->chunklist);
 	g_free(ds);
+
+	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;
 
@@ -89,11 +103,13 @@ 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;
 
-	chunk = g_malloc(DATASTORE_CHUNKSIZE * (*ds)->ds_unitsize);
+	if (!(chunk = malloc(DATASTORE_CHUNKSIZE * (*ds)->ds_unitsize)))
+		return NULL;
+
 	(*ds)->chunklist = g_slist_append((*ds)->chunklist, chunk);
 
 	return chunk;