Display and control your Android device
Remove sc_queue
Romain Vimont6f38c6311b4d
diff --git a/app/meson.build b/app/meson.buildindex 35934131..e34f7cc1 100644--- a/app/meson.build+++ b/app/meson.build@@ -285,9 +285,6 @@ if get_option('buildtype') == 'debug''tests/test_device_msg_deserialize.c','src/device_msg.c',]],- ['test_queue', [- 'tests/test_queue.c',- ]],['test_strbuf', ['tests/test_strbuf.c','src/util/strbuf.c',diff --git a/app/src/util/queue.h b/app/src/util/queue.hdeleted file mode 100644index 2233eca0..00000000--- a/app/src/util/queue.h+++ /dev/null@@ -1,77 +0,0 @@-// generic intrusive FIFO queue-#ifndef SC_QUEUE_H-#define SC_QUEUE_H--#include "common.h"--#include <assert.h>-#include <stdbool.h>-#include <stddef.h>--// To define a queue type of "struct foo":-// struct queue_foo QUEUE(struct foo);-#define SC_QUEUE(TYPE) { \- TYPE *first; \- TYPE *last; \-}--#define sc_queue_init(PQ) \- (void) ((PQ)->first = (PQ)->last = NULL)--#define sc_queue_is_empty(PQ) \- !(PQ)->first--// NEXTFIELD is the field in the ITEM type used for intrusive linked-list-//-// For example:-// struct foo {-// int value;-// struct foo *next;-// };-//-// // define the type "struct my_queue"-// struct my_queue SC_QUEUE(struct foo);-//-// struct my_queue queue;-// sc_queue_init(&queue);-//-// struct foo v1 = { .value = 42 };-// struct foo v2 = { .value = 27 };-//-// sc_queue_push(&queue, next, v1);-// sc_queue_push(&queue, next, v2);-//-// struct foo *foo;-// sc_queue_take(&queue, next, &foo);-// assert(foo->value == 42);-// sc_queue_take(&queue, next, &foo);-// assert(foo->value == 27);-// assert(sc_queue_is_empty(&queue));-//--// push a new item into the queue-#define sc_queue_push(PQ, NEXTFIELD, ITEM) \- (void) ({ \- (ITEM)->NEXTFIELD = NULL; \- if (sc_queue_is_empty(PQ)) { \- (PQ)->first = (PQ)->last = (ITEM); \- } else { \- (PQ)->last->NEXTFIELD = (ITEM); \- (PQ)->last = (ITEM); \- } \- })--// take the next item and remove it from the queue (the queue must not be empty)-// the result is stored in *(PITEM)-// (without typeof(), we could not store a local variable having the correct-// type so that we can "return" it)-#define sc_queue_take(PQ, NEXTFIELD, PITEM) \- (void) ({ \- assert(!sc_queue_is_empty(PQ)); \- *(PITEM) = (PQ)->first; \- (PQ)->first = (PQ)->first->NEXTFIELD; \- })- // no need to update (PQ)->last if the queue is left empty:- // (PQ)->last is undefined if !(PQ)->first anyway--#endifdiff --git a/app/tests/test_queue.c b/app/tests/test_queue.cdeleted file mode 100644index d8b2b4ec..00000000--- a/app/tests/test_queue.c+++ /dev/null@@ -1,43 +0,0 @@-#include "common.h"--#include <assert.h>--#include "util/queue.h"--struct foo {- int value;- struct foo *next;-};--static void test_queue(void) {- struct my_queue SC_QUEUE(struct foo) queue;- sc_queue_init(&queue);-- assert(sc_queue_is_empty(&queue));-- struct foo v1 = { .value = 42 };- struct foo v2 = { .value = 27 };-- sc_queue_push(&queue, next, &v1);- sc_queue_push(&queue, next, &v2);-- struct foo *foo;-- assert(!sc_queue_is_empty(&queue));- sc_queue_take(&queue, next, &foo);- assert(foo->value == 42);-- assert(!sc_queue_is_empty(&queue));- sc_queue_take(&queue, next, &foo);- assert(foo->value == 27);-- assert(sc_queue_is_empty(&queue));-}--int main(int argc, char *argv[]) {- (void) argc;- (void) argv;-- test_queue();- return 0;-}