X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=datastore.c;h=11ae0e15ce039d69efb6e8b93515536d4a0be211;hb=c548332c21acc2588114214b38eaa3237fc3f8b3;hp=31dc770ecec3970ee3a3cad30e5c062d65bd5f02;hpb=e46b8fb154ba90ffec9c1f805399dfa819e736f9;p=libsigrok.git

diff --git a/datastore.c b/datastore.c
index 31dc770e..11ae0e15 100644
--- a/datastore.c
+++ b/datastore.c
@@ -22,10 +22,11 @@
 #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);
 
-int datastore_new(int unitsize, struct datastore **ds)
+int sr_datastore_new(int unitsize, struct sr_datastore **ds)
 {
 	if (!ds)
 		return SR_ERR;
@@ -33,8 +34,10 @@ int datastore_new(int unitsize, struct datastore **ds)
 	if (unitsize <= 0)
 		return SR_ERR; /* TODO: Different error? */
 
-	if (!(*ds = g_malloc(sizeof(struct datastore))))
+	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;
@@ -43,7 +46,7 @@ int datastore_new(int unitsize, struct datastore **ds)
 	return SR_OK;
 }
 
-int datastore_destroy(struct datastore *ds)
+int sr_datastore_destroy(struct sr_datastore *ds)
 {
 	GSList *chunk;
 
@@ -58,8 +61,8 @@ int datastore_destroy(struct datastore *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;
@@ -100,7 +103,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;