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

[or-cvs] r16555: {tor} spaceman (tor/trunk/src/or)



Author: weasel
Date: 2008-08-14 19:09:48 -0400 (Thu, 14 Aug 2008)
New Revision: 16555

Modified:
   tor/trunk/src/or/dirvote.c
Log:
spaceman

Modified: tor/trunk/src/or/dirvote.c
===================================================================
--- tor/trunk/src/or/dirvote.c	2008-08-14 23:01:31 UTC (rev 16554)
+++ tor/trunk/src/or/dirvote.c	2008-08-14 23:09:48 UTC (rev 16555)
@@ -959,9 +959,13 @@
         SMARTLIST_FOREACH(matching_descs, vote_routerstatus_t *, vsr, {
           /* Check if the vote where this status comes from had the
            * proper descriptor */
-          tor_assert(!memcmp(rs_out.identity_digest, vsr->status.identity_digest, DIGEST_LEN));
+          tor_assert(!memcmp(rs_out.identity_digest,
+                             vsr->status.identity_digest,
+                             DIGEST_LEN));
           if (vsr->status.has_exitsummary &&
-               !memcmp(rs_out.descriptor_digest, vsr->status.descriptor_digest, DIGEST_LEN)) {
+               !memcmp(rs_out.descriptor_digest,
+                       vsr->status.descriptor_digest,
+                       DIGEST_LEN)) {
             tor_assert(vsr->status.exitsummary);
             smartlist_add(exitsummaries, vsr->status.exitsummary);
             if (!chosen_exitsummary) {
@@ -1012,7 +1016,8 @@
 
         if (chosen_exitsummary) {
           rs_out.has_exitsummary = 1;
-          rs_out.exitsummary = (char *)chosen_exitsummary; /* yea, discards the const */
+          /* yea, discards the const */
+          rs_out.exitsummary = (char *)chosen_exitsummary;
         }
       }
 
@@ -1031,7 +1036,8 @@
       smartlist_add(chunks, tor_strdup("\n"));
       /*     Now the weight line. */
       if (rs_out.has_bandwidth) {
-        int r = tor_snprintf(buf, sizeof(buf), "w Bandwidth=%d\n", rs_out.bandwidth);
+        int r = tor_snprintf(buf, sizeof(buf),
+                             "w Bandwidth=%d\n", rs_out.bandwidth);
         if (r<0) {
           log_warn(LD_BUG, "Not enough space in buffer for weight line.");
           *buf = '\0';