fix typos, streamline

svn:r337

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 86851a14b02a82802ac7502d6269cbcb48705d47..8367018839bff9e221007603abfa9f107fb46e94 100644 (file)
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -179,7 +179,7 @@ crypto_create_init_cipher(int cipher_type, char *key, char *iv, int encrypt_mode
     r = crypto_cipher_decrypt_init_cipher(crypto);
 
   if (r) {
-    log_fn(LOG_ERR, "Unabble to initialize cipher: %s", crypto_perror());
+    log_fn(LOG_ERR, "Unable to initialize cipher: %s", crypto_perror());
     goto error;
   }
   return crypto;
@@ -800,7 +800,6 @@ int crypto_seed_rng()
     f = fopen(filenames[i], "rb");
     if (!f) continue;
     log_fn(LOG_INFO, "Seeding RNG from %s", filenames[i]);
-    buf[20]='\xff';
     n = fread(buf, 1, 20, f);
     fclose(f);
     if (n != 20) {

diff --git a/src/common/fakepoll.c b/src/common/fakepoll.c
index 168d1e9660e638d142652b197a14efbd0dc4e6e4..9b2493e62b7b426bd9d82c8828bc3d3f735d83d7 100644 (file)
--- a/src/common/fakepoll.c
+++ b/src/common/fakepoll.c
@@ -6,14 +6,6 @@
  * Nick Mathewson <nickm@freehaven.net>
  */
 
-
-/*
- * Changes :
- * $Log$
- * Revision 1.1  2002/09/03 18:43:50  nickm
- * Add function to fake a poll call using select
- *
- */
 #include "fakepoll.h"
 
 #ifdef USE_FAKE_POLL

diff --git a/src/common/fakepoll.h b/src/common/fakepoll.h
index ca7f44a4ea2d6d4a24815dc94aaaf184a7cde898..353e11ee4ec3882aadbd80bd30273bb90f360eed 100644 (file)
--- a/src/common/fakepoll.h
+++ b/src/common/fakepoll.h
@@ -6,16 +6,6 @@
  * Nick Mathewson <nickm@freehaven.net>
  */
 
-/*
- * Changes :
- * $Log$
- * Revision 1.2  2003/05/09 02:25:37  nickm
- * work on versioning; new log_fn function
- *
- * Revision 1.1  2002/09/03 18:43:50  nickm
- * Add function to fake a poll call using select
- *
- */
 #ifndef __FAKEPOLL_H
 #define __FAKEPOLL_H
 

diff --git a/src/common/util.c b/src/common/util.c
index 4160b16787d5b89293b422216cbc085ecd52f1e9..5eaa88f4f14b427aba4025ac1bb72ff90e55ab4f 100644 (file)
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -44,14 +44,6 @@ tv_udiff(struct timeval *start, struct timeval *end)
     return LONG_MAX;
   }
 
-  /*
-    This is a no-op: "secdiff--" takes 1M from the final result,
-    and "end_usec+=100000L" puts it back.
-  if (end_usec < start->tv_usec) {
-    secdiff--;
-    end_usec += 1000000L;
-  }
-  */
   udiff = secdiff*1000000L + (end_usec - start->tv_usec);
   if(udiff < 0) {
     log_fn(LOG_NOTICE, "start is after end. Returning 0.");