X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=datastore.c;h=11ae0e15ce039d69efb6e8b93515536d4a0be211;hb=a562c3a2e5e54dbb7e0553422ac0e0c845b180ad;hp=75cd243b6ed964c46f92ea5d984c555b8d287145;hpb=2aebf78d9d10eb838b2fe58683d7af06015cd214;p=libsigrok.git

diff --git a/datastore.c b/datastore.c
index 75cd243b..11ae0e15 100644
--- a/datastore.c
+++ b/datastore.c
@@ -22,50 +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);
 
-int datastore_new(int unitsize, struct datastore **ds)
+int sr_datastore_new(int unitsize, struct sr_datastore **ds)
 {
 	if (!ds)
-		return SIGROK_ERR;
+		return SR_ERR;
 
 	if (unitsize <= 0)
-		return SIGROK_ERR; /* TODO: Different error? */
+		return SR_ERR; /* TODO: Different error? */
 
-	if (!(*ds = g_malloc(sizeof(struct datastore))))
-		return SIGROK_ERR_MALLOC;
+	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 SIGROK_OK;
+	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;
 
@@ -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;