sys/chunked_ringbuffer: let crb_end_chunk() return size of the chunk

benpicco · benpicco · commit 34296219116c · 2025-01-29T11:54:08.000+01:00
diff --git a/sys/chunked_ringbuffer/chunked_ringbuffer.c b/sys/chunked_ringbuffer/chunked_ringbuffer.c
@@ -87,13 +87,13 @@ static unsigned _get_cur_len(chunk_ringbuf_t *rb)
     }
 }
 
-bool crb_end_chunk(chunk_ringbuf_t *rb, bool keep)
+unsigned crb_end_chunk(chunk_ringbuf_t *rb, bool keep)
 {
     int idx;
 
     /* no chunk was started */
     if (rb->cur_start == NULL) {
-        return false;
+        return 0;
     }
 
     if (keep) {
@@ -109,15 +109,15 @@ bool crb_end_chunk(chunk_ringbuf_t *rb, bool keep)
         }
         rb->cur = rb->cur_start;
         rb->cur_start = NULL;
-        return false;
+        return 0;
     }
 
     /* store complete chunk */
     rb->chunk_start[idx] = rb->cur_start;
     rb->chunk_len[idx] = _get_cur_len(rb);
     rb->cur_start = NULL;
 
-    return true;
+    return rb->chunk_len[idx];
 }
 
 bool crb_get_chunk_size(chunk_ringbuf_t *rb, size_t *len)
diff --git a/sys/include/chunked_ringbuffer.h b/sys/include/chunked_ringbuffer.h
@@ -82,10 +82,10 @@ void crb_init(chunk_ringbuf_t *rb, void *buffer, size_t len);
  * @param[in] valid     True if the chunk is valid and should be stored
  *                      False if the current chunk should be discarded
  *
- * @return true         If the chunk could be stored in the valid chunk array
- * @return false        If there is no more space in the valid chunk array
+ * @return size of chunk if the chunk could be stored in the valid chunk array
+ * @return 0 if there is no more space in the valid chunk array
  */
-bool crb_end_chunk(chunk_ringbuf_t *rb, bool valid);
+unsigned crb_end_chunk(chunk_ringbuf_t *rb, bool valid);
 
 /**
  * @brief Start a new chunk on the ringbuffer

Original file line number	Diff line number	Diff line change
`@@ -87,13 +87,13 @@ static unsigned _get_cur_len(chunk_ringbuf_t *rb)`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
`90`		`-bool crb_end_chunk(chunk_ringbuf_t *rb, bool keep)`
	`90`	`+unsigned crb_end_chunk(chunk_ringbuf_t *rb, bool keep)`
`91`	`91`	`{`
`92`	`92`	`int idx;`
`93`	`93`
`94`	`94`	`/* no chunk was started */`
`95`	`95`	`if (rb->cur_start == NULL) {`
`96`		`- return false;`
	`96`	`+ return 0;`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if (keep) {`
`@@ -109,15 +109,15 @@ bool crb_end_chunk(chunk_ringbuf_t *rb, bool keep)`
`109`	`109`	`}`
`110`	`110`	`rb->cur = rb->cur_start;`
`111`	`111`	`rb->cur_start = NULL;`
`112`		`- return false;`
	`112`	`+ return 0;`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`/* store complete chunk */`
`116`	`116`	`rb->chunk_start[idx] = rb->cur_start;`
`117`	`117`	`rb->chunk_len[idx] = _get_cur_len(rb);`
`118`	`118`	`rb->cur_start = NULL;`
`119`	`119`
`120`		`- return true;`
	`120`	`+ return rb->chunk_len[idx];`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`bool crb_get_chunk_size(chunk_ringbuf_t rb, size_t len)`