commit 59ba61a69050edacb560a9fa6ad302346e14095e Author: Nick Mathewson nickm@torproject.org Date: Sat Nov 16 15:27:08 2019 -0500

Make structs declared by tor_queues.h macros also follow naming rules --- src/core/or/cell_queue_st.h | 2 +- src/core/or/channel.c | 4 ++-- src/core/or/destroy_cell_queue_st.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/or/cell_queue_st.h b/src/core/or/cell_queue_st.h index 763bc5bc1..7befd2e83 100644 --- a/src/core/or/cell_queue_st.h +++ b/src/core/or/cell_queue_st.h @@ -27,7 +27,7 @@ struct packed_cell_t { * or_connection_t's outbuf. */ struct cell_queue_t { /** Linked list of packed_cell_t*/ - TOR_SIMPLEQ_HEAD(cell_simpleq, packed_cell_t) head; + TOR_SIMPLEQ_HEAD(cell_simpleq_t, packed_cell_t) head; int n; /**< The number of cells in the queue. */ };

diff --git a/src/core/or/channel.c b/src/core/or/channel.c index 31a33325f..1641a9680 100644 --- a/src/core/or/channel.c +++ b/src/core/or/channel.c @@ -143,7 +143,7 @@ static HT_HEAD(channel_idmap, channel_idmap_entry_t) channel_identity_map = typedef struct channel_idmap_entry_t { HT_ENTRY(channel_idmap_entry_t) node; uint8_t digest[DIGEST_LEN]; - TOR_LIST_HEAD(channel_list_s, channel_t) channel_list; + TOR_LIST_HEAD(channel_list_t, channel_t) channel_list; } channel_idmap_entry_t;

static inline unsigned @@ -3406,7 +3406,7 @@ channel_sort_by_ed25519_identity(const void **a_, const void **b_) * all of which MUST have the same RSA ID. (They MAY have different * Ed25519 IDs.) */ static void -channel_rsa_id_group_set_badness(struct channel_list_s *lst, int force) +channel_rsa_id_group_set_badness(struct channel_list_t *lst, int force) { /*XXXX This function should really be about channels. 15056 */ channel_t *chan = TOR_LIST_FIRST(lst); diff --git a/src/core/or/destroy_cell_queue_st.h b/src/core/or/destroy_cell_queue_st.h index 3c4df050c..3b019ab1c 100644 --- a/src/core/or/destroy_cell_queue_st.h +++ b/src/core/or/destroy_cell_queue_st.h @@ -26,7 +26,7 @@ struct destroy_cell_t { /** A queue of destroy cells on a channel. */ struct destroy_cell_queue_t { /** Linked list of packed_cell_t */ - TOR_SIMPLEQ_HEAD(dcell_simpleq, destroy_cell_t) head; + TOR_SIMPLEQ_HEAD(dcell_simpleq_t, destroy_cell_t) head; int n; /**< The number of cells in the queue. */ };