aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2003-06-18 07:44:48 +0000
committerRoger Dingledine <arma@torproject.org>2003-06-18 07:44:48 +0000
commit968d31162b685d8f9e53a46124d4d12cba81d8b4 (patch)
tree61f33d7a261292f5ac69849b521b05cd5af35c34 /src
parent8d4cd5d604b22823754190ceb5c2126a15b7cf76 (diff)
downloadtor-968d31162b685d8f9e53a46124d4d12cba81d8b4.tar
tor-968d31162b685d8f9e53a46124d4d12cba81d8b4.tar.gz
fix typos, streamline
svn:r337
Diffstat (limited to 'src')
-rw-r--r--src/common/crypto.c3
-rw-r--r--src/common/fakepoll.c8
-rw-r--r--src/common/fakepoll.h10
-rw-r--r--src/common/util.c8
4 files changed, 1 insertions, 28 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 86851a14b..836701883 100644
--- 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 168d1e966..9b2493e62 100644
--- 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 ca7f44a4e..353e11ee4 100644
--- 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 4160b1678..5eaa88f4f 100644
--- 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.");