diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-09 07:25:52 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-09 07:25:52 -0400 |
| commit | 7751df61ca25a964f20d90e0cb4578e86e1714c9 (patch) | |
| tree | 4f3e9f0b969abbf58ba7bab89a477aa51efc7726 /src/or/channelpadding.c | |
| parent | ef2248d09bf8dbe7f8213d5580b2a21d56fdcbef (diff) | |
| download | tor-7751df61ca25a964f20d90e0cb4578e86e1714c9.tar.gz tor-7751df61ca25a964f20d90e0cb4578e86e1714c9.zip | |
Fix a warning about a shadowed global
Diffstat (limited to 'src/or/channelpadding.c')
| -rw-r--r-- | src/or/channelpadding.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c index 481d937423..4121651562 100644 --- a/src/or/channelpadding.c +++ b/src/or/channelpadding.c @@ -402,10 +402,10 @@ channelpadding_send_padding_cell_for_callback(channel_t *chan) */ static void channelpadding_send_padding_callback(tor_timer_t *timer, void *args, - const struct monotime_t *time) + const struct monotime_t *when) { channel_t *chan = channel_handle_get((struct channel_handle_t*)args); - (void)timer; (void)time; + (void)timer; (void)when; if (chan && CHANNEL_CAN_HANDLE_CELLS(chan)) { /* Hrmm.. It might be nice to have an equivalent to assert_connection_ok |