------------------------------------------------------------ revno: 12653 revision-id: squidadm@squid-cache.org-20131111042458-pdazb50v8spxf6ee parent: squid3@treenet.co.nz-20131110230208-36q7rycb97j2bavw committer: Automatic source maintenance branch nick: 3.3 timestamp: Sun 2013-11-10 21:24:58 -0700 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20131111042458-\ # pdazb50v8spxf6ee # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 295872eec1ab4919fd77dd8d23784571b84e6522 # timestamp: 2013-11-11 04:59:00 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20131110230208-\ # 36q7rycb97j2bavw # # Begin patch === modified file 'src/ipc/TypedMsgHdr.cc' --- src/ipc/TypedMsgHdr.cc 2013-11-10 22:58:31 +0000 +++ src/ipc/TypedMsgHdr.cc 2013-11-11 04:24:58 +0000 @@ -170,10 +170,10 @@ bool Ipc::TypedMsgHdr::hasFd() const { - struct cmsghdr *cmsg = CMSG_FIRSTHDR(this); - return cmsg && - cmsg->cmsg_level == SOL_SOCKET && - cmsg->cmsg_type == SCM_RIGHTS; + struct cmsghdr *cmsg = CMSG_FIRSTHDR(this); + return cmsg && + cmsg->cmsg_level == SOL_SOCKET && + cmsg->cmsg_type == SCM_RIGHTS; } void