r17914@catbus: nickm | 2008-02-05 16:12:16 -0500

 Remove or downgrade some XXX020 items.


svn:r13388

6 files changed, 7 insertions, 7 deletions

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index a9de11568..9c67abaff 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -1106,7 +1106,6 @@ ns_detached_signatures_free(ns_detached_signatures_t *s)
  * Certificate functions
  * ===== */
 
-/*XXXX020 make this static? */
 /** Allocate and return a new authority_cert_t with the same contents as
  * <b>cert</b>. */
 authority_cert_t *
diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index f6dbe0301..17f9e5de5 100644
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -122,7 +122,7 @@ typedef int socklen_t;
 #include <stdio.h>
 #endif
 
-/*XXXX020 for debugging possible memory leaks. */
+/* for debugging possible memory leaks. */
 #define malloc(x) tor_malloc(x)
 #define realloc(x,y) tor_realloc((x),(y))
 #define free(x) tor_free(x)
diff --git a/src/or/eventdns_tor.h b/src/or/eventdns_tor.h
index 77ccd1eb7..e0e0f9b16 100644
--- a/src/or/eventdns_tor.h
+++ b/src/or/eventdns_tor.h
@@ -19,7 +19,7 @@ typedef unsigned char u_char;
 #define WIN32
 #endif
 
-/* XXXX020 These are for debugging possible memory leaks. */
+/* These are for debugging possible memory leaks. */
 #include "util.h"
 #include "compat.h"
 
diff --git a/src/or/geoip.c b/src/or/geoip.c
index 9ae1bb288..eecb5ea4e 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -145,7 +145,7 @@ geoip_load_file(const char *filename)
     char buf[512];
     if (fgets(buf, sizeof(buf), f) == NULL)
       break;
-    /* XXXX020 track full country name. */
+    /* FFFF track full country name. */
     geoip_parse_entry(buf);
   }
   /*XXXX020 abort and return -1 if no entries/illformed?*/
diff --git a/src/or/ntmain.c b/src/or/ntmain.c
index c312bbe72..e786e5bdd 100644
--- a/src/or/ntmain.c
+++ b/src/or/ntmain.c
@@ -25,8 +25,10 @@ const char ntmain_c_id[] =
 static SERVICE_STATUS service_status;
 static SERVICE_STATUS_HANDLE hStatus;
 
-/* XXXX020 This 'backup argv' and 'backup argc' business is an ugly hack. This
- * is a job for arguments, not globals. */
+/* XXXX This 'backup argv' and 'backup argc' business is an ugly hack. This
+ * is a job for arguments, not globals.  Alas, some of the functions that
+ * use them use them need to have fixed signatures, so they can be passed
+ * to the NT service functions. */
 static char **backup_argv;
 static int backup_argc;
 static char* nt_strerror(uint32_t errnum);
diff --git a/src/or/router.c b/src/or/router.c
index 349c11954..a24a6dfe7 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -261,7 +261,6 @@ init_key_from_file(const char *fname, int generate, int severity)
 /** Load the v3 (voting) authority signing key and certificate, if they are
  * present.  Return -1 if anything is missing, mismatched, or unloadable;
  * return 0 on success. */
-/* XXXX020 maybe move to dirserv.c or dirvote.c */
 static int
 init_v3_authority_keys(void)
 {