On 21/08/2012 11:07 p.m., Kinkie wrote:
Please include the Perl script in the patch. It should be committed so
that others can use it when modifying files. Ideally, it should be
integrated with the automated source formatting scripts, of course.
Included. About automatic formatting scripts, I leave that up to Amos.
Honestly, I'm not sure it's worth it.
Please add a short #comment to the Perl script, to describe what it does.
Done.
Please use "use strict" and "use warnings" in the Perl script.
Done.
Consider adjusting the regex detecting an #include statement to handle
"#\s+include" cases (with whitespace between # and include), but we seem
to be using that syntax for system (and generated) files only for now,
so this is optional.
Ok; leaving as is for maximum simplicity for now.
The resulting tree passes the test-suite on my Kubuntu Precise.
If it's OK, I'll merge the patch and add the sort-includes.pl tool in scripts/
Please do not merge until the current build is fixed. Whatever method of
testing you are using, it does not apparently catch basic build errors
in common configurations, so we better take it one step at a time.
The attached patch is up for review, as per standard process.
src/DiskIO/DiskDaemon/DiskdFile.cc
* please remove empty line after DiskdFile.h
* please move the system header includes down below the squid ones.
src/LeakFinder.cc
* please move all #include except squid.h inside the #if
USE_LEAKFINDER condition.
src/acl/HttpStatus.cc
+ src/adaptation/ecap/Config.cc
+ src/adaptation/icap/Config.cc
+ src/ipc/ReadWriteLock.cc
+ src/ipc/StoreMap.cc
+ src/tests/testConfigParser.cc
+ src/tests/testStoreController.cc
+ src/tests/testStoreHashIndex.cc
+ src/tests/testString.cc
* please remove empty line after squid.h
src/adaptation/AccessRule.cc
* please remove empty line after structs.h
src/fs/diskd/StoreFSdiskd.cc
* please erase the #if 0 block of headers completely.
src/ipc/SharedListen.cc
+ src/ipc/TypedMsgHdr.cc
* please move the system includes down below the squid ones.
src/log/access_log.cc
* please remove the empty line after Store.h
src/tests/testCacheManager.cc
* please remove the empty line after mgr/Action.h
src/tests/testDiskIO.cc
* please manually tweak so it sorts the COSS #if 0 block into position.
Thats it so far. I'm ignoring the squid vs system header block orders in
helpers/ and tools/ files for now. They need a bit of separate upgrading
that can take care of that.
Amos
