diff options
author | Uros Majstorovic <majstor@majstor.org> | 2017-08-16 21:21:33 +0200 |
---|---|---|
committer | Uros Majstorovic <majstor@majstor.org> | 2017-08-16 21:21:33 +0200 |
commit | 8f44e2151cb3f91b220c4a3393a06068d0ee7302 (patch) | |
tree | 8320c304887ac9b0d922bc27b51330c084f34ee0 /code/core/rbuf.c | |
parent | 38e2385f5846860916f8880d818b3b024b8c7dd9 (diff) |
fixed rbuf; fixed error code for pthread_mitex_init
Diffstat (limited to 'code/core/rbuf.c')
-rw-r--r-- | code/core/rbuf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/code/core/rbuf.c b/code/core/rbuf.c index f13e06e..b384774 100644 --- a/code/core/rbuf.c +++ b/code/core/rbuf.c @@ -27,7 +27,7 @@ int ecp_rbuf_msg_idx(ECPRBuffer *rbuf, ecp_seq_t seq) { // This also checks for seq_start <= seq if seq type range >> rbuf->msg_size if (seq_offset < rbuf->msg_size) return ECP_RBUF_IDX_MASK(rbuf->msg_start + seq_offset, rbuf->msg_size); - return ECP_ERR_RBUF_IDX; + return ECP_ERR_RBUF_FULL; } ssize_t ecp_rbuf_msg_store(ECPRBuffer *rbuf, ecp_seq_t seq, int idx, unsigned char *msg, size_t msg_size, unsigned char test_flags, unsigned char set_flags) { @@ -35,8 +35,10 @@ ssize_t ecp_rbuf_msg_store(ECPRBuffer *rbuf, ecp_seq_t seq, int idx, unsigned ch if (idx < 0) return idx; if (rbuf->msg == NULL) return 0; - if (test_flags && (test_flags & rbuf->msg[idx].flags)) return ECP_ERR_RBUF_FLAG; + if (test_flags && (test_flags & rbuf->msg[idx].flags)) return ECP_ERR_RBUF_DUP; + if (ECP_RBUF_SEQ_LT(rbuf->seq_max, seq)) rbuf->seq_max = seq; + if (!(set_flags & ECP_RBUF_FLAG_DELIVERED)) { memcpy(rbuf->msg[idx].msg, msg, msg_size); rbuf->msg[idx].size = msg_size; |