On 14/08/2012 3:15 a.m., Kinkie wrote:
Hi all,
the attached (huge) bundle builds upon Amos' recently compat work,
and removes squid-old.h, reconnecting the wires as needed
Secondary objectives are:
- sort included files in many places (first squid in alphabetical
order, then squid conditionally included, then system).
- change some SQUIDCEXTERN into c++-linkage extern
It passes a full test-suite on my kubuntu; it should be in a decent
shape for merging.
Can you give it a check? In case you need, the branch is at
lp:~kinkie/squid/sourceformat
Thanks
This branch won't pass a sourcemaintenance.sh run ...
* Please run that script to find .h and .cci files which now contain
squid.h - they should never include it.
* Please also check for files like src/ClientDelayConfig.cc and like
src/DelayId.cc and src/DelaySpec.cc - which now include squid.h multiple
times.
src/DescriptorSet.cc:
please do not add comments on the same line as the #include. It is NOT
accepted by all precompilers. Use a line before the #include.
there are mix of C-style and C++-style comments being added in this
way by this branch.
src/HttpRequest.h:
- you fixed the dependency with pinnedConnection - can the un-ordering
shuffle of these #include lines be reverted to the sorted order now?
src/auth/Acl.cc:
- why is old copyright blurb being added to src/auth/Acl.* ?
src/client_side.cc:
- strangely moves the macro define of comm_close() into the system
headers list.
src/protos.h:
- some of the SQUIDCEXTERN removals are leaving local-scope defines.
ie they are missing the "extern" entirely after this patch. Is this good?
src/store_digest.cc:
- store_digest registration is being erased. Why? and if thats okay
why not erase the now empty static function too?
There is a bit of branch cruft in the patch:
* removed file 'include/leakcheck.h'
* added file 'include/leakcheck.h'
* added file 'src/fs/ufs/RebuildState.cc.moved'
* added file 'src/fs/ufs/RebuildState.h.moved'
* ... plus several others - search for .moved
Amos
