/*
* This file is part of the sigrok project.
*
- * Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <stdint.h>
#include <string.h>
#include <glib.h>
-#include <sigrok.h>
-#include <sigrok-internal.h>
+#include "sigrok.h"
+#include "sigrok-internal.h"
static gpointer new_chunk(struct sr_datastore **ds);
* or SR_ERR_ARG upon invalid arguments. If something other than SR_OK
* is returned, the value of 'ds' is undefined.
*/
-int sr_datastore_new(int unitsize, struct sr_datastore **ds)
+SR_API int sr_datastore_new(int unitsize, struct sr_datastore **ds)
{
if (!ds) {
sr_err("ds: %s: ds was NULL", __func__);
*
* @return SR_OK upon success, SR_ERR_ARG upon invalid arguments.
*/
-int sr_datastore_destroy(struct sr_datastore *ds)
+SR_API int sr_datastore_destroy(struct sr_datastore *ds)
{
GSList *chunk;
g_free(chunk->data);
g_slist_free(ds->chunklist);
g_free(ds);
-
- /* TODO: Set ds = NULL? */
+ ds = NULL;
return SR_OK;
}
* of struct sr_datastore (instead of hardcoding DATASTORE_CHUNKSIZE).
* TODO: in_unitsize and probelist are unused?
* TODO: A few of the parameters can be const.
- * TODO: Handle new_chunk() returning NULL.
* TODO: Ideally, 'ds' should be unmodified upon errors.
*
* @param ds Pointer to the datastore which shall receive the data.
* or SR_ERR_ARG upon invalid arguments. If something other than SR_OK
* is returned, the value/state of 'ds' is undefined.
*/
-int sr_datastore_put(struct sr_datastore *ds, void *data, unsigned int length,
- int in_unitsize, int *probelist)
+SR_API int sr_datastore_put(struct sr_datastore *ds, void *data,
+ 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;
}
/* Get the last chunk in the list, or create a new one if needed. */
- if (ds->chunklist == NULL)
- chunk = new_chunk(&ds);
- else
+ if (ds->chunklist == NULL) {
+ if (!(chunk = new_chunk(&ds))) {
+ sr_err("ds: %s: couldn't allocate new chunk", __func__);
+ return SR_ERR_MALLOC;
+ }
+ } else {
chunk = g_slist_last(ds->chunklist)->data;
+ }
/* Get/calculate number of chunks, free space, etc. */
num_chunks = g_slist_length(ds->chunklist);
while (stored < length) {
/* No more free space left, allocate a new chunk. */
if (chunk_bytes_free == 0) {
- chunk = new_chunk(&ds);
+ if (!(chunk = new_chunk(&ds))) {
+ sr_err("ds: %s: couldn't allocate new chunk",
+ __func__);
+ return SR_ERR_MALLOC;
+ }
chunk_bytes_free = DATASTORE_CHUNKSIZE;
chunk_offset = 0;
}
{
gpointer chunk;
- if (!ds) {
- sr_err("ds: %s: ds was NULL", __func__);
- return NULL; /* TODO: SR_ERR_ARG later? */
- }
+ /* Note: Caller checked that ds != NULL. */
chunk = g_try_malloc0(DATASTORE_CHUNKSIZE * (*ds)->ds_unitsize);
if (!chunk) {