On 01/07/2017 10:16 PM, Amos Jeffries wrote: > On 2017-01-08 17:56, Alex Rousskov wrote: >> Perhaps I am missing some other yet-uncomitted changes, but bzr shows me >> some 30 _SQUID_INLINE_ macros in r15000 and >> client_side_request_cci_remove_mk1.patch does not remove all of them. >> See bzr grep _SQUID_INLINE_.
> Hmm. I'm only seeing the client_side and include/squid.h ones on my v5 > checkout now (at r15000). Interesting. Perhaps this is some kind of new form of bzr corruption that I am not familiar with? > v5$ bzr revno > 15002 > v5$ bzr log | head > ------------------------------------------------------------ > revno: 15002 > committer: Amos Jeffries <[email protected]> > branch nick: 5 > timestamp: Sun 2017-01-08 18:14:34 +1300 > message: > Cleanup: remove --disable-inline and related macros ... > v5$ bzr grep _SQUID_INLINE_ > include/squid.h:#define _SQUID_INLINE_ inline > include/squid.h:#define _SQUID_INLINE_ > src/HttpHdrCc.h: _SQUID_INLINE_ bool isSet(HttpHdrCcType id) const; > src/HttpHdrCc.h: _SQUID_INLINE_ void setMask(HttpHdrCcType id, bool > newval=true); > src/HttpHdrCc.h: _SQUID_INLINE_ void setValue(int32_t &value, int32_t > new_value, HttpHdrCcType hdr, bool setting=true); > src/SquidString.h: _SQUID_INLINE_ String(); ... > src/client_side_request.h: _SQUID_INLINE_ void setConn(ConnStateData *); > src/ip/QosConfig.h:_SQUID_INLINE_ int setSockTos(const > Comm::ConnectionPointer &conn, tos_t tos); ... > src/ip/QosConfig.h: _SQUID_INLINE_ bool isAclTosActive() const; And yet the diff with the official tree is empty: > v5$ bzr diff bzr+ssh://bzr.squid-cache.org/bzr/squid3/5/ > v5$ I wonder how to resolve/fix that! Checking out a fresh v5 branch shows the expected result, but that is not very comforting because how am I supposed to know when bzr gets confused again?! Besides the recent INLINE changes, the older v5 checkout appears to miss 1658 dumb year updates (from r14990-14991?) like this one: > - * Copyright (C) 1996-2016 The Squid Software Foundation and contributors > + * Copyright (C) 1996-2017 The Squid Software Foundation and contributors > v5$ diff -ur . ../v5x | grep -v ^Only | grep -c '^- . Copyright .C. 1996-2016' > 1658 > v5$ diff -ur . ../v5x | grep -v ^Only | grep -c '^+ . Copyright .C. 1996-2017' > 1658 Alex. _______________________________________________ squid-dev mailing list [email protected] http://lists.squid-cache.org/listinfo/squid-dev
