[or-cvs] r11407: Another round of whitespeace fixes. (in tor/trunk: . src/common src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-09-08 16:25:57 -0400 (Sat, 08 Sep 2007)
New Revision: 11407

Modified:
   tor/trunk/
   tor/trunk/src/common/util.c
   tor/trunk/src/or/control.c
   tor/trunk/src/or/dirvote.c
Log:
 r14363 at Kushana:  nickm | 2007-09-08 16:25:45 -0400
 Another round of whitespeace fixes.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14363] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/src/common/util.c
===================================================================
--- tor/trunk/src/common/util.c	2007-09-08 19:08:46 UTC (rev 11406)
+++ tor/trunk/src/common/util.c	2007-09-08 20:25:57 UTC (rev 11407)
@@ -1263,8 +1263,8 @@
  * model the user's computer as being "skewed" from accurate time by
  * -<b>ftime_skew</b> seconds, such that our best guess of the current time is
  * time(NULL)+ftime_skew.  We also assume that our measurements of time may
- * have up to <b>ftime_slop</b> seconds of inaccuracy; hence, the 
- * measurements;
+ * have up to <b>ftime_slop</b> seconds of inaccuracy; IOW, our window of
+ * estimate for the current time is now + ftime_skew +/- ftime_slop.
  */
 static int ftime_skew = 0;
 static int ftime_slop = 60;
@@ -1290,13 +1290,13 @@
 int
 ftime_maybe_after(time_t now, time_t when)
 {
-  /* It may be after when iff the latest possible current time is after when. */
+  /* It may be after when iff the latest possible current time is after when */
   return (now + ftime_skew + ftime_slop) >= when;
 }
 int
 ftime_maybe_before(time_t now, time_t when)
 {
-  /* It may be before when iff the earliest possible current time is before. */
+  /* It may be before when iff the earliest possible current time is before */
   return (now + ftime_skew - ftime_slop) < when;
 }
 int

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2007-09-08 19:08:46 UTC (rev 11406)
+++ tor/trunk/src/or/control.c	2007-09-08 20:25:57 UTC (rev 11407)
@@ -995,8 +995,8 @@
     int also_password = options->HashedControlPassword != NULL;
     if (password_len != AUTHENTICATION_COOKIE_LEN) {
       if (!also_password) {
-        log_warn(LD_CONTROL, "Got authentication cookie with wrong length (%d)",
-                 (int)password_len);
+        log_warn(LD_CONTROL, "Got authentication cookie with wrong length "
+                 "(%d)", (int)password_len);
         errstr = "Wrong length on authentication cookie.";
         goto err;
       }
@@ -1021,7 +1021,7 @@
       if (!also_cookie) {
         log_warn(LD_CONTROL,
                  "Couldn't decode HashedControlPassword: invalid base16");
-        errstr ="Couldn't decode HashedControlPassword value in configuration.";
+        errstr="Couldn't decode HashedControlPassword value in configuration.";
       }
       bad_password = 1;
     } else {
@@ -1290,7 +1290,6 @@
   return tor_strndup(ri_body, ri->signed_descriptor_len);
 }
 
-
 /** Implementation helper for GETINFO: knows the answers for questions about
  * directory information. */
 static int

Modified: tor/trunk/src/or/dirvote.c
===================================================================
--- tor/trunk/src/or/dirvote.c	2007-09-08 19:08:46 UTC (rev 11406)
+++ tor/trunk/src/or/dirvote.c	2007-09-08 20:25:57 UTC (rev 11407)
@@ -16,7 +16,7 @@
 static int dirvote_add_signatures_to_pending_consensus(
                        const char *detached_signatures_body,
                        const char **msg_out);
-static char *list_v3_auth_ids(void); //XXXX020 nuke this.
+static char *list_v3_auth_ids(void);
 
 /* =====
  * Voting and consensus generation