From 219ca4fc80ef6491555b403c6884566c8e1deefd Mon Sep 17 00:00:00 2001
From: Rich Barlow <rich@bennellick.com>
Date: 周一, 10 4月 2017 18:38:40 +0800
Subject: [PATCH] Don't reference malloc if not using alloc/free
---
libscpi/src/fifo.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/libscpi/src/fifo.c b/libscpi/src/fifo.c
index 6c125ff..a97ab7a 100644
--- a/libscpi/src/fifo.c
+++ b/libscpi/src/fifo.c
@@ -48,14 +48,16 @@
* @param info
* @return
*/
-scpi_bool_t fifo_add(scpi_fifo_t * fifo, int16_t err, char * info) {
+scpi_bool_t fifo_add(scpi_fifo_t * fifo, const scpi_error_t * value) {
/* FIFO full? */
if (fifo_is_full(fifo)) {
return FALSE;
}
+ if (!value) {
+ return FALSE;
+ }
- fifo->data[fifo->wr].error_code = err;
- fifo->data[fifo->wr].device_dependent_info = info;
+ fifo->data[fifo->wr] = *value;
fifo->wr = (fifo->wr + 1) % (fifo->size);
fifo->count += 1;
return TRUE;
--
Gitblit v1.9.1