Prefixes for *_device_instance.

[libsigrok.git] / datastore.c

diff --git a/datastore.c b/datastore.c
index bb59fd587cbe5cf3d5cdd5a8e7025d3378ff3e43..31dc770ecec3970ee3a3cad30e5c062d65bd5f02 100644 (file)
--- 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 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 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)
@@ -50,14 +48,14 @@ int datastore_destroy(struct 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,
@@ -67,7 +65,7 @@ void datastore_put(struct datastore *ds, void *data, unsigned int length,
        int capacity, size, num_chunks, chunk_bytes_free, chunk_offset;
        gpointer chunk;
 
-       /* QUICK HACK */
+       /* Avoid compiler warnings. */
        in_unitsize = in_unitsize;
        probelist = probelist;