On Wed, Dec 19, 2012 at 11:55:20AM +0000, Daniel P. Berrange wrote:
Currently the files in src/util are 50/50 split between those having a 'vir' prefix and those which don't. Finish the job by remaining all remaining files to have a 'vir' prefix too, guaranteeing that they can't clash with system headers[1].
The only case which was not a plain rename, was merging processinfo.{c,h} into the virprocess.{c,h} since the functionality logically belongs together.
At the end src/Makefile.am is updated to sort util files alphabetically.
Left as further work - make sure all functions in these files also have a 'vir' prefix. eg dnsmasq, ebtables, iptables, usb and pci files are violators in this regard.
Also left, much of virutil.c should move into virfile.c
I have just gone though 1 to 15 included, ACK to that set let's push rather sooner than later as this will be conflicting with pending patches and we shouldn't have too many right now. Only suggested addition is change the beginning comment description of files like src/util/logging.c to read * virlog.c: internal logging and debugging instead of * logging.c: internal logging and debugging I also wonder if virbuf, viralloc and virlog headers shouln't be added directly to one of the internals as those are used by nearly all modules under src/
Changes in v2:
- Rebased to latest GIT - Turned on rename detection to make review easier
Daniel
[1] Not a theoretical problem - we already hit a clsah on 'usb.h' before forcing us to use 'hostusb.h' and 'memory.h' clashes with a system header but we never noticed so far.
Someone else do 16 to 24 ? :-) Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard@redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/