[or-cvs] Would you believe that the software_versions field of route...

[Nick Mathewson]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv843/src/or

Modified Files:
	or.h routerlist.c routerparse.c 
Log Message:
Would you believe that the software_versions field of routerlist_t was never actually used for anything?

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.681
retrieving revision 1.682
diff -u -d -r1.681 -r1.682
--- or.h	14 Sep 2005 21:09:25 -0000	1.681
+++ or.h	14 Sep 2005 21:38:05 -0000	1.682
@@ -845,12 +845,12 @@
 typedef struct {
   /** List of routerinfo_t. */
   smartlist_t *routers;
-  /** Which versions of tor are recommended by this directory? */
-  char *software_versions;
   /** When was the most recent directory that contributed to this list
    * published? */
   time_t published_on;
 #if 0
+  /** Which versions of tor are recommended by this directory? */
+  char *software_versions;
   time_t running_routers_updated_on;
   /** What is the most recently received running_routers structure? */
   running_routers_t *running_routers;

Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/routerlist.c,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -d -r1.288 -r1.289
--- routerlist.c	14 Sep 2005 21:09:25 -0000	1.288
+++ routerlist.c	14 Sep 2005 21:38:05 -0000	1.289
@@ -980,7 +980,6 @@
   SMARTLIST_FOREACH(rl->routers, routerinfo_t *, r,
                     routerinfo_free(r));
   smartlist_free(rl->routers);
-  tor_free(rl->software_versions);
   tor_free(rl);
 }
 
@@ -1305,9 +1304,6 @@
     });
     smartlist_clear(new_list->routers);
     routerlist->published_on = new_list->published_on;
-    tor_free(routerlist->software_versions);
-    routerlist->software_versions = new_list->software_versions;
-    new_list->software_versions = NULL;
     routerlist_free(new_list);
     control_event_descriptors_changed(changed);
     smartlist_free(changed);

Index: routerparse.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/routerparse.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- routerparse.c	14 Sep 2005 21:09:25 -0000	1.138
+++ routerparse.c	14 Sep 2005 21:38:05 -0000	1.139
@@ -539,7 +539,6 @@
     goto err;
   }
 
-  new_dir->software_versions = versions; versions = NULL;
   new_dir->published_on = published_on;
 
   SMARTLIST_FOREACH(tokens, directory_token_t *, tok, token_free(tok));