X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=datastore.c;h=36bde28105e24d1ec5d4b3cd570ac23934b6c329;hb=6e6eeff47a93e48b31ef5d16feb707e8725dbbd3;hp=c7274ed30f7c246e09d6e5b046ec268867819a51;hpb=7b8ca864a00010d64172820bb82b30cb5f2d0009;p=libsigrok.git diff --git a/datastore.c b/datastore.c index c7274ed3..36bde281 100644 --- a/datastore.c +++ b/datastore.c @@ -96,8 +96,7 @@ SR_API int sr_datastore_destroy(struct sr_datastore *ds) g_free(chunk->data); g_slist_free(ds->chunklist); g_free(ds); - - /* TODO: Set ds = NULL? */ + ds = NULL; return SR_OK; } @@ -129,16 +128,12 @@ SR_API int sr_datastore_destroy(struct sr_datastore *ds) * is returned, the value/state of 'ds' is undefined. */ SR_API int sr_datastore_put(struct sr_datastore *ds, void *data, - unsigned int length, int in_unitsize, int *probelist) + unsigned int length, int in_unitsize, const int *probelist) { unsigned int stored; int capacity, size, num_chunks, chunk_bytes_free, chunk_offset; gpointer chunk; - /* Avoid compiler warnings. */ - (void)in_unitsize; - (void)probelist; - if (!ds) { sr_err("ds: %s: ds was NULL", __func__); return SR_ERR_ARG;