Display and control your Android device
Remove cbuf
Romain Vimont338310677e2e
diff --git a/app/meson.build b/app/meson.buildindex a238eb8f..35934131 100644--- a/app/meson.build+++ b/app/meson.build@@ -261,9 +261,6 @@ if get_option('buildtype') == 'debug''tests/test_bytebuf.c','src/util/bytebuf.c',]],- ['test_cbuf', [- 'tests/test_cbuf.c',- ]],['test_cli', ['tests/test_cli.c','src/cli.c',diff --git a/app/src/util/cbuf.h b/app/src/util/cbuf.hdeleted file mode 100644index 2a756171..00000000--- a/app/src/util/cbuf.h+++ /dev/null@@ -1,52 +0,0 @@-// generic circular buffer (bounded queue) implementation-#ifndef SC_CBUF_H-#define SC_CBUF_H--#include "common.h"--#include <stdbool.h>-#include <unistd.h>--// To define a circular buffer type of 20 ints:-// struct cbuf_int CBUF(int, 20);-//-// data has length CAP + 1 to distinguish empty vs full.-#define CBUF(TYPE, CAP) { \- TYPE data[(CAP) + 1]; \- size_t head; \- size_t tail; \-}--#define cbuf_size_(PCBUF) \- (sizeof((PCBUF)->data) / sizeof(*(PCBUF)->data))--#define cbuf_is_empty(PCBUF) \- ((PCBUF)->head == (PCBUF)->tail)--#define cbuf_is_full(PCBUF) \- (((PCBUF)->head + 1) % cbuf_size_(PCBUF) == (PCBUF)->tail)--#define cbuf_init(PCBUF) \- (void) ((PCBUF)->head = (PCBUF)->tail = 0)--#define cbuf_push(PCBUF, ITEM) \- ({ \- bool ok = !cbuf_is_full(PCBUF); \- if (ok) { \- (PCBUF)->data[(PCBUF)->head] = (ITEM); \- (PCBUF)->head = ((PCBUF)->head + 1) % cbuf_size_(PCBUF); \- } \- ok; \- })--#define cbuf_take(PCBUF, PITEM) \- ({ \- bool ok = !cbuf_is_empty(PCBUF); \- if (ok) { \- *(PITEM) = (PCBUF)->data[(PCBUF)->tail]; \- (PCBUF)->tail = ((PCBUF)->tail + 1) % cbuf_size_(PCBUF); \- } \- ok; \- })--#endifdiff --git a/app/tests/test_cbuf.c b/app/tests/test_cbuf.cdeleted file mode 100644index 16674e92..00000000--- a/app/tests/test_cbuf.c+++ /dev/null@@ -1,78 +0,0 @@-#include "common.h"--#include <assert.h>-#include <string.h>--#include "util/cbuf.h"--struct int_queue CBUF(int, 32);--static void test_cbuf_empty(void) {- struct int_queue queue;- cbuf_init(&queue);-- assert(cbuf_is_empty(&queue));-- bool push_ok = cbuf_push(&queue, 42);- assert(push_ok);- assert(!cbuf_is_empty(&queue));-- int item;- bool take_ok = cbuf_take(&queue, &item);- assert(take_ok);- assert(cbuf_is_empty(&queue));-- bool take_empty_ok = cbuf_take(&queue, &item);- assert(!take_empty_ok); // the queue is empty-}--static void test_cbuf_full(void) {- struct int_queue queue;- cbuf_init(&queue);-- assert(!cbuf_is_full(&queue));-- // fill the queue- for (int i = 0; i < 32; ++i) {- bool ok = cbuf_push(&queue, i);- assert(ok);- }- bool ok = cbuf_push(&queue, 42);- assert(!ok); // the queue if full-- int item;- bool take_ok = cbuf_take(&queue, &item);- assert(take_ok);- assert(!cbuf_is_full(&queue));-}--static void test_cbuf_push_take(void) {- struct int_queue queue;- cbuf_init(&queue);-- bool push1_ok = cbuf_push(&queue, 42);- assert(push1_ok);-- bool push2_ok = cbuf_push(&queue, 35);- assert(push2_ok);-- int item;-- bool take1_ok = cbuf_take(&queue, &item);- assert(take1_ok);- assert(item == 42);-- bool take2_ok = cbuf_take(&queue, &item);- assert(take2_ok);- assert(item == 35);-}--int main(int argc, char *argv[]) {- (void) argc;- (void) argv;-- test_cbuf_empty();- test_cbuf_full();- test_cbuf_push_take();- return 0;-}