[or-cvs] r13566: Fix a wide line in control.c; make the check-spaces target i (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-02-19 00:08:27 -0500 (Tue, 19 Feb 2008)
New Revision: 13566

Modified:
   tor/trunk/
   tor/trunk/Makefile.am
   tor/trunk/src/or/control.c
Log:
 r14246 at tombo:  nickm | 2008-02-17 19:33:02 -0500
 Fix a wide line in control.c; make the check-spaces target ignore the openbsd malloc file.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14246] on 49666b30-7950-49c5-bedf-9dc8f3168102

Modified: tor/trunk/Makefile.am
===================================================================
--- tor/trunk/Makefile.am	2008-02-19 03:06:29 UTC (rev 13565)
+++ tor/trunk/Makefile.am	2008-02-19 05:08:27 UTC (rev 13566)
@@ -65,7 +65,7 @@
 check-spaces:
 	./contrib/checkSpace.pl -C                    \
 	        src/common/*.h                        \
-		src/common/[^as]*.c                   \
+		src/common/[^asO]*.c                  \
 		src/or/[^et]*.[ch] src/or/t*.c src/or/eventdns_tor.h
 
 check-docs:

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2008-02-19 03:06:29 UTC (rev 13565)
+++ tor/trunk/src/or/control.c	2008-02-19 05:08:27 UTC (rev 13566)
@@ -1064,7 +1064,8 @@
     }
   }
 
-  if (options->HashedControlPassword || options->HashedControlSessionPassword) {
+  if (options->HashedControlPassword ||
+      options->HashedControlSessionPassword) {
     int bad = 0;
     smartlist_t *sl_tmp;
     char received[DIGEST_LEN];