diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-03 10:09:20 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-03 10:09:20 -0500 |
| commit | 6b3c07648ce5860f5ef0f4193eb812e971c02407 (patch) | |
| tree | 474aee860331c0c7515ac42188b0d4117c370265 /src/test | |
| parent | b62b40a572d8693daa5851eee5f423007535b3b6 (diff) | |
| parent | 9ef97a268b06fed7b07908823600911a2a6eadc1 (diff) | |
| download | tor-6b3c07648ce5860f5ef0f4193eb812e971c02407.tar.gz tor-6b3c07648ce5860f5ef0f4193eb812e971c02407.zip | |
Merge branch 'maint-0.3.2'
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_hs_common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index b9b76d15bd..21daa58abd 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -971,12 +971,12 @@ helper_init_service(time_t now) /* Helper function to set the RFC 1123 time string into t. */ static void -set_consensus_times(const char *time, time_t *t) +set_consensus_times(const char *timestr, time_t *t) { - tt_assert(time); + tt_assert(timestr); tt_assert(t); - int ret = parse_rfc1123_time(time, t); + int ret = parse_rfc1123_time(timestr, t); tt_int_op(ret, OP_EQ, 0); done: |