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. > > -- > libvir-list mailing list > libvir-list@xxxxxxxxxx > https://www.redhat.com/mailman/listinfo/libvir-list > I've tried, but failed to apply patch 04/28; On the top of which commit should I apply this? I've tried the current HEAD (c17b16d1be8). Moreover, if you plan to resend, consider formatting patch with '-M' which catches the renaming and reduces the size of patches. Michal -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list