diff options
| author | teor <teor@torproject.org> | 2019-11-18 11:21:37 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-18 11:21:37 +1000 |
| commit | c34fb3413dee5be00be7299a63c294ddb86b0599 (patch) | |
| tree | 61bf8e02a341314267f8820ea7ebcc50259f27a7 /src/feature/control | |
| parent | 183f89ccacdf7ca140f6d83345a9389e94119f5e (diff) | |
| parent | 59ba61a69050edacb560a9fa6ad302346e14095e (diff) | |
| download | tor-c34fb3413dee5be00be7299a63c294ddb86b0599.tar.gz tor-c34fb3413dee5be00be7299a63c294ddb86b0599.zip | |
Merge remote-tracking branch 'tor-github/pr/1517'
Diffstat (limited to 'src/feature/control')
| -rw-r--r-- | src/feature/control/control_events.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index 12b73641b2..2b7f2a83b8 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -317,7 +317,7 @@ control_per_second_events(void) /** Represents an event that's queued to be sent to one or more * controllers. */ -typedef struct queued_event_s { +typedef struct queued_event_t { uint16_t event; char *msg; } queued_event_t; @@ -1211,7 +1211,7 @@ control_event_circuit_cell_stats(void) static int next_measurement_idx = 0; /* number of entries set in n_measurements */ static int n_measurements = 0; -static struct cached_bw_event_s { +static struct cached_bw_event_t { uint32_t n_read; uint32_t n_written; } cached_bw_events[N_BW_EVENTS_TO_CACHE]; @@ -1250,7 +1250,7 @@ get_bw_samples(void) for (i = 0; i < n_measurements; ++i) { tor_assert(0 <= idx && idx < N_BW_EVENTS_TO_CACHE); - const struct cached_bw_event_s *bwe = &cached_bw_events[idx]; + const struct cached_bw_event_t *bwe = &cached_bw_events[idx]; smartlist_add_asprintf(elements, "%u,%u", (unsigned)bwe->n_read, |