r8957@totoro: nickm | 2006-10-08 22:35:17 -0400

 The otherwise regrettable MIPSpro C compiler warns about values set but never used, and about mixing enums and ints; these are good warnings, and so should be fixed.  This removes some dead code and some potential bugs. Thanks to pnx.


svn:r8664

1 files changed, 1 insertions, 4 deletions

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index f76cfecafb..060f3b7839 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -110,7 +110,7 @@ typedef enum {
 
 /** Table mapping keywords to token value and to argument rules. */
 static struct {
-  const char *t; int v; arg_syntax s; obj_syntax os; int ws;
+  const char *t; directory_keyword v; arg_syntax s; obj_syntax os; int ws;
 } token_table[] = {
   { "accept",              K_ACCEPT,              ARGS,    NO_OBJ,  RTR },
   { "directory-signature", K_DIRECTORY_SIGNATURE, ARGS,    NEED_OBJ,
@@ -265,15 +265,12 @@ router_append_dirobj_signature(char *buf, size_t buf_len, const char *digest,
 version_status_t
 tor_version_is_obsolete(const char *myversion, const char *versionlist)
 {
-  const char *vl;
   tor_version_t mine, other;
   int found_newer = 0, found_older = 0, found_newer_in_series = 0,
     found_any_in_series = 0, r, same;
   version_status_t ret = VS_UNRECOMMENDED;
   smartlist_t *version_sl;
 
-  vl = versionlist;
-
   log_debug(LD_CONFIG,"Checking whether version '%s' is in '%s'",
             myversion, versionlist);