diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-04-18 10:30:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-04-18 10:30:14 -0400 |
| commit | cd1cdae0fac33bca359b34dae4062fe87a351661 (patch) | |
| tree | f050e3190c4f0a2646e41565e45ac3d29ccba232 /src | |
| parent | b00a6211c5680ae79732d701732f7481cf353526 (diff) | |
| download | tor-cd1cdae0fac33bca359b34dae4062fe87a351661.tar.gz tor-cd1cdae0fac33bca359b34dae4062fe87a351661.zip | |
Fix some wide lines
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/routerparse.c | 2 | ||||
| -rw-r--r-- | src/test/test.c | 3 | ||||
| -rw-r--r-- | src/test/test_dir.c | 10 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 370cf2682e..0d535a6c33 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1494,7 +1494,7 @@ extrainfo_parse_entry_from_string(const char *s, const char *end, extrainfo = tor_malloc_zero(sizeof(extrainfo_t)); extrainfo->cache_info.is_extrainfo = 1; if (cache_copy) - extrainfo->cache_info.signed_descriptor_body = tor_memdup_nulterm(s, end-s); + extrainfo->cache_info.signed_descriptor_body = tor_memdup_nulterm(s,end-s); extrainfo->cache_info.signed_descriptor_len = end-s; memcpy(extrainfo->cache_info.signed_descriptor_digest, digest, DIGEST_LEN); diff --git a/src/test/test.c b/src/test/test.c index 42aab4cbc1..c12ba93d79 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -108,7 +108,8 @@ setup_directory(void) r = mkdir(temp_dir); } #else - tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d_%s", (int) getpid(), rnd32); + tor_snprintf(temp_dir, sizeof(temp_dir), "/tmp/tor_test_%d_%s", + (int) getpid(), rnd32); r = mkdir(temp_dir, 0700); #endif if (r) { diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 849bb9e71b..de34b5e3ba 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -611,7 +611,7 @@ test_dir_measured_bw_kb_cache(void) test_assert(dirserv_query_measured_bw_cache_kb(mbwl[0].node_id,NULL, NULL)); test_assert(dirserv_query_measured_bw_cache_kb(mbwl[0].node_id,&bw, NULL)); test_eq(bw, 20); - test_assert(dirserv_query_measured_bw_cache_kb(mbwl[0].node_id,NULL, &as_of)); + test_assert(dirserv_query_measured_bw_cache_kb(mbwl[0].node_id,NULL,&as_of)); test_eq(as_of, MBWC_INIT_TIME); /* Now expire it */ curr += MAX_MEASUREMENT_AGE + 1; @@ -619,7 +619,7 @@ test_dir_measured_bw_kb_cache(void) /* Check that the cache is empty */ test_eq(dirserv_get_measured_bw_cache_size(), 0); /* Check that we can't retrieve it */ - test_assert(!dirserv_query_measured_bw_cache_kb(mbwl[0].node_id, NULL, NULL)); + test_assert(!dirserv_query_measured_bw_cache_kb(mbwl[0].node_id, NULL,NULL)); /* Try caching a few things now */ dirserv_cache_measured_bw(&(mbwl[0]), curr); test_eq(dirserv_get_measured_bw_cache_size(), 1); @@ -2050,7 +2050,7 @@ test_consensus_for_umbw(networkstatus_t *con, time_t now) test_assert(con); test_assert(!con->cert); - /* test_assert(con->consensus_method >= MIN_METHOD_TO_CLIP_UNMEASURED_BW_KB); */ + // test_assert(con->consensus_method >= MIN_METHOD_TO_CLIP_UNMEASURED_BW_KB); test_assert(con->consensus_method >= 16); test_eq(4, smartlist_len(con->routerstatus_list)); /* There should be four listed routers; all voters saw the same in this */ @@ -2176,8 +2176,8 @@ test_dir_clip_unmeasured_bw_kb(void) } /** - * This version of test_dir_clip_unmeasured_bw_kb() uses a non-default choice of - * clip bandwidth. + * This version of test_dir_clip_unmeasured_bw_kb() uses a non-default choice + * of clip bandwidth. */ static void |