commit 29982e51909c657d3d1323e332d4517d9e9f8046 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 18 16:04:47 2018 -0400
Remove redundant typedefs from _st.h files
The typedefs are already in or.h --- src/or/connection_st.h | 5 ++--- src/or/dir_server_st.h | 5 ++--- src/or/networkstatus_voter_info_st.h | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/or/connection_st.h b/src/or/connection_st.h index b65238693..b327fbc1a 100644 --- a/src/or/connection_st.h +++ b/src/or/connection_st.h @@ -27,7 +27,7 @@ struct buf_t; * conn->outbuf. Connections differ primarily in the functions called * to fill and drain these buffers. */ -typedef struct connection_t { +struct connection_t { uint32_t magic; /**< For memory debugging: must equal one of * *_CONNECTION_MAGIC. */
@@ -126,7 +126,6 @@ typedef struct connection_t { /** Bytes written since last call to control_event_conn_bandwidth_used(). * Only used if we're configured to emit CONN_BW events. */ uint32_t n_written_conn_bw; -} connection_t; +};
#endif - diff --git a/src/or/dir_server_st.h b/src/or/dir_server_st.h index b9d3f1c55..73aa5da06 100644 --- a/src/or/dir_server_st.h +++ b/src/or/dir_server_st.h @@ -13,7 +13,7 @@
/** Represents information about a single trusted or fallback directory * server. */ -typedef struct dir_server_t { +struct dir_server_t { char *description; char *nickname; char *address; /**< Hostname. */ @@ -49,7 +49,6 @@ typedef struct dir_server_t { * as a routerstatus_t. Not updated by the * router-status management code! **/ -} dir_server_t; +};
#endif - diff --git a/src/or/networkstatus_voter_info_st.h b/src/or/networkstatus_voter_info_st.h index 32ea597bd..56b89b412 100644 --- a/src/or/networkstatus_voter_info_st.h +++ b/src/or/networkstatus_voter_info_st.h @@ -8,7 +8,7 @@ #define NETWORKSTATUS_VOTER_INFO_ST_H
/** Information about a single voter in a vote or a consensus. */ -typedef struct networkstatus_voter_info_t { +struct networkstatus_voter_info_t { /** Declared SHA-1 digest of this voter's identity key */ char identity_digest[DIGEST_LEN]; char *nickname; /**< Nickname of this voter */ @@ -25,7 +25,6 @@ typedef struct networkstatus_voter_info_t { /* Nothing from here on is signed. */ /** The signature of the document and the signature's status. */ smartlist_t *sigs; -} networkstatus_voter_info_t; +};
#endif -