瀏覽代碼

Remove dead code in networkstatus.c

We can't end up in the removed else {} condition since we first validate the
flavor we get and then we validate the flavor we parse from the given
consensus which means we can only handle the two flavors of the if/elseif
conditions.

Fixes #25914

Signed-off-by: David Goulet <dgoulet@torproject.org>
David Goulet 7 年之前
父節點
當前提交
1a181a476e
共有 1 個文件被更改,包括 3 次插入11 次删除
  1. 3 11
      src/or/networkstatus.c

+ 3 - 11
src/or/networkstatus.c

@@ -1841,17 +1841,9 @@ networkstatus_set_current_consensus(const char *consensus,
       current_valid_after = current_md_consensus->valid_after;
     }
   } else {
-    cached_dir_t *cur;
-    char buf[128];
-    tor_snprintf(buf, sizeof(buf), "cached-%s-consensus", flavor);
-    consensus_fname = get_cachedir_fname(buf);
-    tor_snprintf(buf, sizeof(buf), "unverified-%s-consensus", flavor);
-    unverified_fname = get_cachedir_fname(buf);
-    cur = dirserv_get_consensus(flavor);
-    if (cur) {
-      current_digests = &cur->digests;
-      current_valid_after = cur->published;
-    }
+    tor_assert_nonfatal_unreached();
+    result = -2;
+    goto done;
   }
 
   if (current_digests &&