------------------------------------------------------------
revno: 12346
revision-id: squidadm@squid-cache.org-20121006001317-3zjggcrgeydv8xx2
parent: rousskov@measurement-factory.com-20121005233622-8lqa4cwwjadm09fn
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Fri 2012-10-05 18:13:17 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20121006001317-\
#   3zjggcrgeydv8xx2
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: c9fea232520752f46d3e8d64e2c943c918173406
# timestamp: 2012-10-06 00:53:07 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: rousskov@measurement-factory.com-20121005233622-\
#   8lqa4cwwjadm09fn
# 
# Begin patch
=== modified file 'src/HttpStatusLine.h'
--- src/HttpStatusLine.h	2012-10-03 17:32:57 +0000
+++ src/HttpStatusLine.h	2012-10-06 00:13:17 +0000
@@ -66,12 +66,12 @@
 void httpStatusLineClean(HttpStatusLine * sline);
 /* set/get values */
 void httpStatusLineSet(HttpStatusLine * sline, HttpVersion version,
-                                    http_status status, const char *reason);
+                       http_status status, const char *reason);
 const char *httpStatusLineReason(const HttpStatusLine * sline);
 /* parse/pack */
 /* parse a 0-terminating buffer and fill internal structires; returns true on success */
 int httpStatusLineParse(HttpStatusLine * sline, const String &protoPrefix,
-                                     const char *start, const char *end);
+                        const char *start, const char *end);
 /* pack fields using Packer */
 void httpStatusLinePackInto(const HttpStatusLine * sline, Packer * p);
 

=== modified file 'src/fatal.cc'
--- src/fatal.cc	2012-10-05 13:10:15 +0000
+++ src/fatal.cc	2012-10-06 00:13:17 +0000
@@ -63,7 +63,6 @@
     dumpMallocStats();
 }
 
-
 void
 fatal(const char *message)
 {

=== modified file 'src/ipc/StartListening.h'
--- src/ipc/StartListening.h	2012-10-04 09:14:06 +0000
+++ src/ipc/StartListening.h	2012-10-06 00:13:17 +0000
@@ -38,7 +38,7 @@
 /// Depending on whether SMP is on, either ask Coordinator to send us
 /// the listening FD or open a listening socket directly.
 void StartListening(int sock_type, int proto, const Comm::ConnectionPointer &listenConn,
-                           FdNoteId fdNote, AsyncCall::Pointer &callback);
+                    FdNoteId fdNote, AsyncCall::Pointer &callback);
 
 } // namespace Ipc;
 

=== modified file 'src/tests/Stub.list'
--- src/tests/Stub.list	2012-08-02 00:12:45 +0000
+++ src/tests/Stub.list	2012-10-06 00:13:17 +0000
@@ -20,6 +20,7 @@
 	tests/stub_debug.cc \
 	tests/stub_errorpage.cc \
 	tests/stub_event.cc \
+	tests/stub_fatal.cc \
 	tests/stub_fd.cc \
 	tests/stub_helper.cc \
 	tests/stub_http.cc \