[or-cvs] r10425: Cleanup whitespace. (in tor/trunk: . src/common src/or)

nickm at seul.org nickm at seul.org
Thu May 31 19:03:49 UTC 2007


Author: nickm
Date: 2007-05-31 15:03:49 -0400 (Thu, 31 May 2007)
New Revision: 10425

Modified:
   tor/trunk/
   tor/trunk/src/common/compat.c
   tor/trunk/src/common/mempool.c
   tor/trunk/src/or/connection_edge.c
   tor/trunk/src/or/dirserv.c
   tor/trunk/src/or/test.c
Log:
 r13111 at catbus:  nickm | 2007-05-31 15:03:41 -0400
 Cleanup whitespace.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13111] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/common/compat.c
===================================================================
--- tor/trunk/src/common/compat.c	2007-05-31 19:03:46 UTC (rev 10424)
+++ tor/trunk/src/common/compat.c	2007-05-31 19:03:49 UTC (rev 10425)
@@ -1002,7 +1002,6 @@
 #endif
 }
 
-
 /** Similar behavior to Unix gethostbyname: resolve <b>name</b>, and set
  * *addr to the proper IP address, in network byte order.  Returns 0
  * on success, -1 on failure; 1 on transient failure.

Modified: tor/trunk/src/common/mempool.c
===================================================================
--- tor/trunk/src/common/mempool.c	2007-05-31 19:03:46 UTC (rev 10424)
+++ tor/trunk/src/common/mempool.c	2007-05-31 19:03:49 UTC (rev 10425)
@@ -135,7 +135,7 @@
    */
   mp_allocated_t *first_free;
   int n_allocated; /**< Number of currently allocated items in this chunk. */
-  int capacity; /**< Largest number of items that can be fit into this chunk. */
+  int capacity; /**< Number of items that can be fit into this chunk. */
   size_t mem_size; /**< Number of usable bytes in mem. */
   char *next_mem; /**< Pointer into part of <b>mem</b> not yet carved up. */
   char mem[1]; /**< Storage for this chunk. (Not actual size.) */

Modified: tor/trunk/src/or/connection_edge.c
===================================================================
--- tor/trunk/src/or/connection_edge.c	2007-05-31 19:03:46 UTC (rev 10424)
+++ tor/trunk/src/or/connection_edge.c	2007-05-31 19:03:49 UTC (rev 10425)
@@ -1365,7 +1365,7 @@
                    conn, circ, cpath) < 0) ||
         (!circ &&
          connection_ap_handshake_attach_circuit(conn) < 0)) {
-      connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH);//xxxdup
+      connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH);
       return -1;
     }
     return 0;

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2007-05-31 19:03:46 UTC (rev 10424)
+++ tor/trunk/src/or/dirserv.c	2007-05-31 19:03:49 UTC (rev 10425)
@@ -1862,7 +1862,6 @@
         !tor_version_as_new_as(ri->platform,"0.1.1.16-rc-cvs");
       memset(&rs, 0, sizeof(rs));
 
-
       /* Already set by compute_performance_thresholds. */
       rs.is_exit = ri->is_exit;
       rs.is_stable = ri->is_stable =

Modified: tor/trunk/src/or/test.c
===================================================================
--- tor/trunk/src/or/test.c	2007-05-31 19:03:46 UTC (rev 10424)
+++ tor/trunk/src/or/test.c	2007-05-31 19:03:49 UTC (rev 10425)
@@ -310,7 +310,6 @@
   test_memeq(str, (char*)_buf_peek_raw_buffer(buf), 10); /* XXX Check rest. */
   test_eq(eof, 0);
 
-
   i = read_to_buf(s, 1024, buf, &eof);
   test_eq(i, 0);
   test_eq(buf_capacity(buf), MAX_BUF_SIZE);
@@ -1011,7 +1010,7 @@
     r = tor_inet_pton(AF_INET6, b, &a2);         \
     test_assert(r==1);                           \
     test_eq_ip6(&a1,&a2);                        \
-  } while(0)
+  } while (0)
 
 #define test_pton6_bad(a)                       \
   test_eq(0, tor_inet_pton(AF_INET6, a, &a1))



More information about the tor-commits mailing list