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

[nickm at seul.org]

Author: nickm
Date: 2008-03-26 12:56:37 -0400 (Wed, 26 Mar 2008)
New Revision: 14197

Modified:
   tor/trunk/
   tor/trunk/src/common/memarea.c
   tor/trunk/src/common/memarea.h
   tor/trunk/src/or/routerparse.c
   tor/trunk/src/or/test.c
Log:
 r19062 at catbus:  nickm | 2008-03-26 12:56:25 -0400
 Fix whitespace



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

Modified: tor/trunk/src/common/memarea.c
===================================================================
--- tor/trunk/src/common/memarea.c	2008-03-26 16:56:34 UTC (rev 14196)
+++ tor/trunk/src/common/memarea.c	2008-03-26 16:56:37 UTC (rev 14197)
@@ -209,3 +209,4 @@
     tor_assert(chunk->next_mem <= chunk->u.mem+chunk->mem_size+MEMAREA_ALIGN);
   }
 }
+

Modified: tor/trunk/src/common/memarea.h
===================================================================
--- tor/trunk/src/common/memarea.h	2008-03-26 16:56:34 UTC (rev 14196)
+++ tor/trunk/src/common/memarea.h	2008-03-26 16:56:37 UTC (rev 14197)
@@ -20,3 +20,4 @@
 void memarea_assert_ok(memarea_t *area);
 
 #endif
+

Modified: tor/trunk/src/or/routerparse.c
===================================================================
--- tor/trunk/src/or/routerparse.c	2008-03-26 16:56:34 UTC (rev 14196)
+++ tor/trunk/src/or/routerparse.c	2008-03-26 16:56:37 UTC (rev 14197)
@@ -121,7 +121,7 @@
   directory_keyword tp;        /**< Type of the token. */
   int n_args:30;               /**< Number of elements in args */
   char **args;                 /**< Array of arguments from keyword line. */
-  
+
   char *object_type;           /**< -----BEGIN [object_type]-----*/
   size_t object_size;          /**< Bytes in object_body */
   char *object_body;           /**< Contents of object, base64-decoded. */
@@ -1979,7 +1979,8 @@
   memarea_clear(area);
   while (!strcmpstart(s, "r ")) {
     routerstatus_t *rs;
-    if ((rs = routerstatus_parse_entry_from_string(area, &s, tokens, NULL, NULL, 0)))
+    if ((rs = routerstatus_parse_entry_from_string(area, &s, tokens,
+                                                   NULL, NULL, 0)))
       smartlist_add(ns->entries, rs);
   }
   smartlist_sort(ns->entries, _compare_routerstatus_entries);

Modified: tor/trunk/src/or/test.c
===================================================================
--- tor/trunk/src/or/test.c	2008-03-26 16:56:34 UTC (rev 14196)
+++ tor/trunk/src/or/test.c	2008-03-26 16:56:37 UTC (rev 14197)
@@ -619,7 +619,6 @@
   test_eq(15, crypto_pk_private_decrypt(pk2, data3, data1, 128,
                                         PK_PKCS1_OAEP_PADDING,1));
 
-
   /* Now try signing. */
   strlcpy(data1, "Ossifrage", 1024);
   test_eq(128, crypto_pk_private_sign(pk1, data2, data1, 10));