On Mon, Dec 17, 2012 at 10:22:18PM +0100, Michal Privoznik wrote:
On 17.12.2012 15:57, 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
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.
ACK if you solve small nits I've found in 24 and 25.
Yep, will solve those issues. Ordinarily I would push changes after being acked, but given this is a quite significant change, I'd prefer to have another explicit ACK for this mass renaming. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|