[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] fix typos, streamline



Update of /home/or/cvsroot/src/common
In directory moria.mit.edu:/home/arma/work/onion/cvs/src/common

Modified Files:
	crypto.c fakepoll.c fakepoll.h util.c 
Log Message:
fix typos, streamline


Index: crypto.c
===================================================================
RCS file: /home/or/cvsroot/src/common/crypto.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- crypto.c	17 Jun 2003 22:18:25 -0000	1.24
+++ crypto.c	18 Jun 2003 07:44:48 -0000	1.25
@@ -179,7 +179,7 @@
     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 @@
     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) {

Index: fakepoll.c
===================================================================
RCS file: /home/or/cvsroot/src/common/fakepoll.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fakepoll.c	3 Sep 2002 18:43:50 -0000	1.1
+++ fakepoll.c	18 Jun 2003 07:44:48 -0000	1.2
@@ -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

Index: fakepoll.h
===================================================================
RCS file: /home/or/cvsroot/src/common/fakepoll.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fakepoll.h	9 May 2003 02:25:37 -0000	1.2
+++ fakepoll.h	18 Jun 2003 07:44:48 -0000	1.3
@@ -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
 

Index: util.c
===================================================================
RCS file: /home/or/cvsroot/src/common/util.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- util.c	17 Jun 2003 22:18:25 -0000	1.6
+++ util.c	18 Jun 2003 07:44:48 -0000	1.7
@@ -44,14 +44,6 @@
     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.");