onion_queue.c: use TAILQ_HEAD less confusingly.

When we use macro inline, clang-format likes to break it in the
middle, which makes checkSpace get confused.
This commit is contained in:
Nick Mathewson 2020-01-10 09:25:40 -05:00
parent c8fae6b5c8
commit e9b663beaf

View File

@ -49,10 +49,12 @@ typedef struct onion_queue_t {
/** 5 seconds on the onion queue til we just send back a destroy */ /** 5 seconds on the onion queue til we just send back a destroy */
#define ONIONQUEUE_WAIT_CUTOFF 5 #define ONIONQUEUE_WAIT_CUTOFF 5
TOR_TAILQ_HEAD(onion_queue_head_t, onion_queue_t);
typedef struct onion_queue_head_t onion_queue_head_t;
/** Array of queues of circuits waiting for CPU workers. An element is NULL /** Array of queues of circuits waiting for CPU workers. An element is NULL
* if that queue is empty.*/ * if that queue is empty.*/
static TOR_TAILQ_HEAD(onion_queue_head_t, onion_queue_t) static onion_queue_head_t ol_list[MAX_ONION_HANDSHAKE_TYPE+1] =
ol_list[MAX_ONION_HANDSHAKE_TYPE+1] =
{ TOR_TAILQ_HEAD_INITIALIZER(ol_list[0]), /* tap */ { TOR_TAILQ_HEAD_INITIALIZER(ol_list[0]), /* tap */
TOR_TAILQ_HEAD_INITIALIZER(ol_list[1]), /* fast */ TOR_TAILQ_HEAD_INITIALIZER(ol_list[1]), /* fast */
TOR_TAILQ_HEAD_INITIALIZER(ol_list[2]), /* ntor */ TOR_TAILQ_HEAD_INITIALIZER(ol_list[2]), /* ntor */