diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2011-06-08 21:16:11 +0200 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2011-06-08 21:30:40 +0200 |
| commit | e6fff7235e46b794cd77af516a1ecfab9c87de7f (patch) | |
| tree | 8fc2dcdf98a8476bcd345399b06ae7c4cc72a61f | |
| parent | ff75e8b02dbf35c2ecc82ffd4d2b2112a144322e (diff) | |
| download | tor-e6fff7235e46b794cd77af516a1ecfab9c87de7f.tar tor-e6fff7235e46b794cd77af516a1ecfab9c87de7f.tar.gz | |
Remove a few dead assignments during router parsing
| -rw-r--r-- | changes/coverity_maint | 1 | ||||
| -rw-r--r-- | src/or/routerparse.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/changes/coverity_maint b/changes/coverity_maint index 1bd1c417f..fd8c44050 100644 --- a/changes/coverity_maint +++ b/changes/coverity_maint @@ -1,5 +1,6 @@ o Code simplifications and refactoring: - Remove some dead code as indicated by coverity. + - Remove a few dead assignments during router parsing. Found by coverity. o Minor bugfixes: - Add some forgotten return value checks during unit tests. Found by coverity. diff --git a/src/or/routerparse.c b/src/or/routerparse.c index f855f9d02..42dbcacb5 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1544,10 +1544,10 @@ router_parse_entry_from_string(const char *s, const char *end, } } - if ((tok = find_opt_by_keyword(tokens, K_CACHES_EXTRA_INFO))) + if (find_opt_by_keyword(tokens, K_CACHES_EXTRA_INFO)) router->caches_extra_info = 1; - if ((tok = find_opt_by_keyword(tokens, K_ALLOW_SINGLE_HOP_EXITS))) + if (find_opt_by_keyword(tokens, K_ALLOW_SINGLE_HOP_EXITS)) router->allow_single_hop_exits = 1; if ((tok = find_opt_by_keyword(tokens, K_EXTRA_INFO_DIGEST))) { @@ -1560,7 +1560,7 @@ router_parse_entry_from_string(const char *s, const char *end, } } - if ((tok = find_opt_by_keyword(tokens, K_HIDDEN_SERVICE_DIR))) { + if (find_opt_by_keyword(tokens, K_HIDDEN_SERVICE_DIR)) { router->wants_to_be_hs_dir = 1; } |