------------------------------------------------------------ revno: 13027 revision-id: squidadm@squid-cache.org-20131111024921-1z2rtp0aw8ubgvbo parent: squid3@treenet.co.nz-20131110230135-b24u084oxhugyfxk committer: Automatic source maintenance branch nick: 3.4 timestamp: Sun 2013-11-10 19:49:21 -0700 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20131111024921-\ # 1z2rtp0aw8ubgvbo # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # testament_sha1: 2f0cb4d1b67e3751178271f05295ef80fcb92e20 # timestamp: 2013-11-11 02:58:30 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # base_revision_id: squid3@treenet.co.nz-20131110230135-\ # b24u084oxhugyfxk # # Begin patch === modified file 'src/ipc/TypedMsgHdr.cc' --- src/ipc/TypedMsgHdr.cc 2013-11-10 22:53:07 +0000 +++ src/ipc/TypedMsgHdr.cc 2013-11-11 02:49:21 +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