[tor-commits] [tor/master] Fix a warning about a shadowed global

[nickm at torproject.org]

commit 7751df61ca25a964f20d90e0cb4578e86e1714c9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 9 07:25:52 2017 -0400

    Fix a warning about a shadowed global
---
 src/or/channelpadding.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c
index 481d937..4121651 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